From 24c12cc195314c39147ddecceaf5a73b1af6d02d Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Mon, 4 Nov 2024 15:59:09 -0500 Subject: [PATCH] ci: minor tweaks --- Project.toml | 2 +- docs/Project.toml | 2 +- lib/LuxLib/Project.toml | 4 ++-- lib/LuxLib/test/Project.toml | 10 +--------- lib/LuxLib/test/normalization/groupnorm_tests.jl | 8 ++++++-- lib/LuxLib/test/runtests.jl | 6 ++---- lib/LuxTestUtils/Project.toml | 2 +- test/Project.toml | 2 +- test/runtests.jl | 4 ++-- 9 files changed, 17 insertions(+), 23 deletions(-) diff --git a/Project.toml b/Project.toml index 3c23e038e0..73e10c9b91 100644 --- a/Project.toml +++ b/Project.toml @@ -76,7 +76,7 @@ Compat = "4.15" ComponentArrays = "0.15.16" ConcreteStructs = "0.2.3" DispatchDoctor = "0.4.12" -Enzyme = "0.13.1" +Enzyme = "0.13.13" EnzymeCore = "0.8.1" FastClosures = "0.3.2" Flux = "0.14.25" diff --git a/docs/Project.toml b/docs/Project.toml index 93fdd46545..7bbf11f8fd 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -36,7 +36,7 @@ ChainRulesCore = "1.24" ComponentArrays = "0.15" Documenter = "1.4" DocumenterVitepress = "0.1.3" -Enzyme = "0.13" +Enzyme = "0.13.13" FiniteDiff = "2.23.1" ForwardDiff = "0.10.36" Functors = "0.4.12" diff --git a/lib/LuxLib/Project.toml b/lib/LuxLib/Project.toml index a053be0706..ebd3b02fd6 100644 --- a/lib/LuxLib/Project.toml +++ b/lib/LuxLib/Project.toml @@ -1,7 +1,7 @@ name = "LuxLib" uuid = "82251201-b29d-42c6-8e01-566dec8acb11" authors = ["Avik Pal and contributors"] -version = "1.3.6" +version = "1.3.7" [deps] ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" @@ -65,7 +65,7 @@ ChainRulesCore = "1.24" Compat = "4.15.0" CpuId = "0.3" DispatchDoctor = "0.4.12" -Enzyme = "0.13.1" +Enzyme = "0.13.13" EnzymeCore = "0.8.1" FastClosures = "0.3.2" ForwardDiff = "0.10.36" diff --git a/lib/LuxLib/test/Project.toml b/lib/LuxLib/test/Project.toml index 8532c90de0..acb2a14469 100644 --- a/lib/LuxLib/test/Project.toml +++ b/lib/LuxLib/test/Project.toml @@ -19,7 +19,6 @@ MLDataDevices = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40" NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" Octavian = "6fd5a793-0b7e-452c-907f-f8bfe9c57db4" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -Preferences = "21216c6a-2e73-6563-6e65-726566657250" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" @@ -39,7 +38,7 @@ BLISBLAS = "0.1" BenchmarkTools = "1.5" ChainRulesCore = "1.24" ComponentArrays = "0.15.16" -Enzyme = "0.13.1" +Enzyme = "0.13.13" EnzymeCore = "0.8" ExplicitImports = "1.9.0" ForwardDiff = "0.10.36" @@ -53,7 +52,6 @@ MLDataDevices = "1.0.0" NNlib = "0.9.21" Octavian = "0.3.28" Pkg = "1.10" -Preferences = "1.4.3" Random = "1.10" ReTestItems = "1.24.0" Reexport = "1" @@ -65,9 +63,3 @@ Statistics = "1.10" Test = "1.10" Tracker = "0.2.34" Zygote = "0.6.70" - -[extras] -CUDA_Driver_jll = "4ee394cb-3365-5eb0-8335-949819d2adfc" - -[preferences.CUDA_Driver_jll] -compat = false diff --git a/lib/LuxLib/test/normalization/groupnorm_tests.jl b/lib/LuxLib/test/normalization/groupnorm_tests.jl index b0a31ba81a..627f5959aa 100644 --- a/lib/LuxLib/test/normalization/groupnorm_tests.jl +++ b/lib/LuxLib/test/normalization/groupnorm_tests.jl @@ -79,8 +79,12 @@ function run_groupnorm_testing(T, sz, groups, affine, act, aType, mode, ongpu) end const ALL_TEST_CONFIGS = Iterators.product([Float16, Float32, Float64], - ((6, 2), (4, 6, 2), (8, 8, 8, 6, 2), (3, 16, 16, 12, 2), - (4, 4, 6, 2), (2, 2, 6, 2), (3, 3, 12, 4)), + ( + (6, 2), + (4, 6, 2), + (8, 8, 8, 6, 2), (3, 16, 16, 12, 2), + (4, 4, 6, 2), (2, 2, 6, 2), (3, 3, 12, 4) + ), (2, 3), (true, false), (identity, relu, tanh_fast, sigmoid_fast, anonact)) diff --git a/lib/LuxLib/test/runtests.jl b/lib/LuxLib/test/runtests.jl index fea1e64221..cc65b85f48 100644 --- a/lib/LuxLib/test/runtests.jl +++ b/lib/LuxLib/test/runtests.jl @@ -1,10 +1,8 @@ -using ReTestItems, Pkg, LuxTestUtils, Preferences +using ReTestItems, Pkg, LuxTestUtils using InteractiveUtils, Hwloc @info sprint(versioninfo) -Preferences.set_preferences!("LuxLib", "instability_check" => "error") - const BACKEND_GROUP = lowercase(get(ENV, "BACKEND_GROUP", "all")) const EXTRA_PKGS = PackageSpec[] const EXTRA_DEV_PKGS = PackageSpec[] @@ -50,5 +48,5 @@ using LuxLib ReTestItems.runtests( LuxLib; tags=(LUXLIB_TEST_GROUP == "all" ? nothing : [Symbol(LUXLIB_TEST_GROUP)]), - nworkers=RETESTITEMS_NWORKERS, + nworkers=BACKEND_GROUP == "amdgpu" ? 0 : RETESTITEMS_NWORKERS, nworker_threads=RETESTITEMS_NWORKER_THREADS, testitem_timeout=3600) diff --git a/lib/LuxTestUtils/Project.toml b/lib/LuxTestUtils/Project.toml index 43bf1d5b76..001f335b35 100644 --- a/lib/LuxTestUtils/Project.toml +++ b/lib/LuxTestUtils/Project.toml @@ -26,7 +26,7 @@ ArrayInterface = "7.9" ChainRulesCore = "1.24.0" ComponentArrays = "0.15.14" DispatchDoctor = "0.4.12" -Enzyme = "0.13" +Enzyme = "0.13.13" FiniteDiff = "2.23.1" ForwardDiff = "0.10.36" Functors = "0.4.11" diff --git a/test/Project.toml b/test/Project.toml index 257c3bb6cc..cba7b44aa4 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -48,7 +48,7 @@ ChainRulesCore = "1.24" ComponentArrays = "0.15.16" DispatchDoctor = "0.4.12" Documenter = "1.4" -Enzyme = "0.13.1" +Enzyme = "0.13.13" ExplicitImports = "1.9.0" ForwardDiff = "0.10.36" Functors = "0.4.12" diff --git a/test/runtests.jl b/test/runtests.jl index 7397edc057..4190fec8e7 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -129,8 +129,8 @@ const RETESTITEMS_NWORKER_THREADS = parse( @info "Running tests for group: [$(i)/$(length(LUX_TEST_GROUP))] $tag" ReTestItems.runtests(Lux; tags=(tag == "all" ? nothing : [Symbol(tag)]), - nworkers=RETESTITEMS_NWORKERS, nworker_threads=RETESTITEMS_NWORKER_THREADS, - testitem_timeout=2400) + nworkers=BACKEND_GROUP == "amdgpu" ? 0 : RETESTITEMS_NWORKERS, + nworker_threads=RETESTITEMS_NWORKER_THREADS, testitem_timeout=2400) end end