From 34e8aa0c086c6f6c381de939c09125b3d797cfc7 Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Wed, 20 Nov 2024 10:13:00 -0500 Subject: [PATCH 1/4] ci: install specific AMDGPU version --- lib/LuxLib/test/runtests.jl | 2 +- lib/MLDataDevices/test/runtests.jl | 2 +- lib/WeightInitializers/test/runtests.jl | 3 ++- test/runtests.jl | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/LuxLib/test/runtests.jl b/lib/LuxLib/test/runtests.jl index cc65b85f4..35b70f635 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") && diff --git a/lib/MLDataDevices/test/runtests.jl b/lib/MLDataDevices/test/runtests.jl index 4b02862e3..e6d6de747 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") && diff --git a/lib/WeightInitializers/test/runtests.jl b/lib/WeightInitializers/test/runtests.jl index 9de7d16bf..2d2621622 100644 --- a/lib/WeightInitializers/test/runtests.jl +++ b/lib/WeightInitializers/test/runtests.jl @@ -8,7 +8,8 @@ const BACKEND_GROUP = lowercase(get(ENV, "BACKEND_GROUP", "All")) const EXTRA_PKGS = String[] (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 == "amdgpu") && + push!(EXTRA_PKGS, "AMDGPU"; version=v"1.0.4") (BACKEND_GROUP == "all" || BACKEND_GROUP == "metal") && push!(EXTRA_PKGS, "Metal") (BACKEND_GROUP == "all" || BACKEND_GROUP == "oneapi") && push!(EXTRA_PKGS, "oneAPI") diff --git a/test/runtests.jl b/test/runtests.jl index 4ae064c70..80244e6e1 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -44,7 +44,7 @@ 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("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 From 8a6af54c0735fe13727ab33e212db8aba371fb04 Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Wed, 20 Nov 2024 10:15:24 -0500 Subject: [PATCH 2/4] chore: apply formatting suggestion Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- test/runtests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runtests.jl b/test/runtests.jl index 80244e6e1..2ee073173 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -44,7 +44,7 @@ if (BACKEND_GROUP == "all" || BACKEND_GROUP == "cuda") end end (BACKEND_GROUP == "all" || BACKEND_GROUP == "amdgpu") && - push!(EXTRA_PKGS, Pkg.PackageSpec("AMDGPU", version=v"1.0.4")) + push!(EXTRA_PKGS, Pkg.PackageSpec("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 From aef0f1ef4cbddcbb544185ff46ca5295d93f2914 Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Wed, 20 Nov 2024 10:26:21 -0500 Subject: [PATCH 3/4] ci: dont pkg update --- lib/LuxLib/test/runtests.jl | 1 - lib/MLDataDevices/test/runtests.jl | 1 - lib/WeightInitializers/test/runtests.jl | 1 - test/runtests.jl | 1 - 4 files changed, 4 deletions(-) diff --git a/lib/LuxLib/test/runtests.jl b/lib/LuxLib/test/runtests.jl index 35b70f635..3e58328c0 100644 --- a/lib/LuxLib/test/runtests.jl +++ b/lib/LuxLib/test/runtests.jl @@ -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 e6d6de747..4617a3a5d 100644 --- a/lib/MLDataDevices/test/runtests.jl +++ b/lib/MLDataDevices/test/runtests.jl @@ -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 2d2621622..eb2402f99 100644 --- a/lib/WeightInitializers/test/runtests.jl +++ b/lib/WeightInitializers/test/runtests.jl @@ -16,7 +16,6 @@ const EXTRA_PKGS = String[] 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 2ee073173..382adac0b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -50,7 +50,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() Pkg.precompile() From 7705a2da7e7b4ba8bb1d7bec9880e24602560d73 Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Wed, 20 Nov 2024 12:01:19 -0500 Subject: [PATCH 4/4] ci: fix install syntax --- lib/WeightInitializers/test/runtests.jl | 13 ++++++++----- test/runtests.jl | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/WeightInitializers/test/runtests.jl b/lib/WeightInitializers/test/runtests.jl index eb2402f99..ff223653a 100644 --- a/lib/WeightInitializers/test/runtests.jl +++ b/lib/WeightInitializers/test/runtests.jl @@ -5,13 +5,16 @@ 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 == "cuda") && + push!(EXTRA_PKGS, PackageSpec("CUDA")) (BACKEND_GROUP == "all" || BACKEND_GROUP == "amdgpu") && - push!(EXTRA_PKGS, "AMDGPU"; version=v"1.0.4") -(BACKEND_GROUP == "all" || BACKEND_GROUP == "metal") && push!(EXTRA_PKGS, "Metal") -(BACKEND_GROUP == "all" || BACKEND_GROUP == "oneapi") && push!(EXTRA_PKGS, "oneAPI") + 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 diff --git a/test/runtests.jl b/test/runtests.jl index 382adac0b..0e1935d46 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -44,7 +44,7 @@ if (BACKEND_GROUP == "all" || BACKEND_GROUP == "cuda") end end (BACKEND_GROUP == "all" || BACKEND_GROUP == "amdgpu") && - push!(EXTRA_PKGS, Pkg.PackageSpec("AMDGPU"; version=v"1.0.4")) + 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