Skip to content

Commit bf813a5

Browse files
authored
Use Base.pkgversion on 1.9. (#1974)
1 parent 3c09d19 commit bf813a5

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

src/utilities.jl

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,29 @@ function versioninfo(io::IO=stdout)
6060
println(io)
6161

6262
println(io, "Julia packages: ")
63-
## get a hold of Pkg without adding a dependency on the package
64-
Pkg = let
65-
id = Base.PkgId(Base.UUID("44cfe95a-1eb2-52ea-b672-e2afdf69b78f"), "Pkg")
66-
Base.loaded_modules[id]
67-
end
68-
## look at the Project.toml to determine our version
69-
project = Pkg.Operations.read_project(Pkg.Types.projectfile_path(pkgdir(CUDA)))
70-
println(io, "- CUDA.jl: $(project.version)")
71-
## dependencies
72-
deps = Pkg.dependencies()
73-
versions = Dict(map(uuid->deps[uuid].name => deps[uuid].version, collect(keys(deps))))
74-
for dep in ["CUDA_Driver_jll", "CUDA_Runtime_jll", "CUDA_Runtime_Discovery"]
75-
println(io, "- $dep: $(versions[dep])")
63+
if VERSION >= v"1.9"
64+
println(io, "- CUDA: $(Base.pkgversion(CUDA))")
65+
for name in [:CUDA_Driver_jll, :CUDA_Runtime_jll, :CUDA_Runtime_Discovery]
66+
isdefined(CUDA, name) || continue
67+
mod = getfield(CUDA, name)
68+
println(io, "- $(name): $(Base.pkgversion(mod))")
69+
end
70+
else
71+
## get a hold of Pkg without adding a dependency on the package
72+
Pkg = let
73+
id = Base.PkgId(Base.UUID("44cfe95a-1eb2-52ea-b672-e2afdf69b78f"), "Pkg")
74+
Base.loaded_modules[id]
75+
end
76+
## look at the Project.toml to determine our version
77+
project = Pkg.Operations.read_project(Pkg.Types.projectfile_path(pkgdir(CUDA)))
78+
println(io, "- CUDA.jl: $(project.version)")
79+
## dependencies
80+
## XXX: Pkg.dependencies uses the active project, so may be inaccurate
81+
deps = Pkg.dependencies()
82+
versions = Dict(map(uuid->deps[uuid].name => deps[uuid].version, collect(keys(deps))))
83+
for dep in ["CUDA_Driver_jll", "CUDA_Runtime_jll", "CUDA_Runtime_Discovery"]
84+
haskey(versions, dep) && println(io, "- $dep: $(versions[dep])")
85+
end
7686
end
7787
println(io)
7888

0 commit comments

Comments
 (0)