Skip to content

Commit 4d453ed

Browse files
committed
Fix subpackages.
Don't do the ccall change for cuQuantum as it doesn't support the latest cuTENSOR, so it would be tricky maintaining both in tree. [skip julia] [skip cuda]
1 parent c4e11d0 commit 4d453ed

6 files changed

Lines changed: 25 additions & 6 deletions

File tree

.buildkite/pipeline.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,12 @@ steps:
132132
println("--- :julia: Instantiating project")
133133
withenv("JULIA_PKG_PRECOMPILE_AUTO" => 0) do
134134
Pkg.activate(joinpath(pwd(), "lib", lowercase("{{matrix.package}}")))
135-
Pkg.instantiate()
135+
try
136+
Pkg.instantiate()
137+
catch
138+
# if we fail to instantiate, assume that we need a newer CUDA.jl
139+
Pkg.develop(path=".")
140+
end
136141
137142
Pkg.add("CUDA_Runtime_jll")
138143
write("LocalPreferences.toml", "[CUDA_Runtime_jll]\nversion = \"{{matrix.cuda}}\"")

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "CUDA"
22
uuid = "052768ef-5323-5732-b1bb-66c8b64840ba"
3-
version = "5.2.0"
3+
version = "5.3.0"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"

lib/cudnn/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "cuDNN"
22
uuid = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"
33
authors = ["Tim Besard <tim.besard@gmail.com>"]
4-
version = "1.3.0"
4+
version = "1.3.1"
55

66
[deps]
77
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
@@ -11,7 +11,7 @@ CUDNN_jll = "62b44479-cb7b-5706-934f-f13b2eb2e645"
1111

1212
[compat]
1313
CEnum = "0.2, 0.3, 0.4, 0.5"
14-
CUDA = "~5.1, ~5.2"
14+
CUDA = "~5.3"
1515
CUDA_Runtime_Discovery = "0.2"
1616
CUDNN_jll = "~8.9"
1717
julia = "1.8"

lib/custatevec/src/cuStateVec.jl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ else
1212
import cuQuantum_jll
1313
end
1414

15+
# XXX: cuStateVec depends on cuTENSOR 1, while GC-safe ccalls were introduced in CUDA 5.3
16+
# which is only compatible with cuTENSOR 2. So disable that functionality for now.
17+
const var"@gcsafe_ccall" = var"@ccall"
18+
macro gcunsafe_callback(expr)
19+
esc(expr)
20+
end
21+
1522

1623
export has_custatevec
1724

lib/cutensor/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "cuTENSOR"
22
uuid = "011b41b2-24ef-40a8-b3eb-fa098493e9e1"
33
authors = ["Tim Besard <tim.besard@gmail.com>"]
4-
version = "2.0"
4+
version = "2.1"
55

66
[deps]
77
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
@@ -12,7 +12,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1212

1313
[compat]
1414
CEnum = "0.2, 0.3, 0.4, 0.5"
15-
CUDA = "~5.1, ~5.2"
15+
CUDA = "~5.3"
1616
CUDA_Runtime_Discovery = "0.2"
1717
CUTENSOR_jll = "~2.0"
1818
julia = "1.8"

lib/cutensornet/src/cuTensorNet.jl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ else
1616
import cuQuantum_jll
1717
end
1818

19+
# XXX: cuTensorNet depends on cuTENSOR 1, while GC-safe ccalls were introduced in CUDA 5.3
20+
# which is only compatible with cuTENSOR 2. So disable that functionality for now.
21+
const var"@gcsafe_ccall" = var"@ccall"
22+
macro gcunsafe_callback(expr)
23+
esc(expr)
24+
end
25+
1926

2027
export has_cutensornet
2128

0 commit comments

Comments
 (0)