From 73d15fae1dbd78ce7b4493817f97547cc527ecb3 Mon Sep 17 00:00:00 2001 From: GiackAloZ Date: Tue, 29 Oct 2024 15:04:01 +0100 Subject: [PATCH] Rollback some of the checks --- test/ParallelKernel/test_allocators.jl | 10 +--------- test/ParallelKernel/test_kernel_language.jl | 8 ++------ test/ParallelKernel/test_parallel.jl | 8 ++------ test/test_parallel.jl | 8 ++------ 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/test/ParallelKernel/test_allocators.jl b/test/ParallelKernel/test_allocators.jl index cc982fee..b58d3212 100644 --- a/test/ParallelKernel/test_allocators.jl +++ b/test/ParallelKernel/test_allocators.jl @@ -22,15 +22,7 @@ end @static if PKG_METAL in TEST_PACKAGES import Metal if !Metal.functional() TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) end -end -@static if PKG_METAL in TEST_PACKAGES - @static if Sys.isapple() - import Metal - if !Metal.functional() TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) end - @define_MtlCellArray - else - TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) - end + @define_MtlCellArray end @static if PKG_POLYESTER in TEST_PACKAGES import Polyester diff --git a/test/ParallelKernel/test_kernel_language.jl b/test/ParallelKernel/test_kernel_language.jl index 0e691b3b..c5a66912 100644 --- a/test/ParallelKernel/test_kernel_language.jl +++ b/test/ParallelKernel/test_kernel_language.jl @@ -15,12 +15,8 @@ end if !AMDGPU.functional() TEST_PACKAGES = filter!(x->x≠PKG_AMDGPU, TEST_PACKAGES) end end @static if PKG_METAL in TEST_PACKAGES - @static if Sys.isapple() - import Metal - if !Metal.functional() TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) end - else - TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) - end + import Metal + if !Metal.functional() TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) end end @static if PKG_POLYESTER in TEST_PACKAGES import Polyester diff --git a/test/ParallelKernel/test_parallel.jl b/test/ParallelKernel/test_parallel.jl index 1e0ea3f9..fcba1dbf 100644 --- a/test/ParallelKernel/test_parallel.jl +++ b/test/ParallelKernel/test_parallel.jl @@ -17,12 +17,8 @@ end if !AMDGPU.functional() TEST_PACKAGES = filter!(x->x≠PKG_AMDGPU, TEST_PACKAGES) end end @static if PKG_METAL in TEST_PACKAGES - @static if Sys.isapple() - import Metal - if !Metal.functional() TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) end - else - TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) - end + import Metal + if !Metal.functional() TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) end end @static if PKG_POLYESTER in TEST_PACKAGES import Polyester diff --git a/test/test_parallel.jl b/test/test_parallel.jl index a3c66946..07cbf707 100644 --- a/test/test_parallel.jl +++ b/test/test_parallel.jl @@ -16,12 +16,8 @@ end if !AMDGPU.functional() TEST_PACKAGES = filter!(x->x≠PKG_AMDGPU, TEST_PACKAGES) end end @static if PKG_METAL in TEST_PACKAGES - @static if Sys.isapple() - import Metal - if !Metal.functional() TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) end - else - TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) - end + import Metal + if !Metal.functional() TEST_PACKAGES = filter!(x->x≠PKG_METAL, TEST_PACKAGES) end end @static if PKG_POLYESTER in TEST_PACKAGES import Polyester