From f31dc3a36356a2dd4410ce2f06fe75724a5e07f6 Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Wed, 20 Nov 2024 12:44:44 -0500 Subject: [PATCH] ci: install specific AMDGPU version (#1096) * ci: install specific AMDGPU version * chore: apply formatting suggestion Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * ci: dont pkg update * ci: fix install syntax --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- lib/LuxLib/test/runtests.jl | 3 +-- lib/MLDataDevices/test/runtests.jl | 3 +-- lib/WeightInitializers/test/runtests.jl | 15 +++++++++------ test/runtests.jl | 3 +-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/LuxLib/test/runtests.jl b/lib/LuxLib/test/runtests.jl index cc65b85f48..3e58328c01 100644 --- a/lib/LuxLib/test/runtests.jl +++ b/lib/LuxLib/test/runtests.jl @@ -20,7 +20,7 @@ if (BACKEND_GROUP == "all" || BACKEND_GROUP == "cuda") end end (BACKEND_GROUP == "all" || BACKEND_GROUP == "amdgpu") && - push!(EXTRA_PKGS, PackageSpec(; name="AMDGPU")) + push!(EXTRA_PKGS, PackageSpec(; name="AMDGPU", version=v"1.0.4")) (BACKEND_GROUP == "all" || BACKEND_GROUP == "oneapi") && push!(EXTRA_PKGS, PackageSpec(; name="oneAPI")) (BACKEND_GROUP == "all" || BACKEND_GROUP == "metal") && @@ -30,7 +30,6 @@ if !isempty(EXTRA_PKGS) || !isempty(EXTRA_DEV_PKGS) @info "Installing Extra Packages for testing" EXTRA_PKGS EXTRA_DEV_PKGS isempty(EXTRA_PKGS) || Pkg.add(EXTRA_PKGS) isempty(EXTRA_DEV_PKGS) || Pkg.develop(EXTRA_DEV_PKGS) - Pkg.update() Base.retry_load_extensions() Pkg.instantiate() end diff --git a/lib/MLDataDevices/test/runtests.jl b/lib/MLDataDevices/test/runtests.jl index 4b02862e32..4617a3a5de 100644 --- a/lib/MLDataDevices/test/runtests.jl +++ b/lib/MLDataDevices/test/runtests.jl @@ -15,7 +15,7 @@ if (BACKEND_GROUP == "all" || BACKEND_GROUP == "cuda") end end (BACKEND_GROUP == "all" || BACKEND_GROUP == "amdgpu") && - push!(EXTRA_PKGS, PackageSpec(; name="AMDGPU")) + push!(EXTRA_PKGS, PackageSpec(; name="AMDGPU", version=v"1.0.4")) (BACKEND_GROUP == "all" || BACKEND_GROUP == "oneapi") && push!(EXTRA_PKGS, PackageSpec(; name="oneAPI")) (BACKEND_GROUP == "all" || BACKEND_GROUP == "metal") && @@ -27,7 +27,6 @@ if !isempty(EXTRA_PKGS) || !isempty(EXTRA_DEV_PKGS) @info "Installing Extra Packages for testing" EXTRA_PKGS EXTRA_DEV_PKGS isempty(EXTRA_PKGS) || Pkg.add(EXTRA_PKGS) isempty(EXTRA_DEV_PKGS) || Pkg.develop(EXTRA_DEV_PKGS) - Pkg.update() Base.retry_load_extensions() Pkg.instantiate() end diff --git a/lib/WeightInitializers/test/runtests.jl b/lib/WeightInitializers/test/runtests.jl index 9de7d16bf8..ff223653ad 100644 --- a/lib/WeightInitializers/test/runtests.jl +++ b/lib/WeightInitializers/test/runtests.jl @@ -5,17 +5,20 @@ using InteractiveUtils, Hwloc const BACKEND_GROUP = lowercase(get(ENV, "BACKEND_GROUP", "All")) -const EXTRA_PKGS = String[] +const EXTRA_PKGS = PackageSpec[] -(BACKEND_GROUP == "all" || BACKEND_GROUP == "cuda") && push!(EXTRA_PKGS, "CUDA") -(BACKEND_GROUP == "all" || BACKEND_GROUP == "amdgpu") && push!(EXTRA_PKGS, "AMDGPU") -(BACKEND_GROUP == "all" || BACKEND_GROUP == "metal") && push!(EXTRA_PKGS, "Metal") -(BACKEND_GROUP == "all" || BACKEND_GROUP == "oneapi") && push!(EXTRA_PKGS, "oneAPI") +(BACKEND_GROUP == "all" || BACKEND_GROUP == "cuda") && + push!(EXTRA_PKGS, PackageSpec("CUDA")) +(BACKEND_GROUP == "all" || BACKEND_GROUP == "amdgpu") && + push!(EXTRA_PKGS, PackageSpec(; name="AMDGPU", version=v"1.0.4")) +(BACKEND_GROUP == "all" || BACKEND_GROUP == "metal") && + push!(EXTRA_PKGS, PackageSpec("Metal")) +(BACKEND_GROUP == "all" || BACKEND_GROUP == "oneapi") && + push!(EXTRA_PKGS, PackageSpec("oneAPI")) if !isempty(EXTRA_PKGS) @info "Installing Extra Packages for testing" EXTRA_PKGS=EXTRA_PKGS Pkg.add(EXTRA_PKGS) - Pkg.update() Base.retry_load_extensions() Pkg.instantiate() end diff --git a/test/runtests.jl b/test/runtests.jl index 4ae064c700..0e1935d46b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -44,13 +44,12 @@ if (BACKEND_GROUP == "all" || BACKEND_GROUP == "cuda") end end (BACKEND_GROUP == "all" || BACKEND_GROUP == "amdgpu") && - push!(EXTRA_PKGS, Pkg.PackageSpec("AMDGPU")) + push!(EXTRA_PKGS, Pkg.PackageSpec(; name="AMDGPU", version=v"1.0.4")) if !isempty(EXTRA_PKGS) || !isempty(EXTRA_DEV_PKGS) @info "Installing Extra Packages for testing" EXTRA_PKGS EXTRA_DEV_PKGS isempty(EXTRA_PKGS) || Pkg.add(EXTRA_PKGS) isempty(EXTRA_DEV_PKGS) || Pkg.develop(EXTRA_DEV_PKGS) - Pkg.update() Base.retry_load_extensions() Pkg.instantiate() Pkg.precompile()