Skip to content

Commit

Permalink
Fix subpackages.
Browse files Browse the repository at this point in the history
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]
  • Loading branch information
maleadt committed Feb 14, 2024
1 parent c4e11d0 commit 4779f9c
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 6 deletions.
7 changes: 6 additions & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,12 @@ steps:
println("--- :julia: Instantiating project")
withenv("JULIA_PKG_PRECOMPILE_AUTO" => 0) do
Pkg.activate(joinpath(pwd(), "lib", lowercase("{{matrix.package}}")))
Pkg.instantiate()
try
Pkg.instantiate()
catch
# if we fail to instantiate, assume that we need a newer CUDA.jl
Pkg.develop(path=".")
end
Pkg.add("CUDA_Runtime_jll")
write("LocalPreferences.toml", "[CUDA_Runtime_jll]\nversion = \"{{matrix.cuda}}\"")
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "CUDA"
uuid = "052768ef-5323-5732-b1bb-66c8b64840ba"
version = "5.2.0"
version = "5.3.0"

[deps]
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
Expand Down
4 changes: 2 additions & 2 deletions lib/cudnn/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "cuDNN"
uuid = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"
authors = ["Tim Besard <[email protected]>"]
version = "1.3.0"
version = "1.3.1"

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

[compat]
CEnum = "0.2, 0.3, 0.4, 0.5"
CUDA = "~5.1, ~5.2"
CUDA = "~5.3"
CUDA_Runtime_Discovery = "0.2"
CUDNN_jll = "~8.9"
julia = "1.8"
7 changes: 7 additions & 0 deletions lib/custatevec/src/cuStateVec.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ else
import cuQuantum_jll
end

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


export has_custatevec

Expand Down
4 changes: 2 additions & 2 deletions lib/cutensor/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "cuTENSOR"
uuid = "011b41b2-24ef-40a8-b3eb-fa098493e9e1"
authors = ["Tim Besard <[email protected]>"]
version = "2.0"
version = "2.1"

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

[compat]
CEnum = "0.2, 0.3, 0.4, 0.5"
CUDA = "~5.1, ~5.2"
CUDA = "~5.3"
CUDA_Runtime_Discovery = "0.2"
CUTENSOR_jll = "~2.0"
julia = "1.8"
Expand Down
7 changes: 7 additions & 0 deletions lib/cutensornet/src/cuTensorNet.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ else
import cuQuantum_jll
end

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


export has_cutensornet

Expand Down

0 comments on commit 4779f9c

Please sign in to comment.