Skip to content

Commit

Permalink
Bump unit test nuget packages. (#1161)
Browse files Browse the repository at this point in the history
  • Loading branch information
MoFtZ authored Feb 2, 2024
1 parent 2506984 commit bc0340b
Show file tree
Hide file tree
Showing 32 changed files with 111 additions and 114 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
14 changes: 7 additions & 7 deletions Src/ILGPU.Algorithms.Tests/ArrayExtensionTests.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ---------------------------------------------------------------------------------------
// ILGPU Algorithms
// Copyright (c) 2021 ILGPU Project
// Copyright (c) 2021-2024 ILGPU Project
// www.ilgpu.net
//
// File: ArrayExtensionTests.tt/ArrayExtensionTests.cs
Expand Down Expand Up @@ -31,8 +31,8 @@ namespace ILGPU.Algorithms.Tests

#region MemberData

public static TheoryData<object, object> TestDataLength1D =>
new TheoryData<object, object>
public static TheoryData<object, int> TestDataLength1D =>
new TheoryData<object, int>
{
<#
// TODO: Ignoring Half type, otherwise XUnit complains about an
Expand All @@ -50,8 +50,8 @@ namespace ILGPU.Algorithms.Tests
#>
};

public static TheoryData<object, object, object> TestDataLength2D =>
new TheoryData<object, object, object>
public static TheoryData<object, int, int> TestDataLength2D =>
new TheoryData<object, int, int>
{
<#
foreach (var type in types) {
Expand All @@ -64,8 +64,8 @@ namespace ILGPU.Algorithms.Tests
#>
};

public static TheoryData<object, object, object, object> TestDataLength3D =>
new TheoryData<object, object, object, object>
public static TheoryData<object, int, int, int> TestDataLength3D =>
new TheoryData<object, int, int, int>
{
<#
foreach (var type in types) {
Expand Down
6 changes: 3 additions & 3 deletions Src/ILGPU.Algorithms.Tests/GroupExtensionTests.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ---------------------------------------------------------------------------------------
// ILGPU Algorithms
// Copyright (c) 2021 ILGPU Project
// Copyright (c) 2021-2024 ILGPU Project
// www.ilgpu.net
//
// File: GroupExtensionTests.tt/GroupExtensionTests.cs
Expand Down Expand Up @@ -62,9 +62,9 @@ namespace ILGPU.Algorithms.Tests
<#
foreach (var srOp in ScanReduceOperations) {
#>
public static TheoryData< object, object, object, object, object, object>
public static TheoryData< object, object, object, object, object, int>
<#= srOp.Name #>TestData =>
new TheoryData< object, object, object, object, object, object>
new TheoryData< object, object, object, object, object, int>
{
// Type, ScanReduceOperation, Sequencer, Start of Sequence,
// StepSize of Sequence, Fraction of Size
Expand Down
2 changes: 1 addition & 1 deletion Src/ILGPU.Algorithms.Tests/ILGPU.Algorithms.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="T4.Build" Version="0.2.4" PrivateAssets="All" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Src/ILGPU.Algorithms.Tests/InitializeTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ---------------------------------------------------------------------------------------
// ILGPU Algorithms
// Copyright (c) 2021 ILGPU Project
// Copyright (c) 2021-2024 ILGPU Project
// www.ilgpu.net
//
// File: InitializeTests.cs
Expand All @@ -24,8 +24,8 @@ protected InitializeTests(ITestOutputHelper output, TestContext testContext)

#region MemberData

public static TheoryData<object, object> SimpleTestData =>
new TheoryData<object, object>
public static TheoryData<object, int> SimpleTestData =>
new TheoryData<object, int>
{
{ sbyte.MinValue, 1 },
{ byte.MaxValue, 1 },
Expand Down
6 changes: 3 additions & 3 deletions Src/ILGPU.Algorithms.Tests/MatrixTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ---------------------------------------------------------------------------------------
// ILGPU Algorithms
// Copyright (c) 2023 ILGPU Project
// Copyright (c) 2023-2024 ILGPU Project
// www.ilgpu.net
//
// File: MatrixTests.cs
Expand Down Expand Up @@ -29,8 +29,8 @@ protected MatrixTests(ITestOutputHelper output, TestContext testContext)

#region MemberData

public static TheoryData<object, object, object, object, object> DimensionsData =>
new TheoryData<object, object, object, object, object>
public static TheoryData<int, int, int, int, float> DimensionsData =>
new TheoryData<int, int, int, int, float>
{
{ 39, 42, 17, 2918291, 0.8f },
{ 39, 42, 17, 2918291, 0.5f },
Expand Down
8 changes: 5 additions & 3 deletions Src/ILGPU.Algorithms.Tests/OptimizationTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ---------------------------------------------------------------------------------------
// ILGPU Algorithms
// Copyright (c) 2023 ILGPU Project
// Copyright (c) 2023-2024 ILGPU Project
// www.ilgpu.net
//
// File: OptimizationTests.cs
Expand Down Expand Up @@ -138,7 +138,7 @@ public void ParticleSwarmOptimization<
TElementType,
TEvalType,
TRandom>(
OptimizerConfig<TElementType> optimizerConfig,
object optimizerConfigObj,
TFunc function,
TElementType lower,
TElementType upper,
Expand All @@ -154,11 +154,13 @@ public void ParticleSwarmOptimization<
where TFunc : struct,
IOptimizationFunction<TNumericType, TElementType, TEvalType>
{
var optimizerConfig = (OptimizerConfig<TElementType>)optimizerConfigObj;

// Skip larger problems on the CPU
Skip.If(
Accelerator.AcceleratorType == AcceleratorType.CPU &&
optimizerConfig.NumIterations * optimizerConfig.NumParticles > 2048);

const int Seed = 24404699;
using var pso = new PSO<
TNumericType,
Expand Down
30 changes: 15 additions & 15 deletions Src/ILGPU.Algorithms.Tests/RadixSortExtensionTests.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ---------------------------------------------------------------------------------------
// ILGPU Algorithms
// Copyright (c) 2021-2023 ILGPU Project
// Copyright (c) 2021-2024 ILGPU Project
// www.ilgpu.net
//
// File: RadixSortExtensionTests.tt/RadixSortExtensionTests.cs
Expand Down Expand Up @@ -34,9 +34,9 @@ namespace ILGPU.Algorithms.Tests

#region MemberData

public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
AscendingTestData =>
new TheoryData<object, object, object, object, object, object>
new TheoryData<object, object, object, object, object, int>
{
// Type, RadixSortOperation, Sequencer, Start of Sequencer,
// StepSize of Sequencer, BufferLength
Expand All @@ -53,9 +53,9 @@ namespace ILGPU.Algorithms.Tests
#>
};

public static TheoryData<object, object, object, object>
public static TheoryData<object, object, object, int>
AscendingPairsTestData =>
new TheoryData<object, object, object, object>
new TheoryData<object, object, object, int>
{
// Type, RadixSortOperation, Sequencer, Start of Sequencer, BufferLength
<#
Expand All @@ -70,9 +70,9 @@ namespace ILGPU.Algorithms.Tests
#>
};

public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
DescendingTestData =>
new TheoryData<object, object, object, object, object, object>
new TheoryData<object, object, object, object, object, int>
{
// Type, RadixSortOperation, Sequencer, Start of Sequencer,
// StepSize of Sequencer, BufferLength
Expand All @@ -88,9 +88,9 @@ namespace ILGPU.Algorithms.Tests
#>
};

public static TheoryData<object, object, object, object>
public static TheoryData<object, object, object, int>
DescendingPairsTestData =>
new TheoryData<object, object, object, object>
new TheoryData<object, object, object, int>
{
// Type, RadixSortOperation, Sequencer, BufferLength
<#
Expand All @@ -105,9 +105,9 @@ namespace ILGPU.Algorithms.Tests
#>
};

public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
ConstantTestData =>
new TheoryData<object, object, object, object, object, object>
new TheoryData<object, object, object, object, object, int>
{
// Type, RadixSortOperation, Sequencer, Start of Sequencer,
// StepSize of Sequencer, BufferLength
Expand Down Expand Up @@ -434,10 +434,10 @@ namespace ILGPU.Algorithms.Tests

partial class WarpExtensionTests
{
public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
AscendingTestData => RadixSortExtensionTests.AscendingTestData;

public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
DescendingTestData => RadixSortExtensionTests.DescendingTestData;

internal static void WarpWideRadixSort<T, TRadixSortOperation>(
Expand Down Expand Up @@ -561,10 +561,10 @@ namespace ILGPU.Algorithms.Tests

partial class GroupExtensionTests
{
public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
AscendingTestData => RadixSortExtensionTests.AscendingTestData;

public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
DescendingTestData => RadixSortExtensionTests.DescendingTestData;

internal static void GroupWideRadixSort<T, TRadixSortOperation>(
Expand Down
6 changes: 3 additions & 3 deletions Src/ILGPU.Algorithms.Tests/RandomTests.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ---------------------------------------------------------------------------------------
// ILGPU Algorithms
// Copyright (c) 2021 ILGPU Project
// Copyright (c) 2021-2024 ILGPU Project
// www.ilgpu.net
//
// File: RandomTests.tt/RandomTests.cs
Expand Down Expand Up @@ -49,8 +49,8 @@ namespace ILGPU.Algorithms.Tests
: base(output, testContext)
{ }

public static TheoryData<object, object, object> RandomTestData =>
new TheoryData<object, object, object>
public static TheoryData<object, int, int> RandomTestData =>
new TheoryData<object, int, int>
{
<# foreach (var rng in rngs) { #>
{ default(<#= rng #>), 1024, 16 },
Expand Down
14 changes: 7 additions & 7 deletions Src/ILGPU.Algorithms.Tests/ReductionExtensionTests.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ---------------------------------------------------------------------------------------
// ILGPU Algorithms
// Copyright (c) 2021 ILGPU Project
// Copyright (c) 2021-2024 ILGPU Project
// www.ilgpu.net
//
// File: ReductionExtensionTests.tt/ReductionExtensionTests.cs
Expand Down Expand Up @@ -38,9 +38,9 @@ namespace ILGPU.Algorithms.Tests
#>
#region MemberData

public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
AscendingTestData =>
new TheoryData<object, object, object, object, object, object>
new TheoryData<object, object, object, object, object, int>
{
// Type, IScanReduceOperation, Sequencer, Start of Sequencer,
// StepSize of Sequencer, BufferLength
Expand All @@ -59,9 +59,9 @@ namespace ILGPU.Algorithms.Tests
#>
};

public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
DescendingTestData =>
new TheoryData<object, object, object, object, object, object>
new TheoryData<object, object, object, object, object, int>
{
<#
foreach (var type in types) {
Expand All @@ -78,9 +78,9 @@ namespace ILGPU.Algorithms.Tests
#>
};

public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
ConstantTestData =>
new TheoryData<object, object, object, object, object, object>
new TheoryData<object, object, object, object, object, int>
{
<#
foreach (var type in types) {
Expand Down
10 changes: 5 additions & 5 deletions Src/ILGPU.Algorithms.Tests/ReorderExtensionTests.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ---------------------------------------------------------------------------------------
// ILGPU Algorithms
// Copyright (c) 2021 ILGPU Project
// Copyright (c) 2021-2024 ILGPU Project
// www.ilgpu.net
//
// File: ReorderExtensionTests.tt/ReorderExtensionTests.cs
Expand Down Expand Up @@ -36,9 +36,9 @@ namespace ILGPU.Algorithms.Tests

#region MemberData

public static TheoryData<object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, int>
ReorderTestData =>
new TheoryData<object, object, object, object, object, object>
new TheoryData<object, object, object, object, object, int>
{
// Type, ITransformer, Sequencer, Start of Sequencer,
// StepSize of Sequencer, BufferLength
Expand All @@ -65,9 +65,9 @@ namespace ILGPU.Algorithms.Tests
#>
};

public static TheoryData<object, object, object, object, object, object, object>
public static TheoryData<object, object, object, object, object, object, int>
ReorderTransformSourceTargetTestData =>
new TheoryData<object, object, object, object, object, object, object>
new TheoryData<object, object, object, object, object, object, int>
{
// Type1, Type2, ITransformer, Sequencer, Start of Sequencer,
// StepSize of Sequencer, BufferLength
Expand Down
Loading

0 comments on commit bc0340b

Please sign in to comment.