Skip to content

Commit e224aad

Browse files
author
cailixun
committed
seperate testing environment
1 parent 92812f1 commit e224aad

File tree

8 files changed

+27
-15
lines changed

8 files changed

+27
-15
lines changed

.buildkite/AMDGPU_Ext.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ steps:
2121
rocmgpu: "*"
2222
env:
2323
GROUP: "AMDGPU_Ext"
24+
SECRET_CODECOV_TOKEN: "ZfhQu/IcRLqNyZ//ZNs5sjBPaV76IHfU5gui52Qn+Rp8tOurukqgScuyDt+3HQ4R0hJYBw1/Nqg6jmBsvWSc9NEUx8kGsUJFHfN3no0+b+PFxA8oJkWc9EpyIsjht5ZIjlsFWR3f0DpPqMEle/QyWOPcal63CChXR8oAoR+Fz1Bh8GkokLlnC8F9Ugp9xBlu401GCbyZhvLTZnNIgK5yy9q8HBJnBg1cPOhI81J6JvYpEmcIofEzFV/qkfpTUPclu43WNoFX2DZPzbxilf3fsAd5/+nRkRfkNML8KiN4mnmjHxPPbuY8F5zC/PS5ybXtDpfvaMQc01WApXCkZk0ZAQ==;U2FsdGVkX1+eDT7dqCME5+Ox5i8GvWRTQbwiP/VYjapThDbxXFDeSSIC6Opmon+M8go22Bun3bat6Fzie65ang=="
2425
timeout_in_minutes: 60

.buildkite/pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
- "src/**"
2121
- "ext/QuantumToolboxCUDAExt.jl"
2222
- "test/runtests.jl"
23-
- "test/ext-test/gpu/**"
23+
- "test/ext-test/gpu/cuda/**"
2424
- "Project.toml"
2525
target: ".buildkite/CUDA_Ext.yml"
2626
- staticfloat/forerunner: # AMDGPU.jl tests
@@ -30,6 +30,6 @@ steps:
3030
- "src/**"
3131
- "ext/QuantumToolboxAMDGPUExt.jl"
3232
- "test/runtests.jl"
33-
- "test/ext-test/gpu/**"
33+
- "test/ext-test/gpu/amdgpu/**"
3434
- "Project.toml"
3535
target: ".buildkite/AMDGPU_Ext.yml"

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ QuantumToolboxGPUArraysExt = ["GPUArrays", "KernelAbstractions"]
4545
QuantumToolboxMakieExt = "Makie"
4646

4747
[compat]
48-
AMDGPU = "1, 2"
48+
AMDGPU = "2.1"
4949
ArrayInterface = "6, 7"
5050
CUDA = "5.0 - 5.8, 5.9.4 - 5"
5151
ChainRulesCore = "1"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[deps]
2+
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
3+
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
4+
QuantumToolbox = "6c2fb7c5-b903-41d2-bc5e-5a7c320b9fab"
5+
6+
[compat]
7+
AMDGPU = "2.1"

test/ext-test/gpu/amdgpu_ext.jl renamed to test/ext-test/gpu/amdgpu/amdgpu_ext.jl

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,22 @@
3434

3535
# type conversion of AMDGPU sparse arrays
3636
@test typeof(roc(ψsi; word_size = 64).data) == typeof(ROCSparseVector(ψsi).data) == ROCSparseVector{Int64,Int32}
37-
@test typeof(roc(ψsi; word_size = 32).data) == typeof(ROCSparseVector{Int32}(ψsi).data) == ROCSparseVector{Int32,Int32}
37+
@test typeof(roc(ψsi; word_size = 32).data) ==
38+
typeof(ROCSparseVector{Int32}(ψsi).data) ==
39+
ROCSparseVector{Int32,Int32}
3840
@test typeof(roc(ψsf; word_size = 64).data) == typeof(ROCSparseVector(ψsf).data) == ROCSparseVector{Float64,Int32}
3941
@test typeof(roc(ψsf; word_size = 32).data) ==
4042
typeof(ROCSparseVector{Float32}(ψsf).data) ==
4143
ROCSparseVector{Float32,Int32}
42-
@test typeof(roc(ψsc; word_size = 64).data) == typeof(ROCSparseVector(ψsc).data) == ROCSparseVector{ComplexF64,Int32}
44+
@test typeof(roc(ψsc; word_size = 64).data) ==
45+
typeof(ROCSparseVector(ψsc).data) ==
46+
ROCSparseVector{ComplexF64,Int32}
4347
@test typeof(roc(ψsc; word_size = 32).data) ==
4448
typeof(ROCSparseVector{ComplexF32}(ψsc).data) ==
4549
ROCSparseVector{ComplexF32,Int32}
46-
@test typeof(roc(Xsi; word_size = 64).data) == typeof(ROCSparseMatrixCSC(Xsi).data) == ROCSparseMatrixCSC{Int64,Int32}
50+
@test typeof(roc(Xsi; word_size = 64).data) ==
51+
typeof(ROCSparseMatrixCSC(Xsi).data) ==
52+
ROCSparseMatrixCSC{Int64,Int32}
4753
@test typeof(roc(Xsi; word_size = 32).data) ==
4854
typeof(ROCSparseMatrixCSC{Int32}(Xsi).data) ==
4955
ROCSparseMatrixCSC{Int32,Int32}
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
[deps]
2-
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
32
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
43
CUDSS = "45b445bb-4962-46a0-9369-b4df9d0f772e"
54
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
65
QuantumToolbox = "6c2fb7c5-b903-41d2-bc5e-5a7c320b9fab"
76

87
[compat]
9-
AMDGPU = "1"
108
CUDA = "5"
File renamed without changes.

test/runtests.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ using Test
22
using TestItemRunner
33
using Pkg
44

5-
const GROUP_LIST = String["All", "Core", "Code-Quality", "AutoDiff_Ext", "Makie_Ext", "CUDA_Ext", "AMDGPU_Ext", "Arbitrary-Precision"]
5+
const GROUP_LIST =
6+
String["All", "Core", "Code-Quality", "AutoDiff_Ext", "Makie_Ext", "CUDA_Ext", "AMDGPU_Ext", "Arbitrary-Precision"]
67

78
const GROUP = get(ENV, "GROUP", "All")
89
(GROUP in GROUP_LIST) || throw(ArgumentError("Unknown GROUP = $GROUP\nThe allowed groups are: $GROUP_LIST\n"))
@@ -65,7 +66,7 @@ if (GROUP == "Makie_Ext")
6566
end
6667

6768
if (GROUP == "CUDA_Ext")
68-
Pkg.activate("ext-test/gpu")
69+
Pkg.activate("ext-test/gpu/cuda")
6970
Pkg.develop(PackageSpec(path = dirname(@__DIR__)))
7071
Pkg.update()
7172

@@ -80,26 +81,25 @@ if (GROUP == "CUDA_Ext")
8081
QuantumToolbox.about()
8182
CUDA.versioninfo()
8283

83-
include(joinpath(testdir, "ext-test", "gpu", "cuda_ext.jl"))
84+
include(joinpath(testdir, "ext-test", "gpu", "cuda", "cuda_ext.jl"))
8485
end
8586

8687
if (GROUP == "AMDGPU_Ext")
87-
Pkg.activate("ext-test/gpu")
88+
Pkg.activate("ext-test/gpu/amdgpu")
8889
Pkg.develop(PackageSpec(path = dirname(@__DIR__)))
8990
Pkg.update()
9091

9192
using QuantumToolbox
9293
import LinearAlgebra: Diagonal, dot
9394
import StaticArraysCore: SVector
9495
using AMDGPU
95-
using AMDGPU: ROCArray, ROCVector, ROCMatrix
96-
using AMDGPU.rocSPARSE: ROCSparseVector, ROCSparseMatrixCSC, ROCSparseMatrixCSR
96+
using AMDGPU.rocSPARSE
9797
using LinearSolve
9898

9999
QuantumToolbox.about()
100100
AMDGPU.versioninfo()
101101

102-
include(joinpath(testdir, "ext-test", "gpu", "amdgpu_ext.jl"))
102+
include(joinpath(testdir, "ext-test", "gpu", "amdgpu", "amdgpu_ext.jl"))
103103
end
104104

105105
if (GROUP == "Arbitrary-Precision")

0 commit comments

Comments
 (0)