From ead45ca2e4f266036f53a9502ab23d800deefaf1 Mon Sep 17 00:00:00 2001 From: Samuel Omlin Date: Thu, 18 Jan 2024 15:47:14 +0100 Subject: [PATCH] move module imports triggering extensions before ImplicitGlobalGrid --- test/test_finalize_global_grid.jl | 2 +- test/test_gather.jl | 2 +- test/test_init_global_grid.jl | 2 +- test/test_select_device.jl | 5 ++--- test/test_tools.jl | 2 +- test/test_update_halo.jl | 6 ++---- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/test/test_finalize_global_grid.jl b/test/test_finalize_global_grid.jl index dac6678..d80bfce 100644 --- a/test/test_finalize_global_grid.jl +++ b/test/test_finalize_global_grid.jl @@ -1,7 +1,7 @@ push!(LOAD_PATH, "../src") using Test +import MPI, CUDA, AMDGPU using ImplicitGlobalGrid; GG = ImplicitGlobalGrid -import MPI import ImplicitGlobalGrid: @require diff --git a/test/test_gather.jl b/test/test_gather.jl index 42cc4af..9debc3a 100644 --- a/test/test_gather.jl +++ b/test/test_gather.jl @@ -1,7 +1,7 @@ push!(LOAD_PATH, "../src") using Test +import MPI, CUDA, AMDGPU using ImplicitGlobalGrid; GG = ImplicitGlobalGrid -import MPI import ImplicitGlobalGrid: @require diff --git a/test/test_init_global_grid.jl b/test/test_init_global_grid.jl index 9076a94..19c1d02 100644 --- a/test/test_init_global_grid.jl +++ b/test/test_init_global_grid.jl @@ -1,7 +1,7 @@ push!(LOAD_PATH, "../src") using Test +import MPI, CUDA, AMDGPU using ImplicitGlobalGrid; GG = ImplicitGlobalGrid -import MPI import ImplicitGlobalGrid: @require diff --git a/test/test_select_device.jl b/test/test_select_device.jl index 4a5b37a..79c2c7a 100644 --- a/test/test_select_device.jl +++ b/test/test_select_device.jl @@ -1,10 +1,9 @@ # NOTE: All tests of this file can be run with any number of processes. push!(LOAD_PATH, "../src") using Test -using ImplicitGlobalGrid; GG = ImplicitGlobalGrid import MPI -using CUDA -using AMDGPU +using CUDA, AMDGPU +using ImplicitGlobalGrid; GG = ImplicitGlobalGrid import ImplicitGlobalGrid: @require test_cuda = CUDA.functional() diff --git a/test/test_tools.jl b/test/test_tools.jl index fdcf432..d2785d2 100644 --- a/test/test_tools.jl +++ b/test/test_tools.jl @@ -1,7 +1,7 @@ push!(LOAD_PATH, "../src") using Test +import MPI, CUDA, AMDGPU using ImplicitGlobalGrid; GG = ImplicitGlobalGrid -import MPI import ImplicitGlobalGrid: @require macro coords(i) :(GG.global_grid().coords[$i]) end diff --git a/test/test_update_halo.jl b/test/test_update_halo.jl index fb57038..1bff613 100644 --- a/test/test_update_halo.jl +++ b/test/test_update_halo.jl @@ -4,11 +4,9 @@ push!(LOAD_PATH, "../src") using Test -import LoopVectorization +import MPI, LoopVectorization +using CUDA, AMDGPU using ImplicitGlobalGrid; GG = ImplicitGlobalGrid -import MPI -using CUDA -using AMDGPU import ImplicitGlobalGrid: @require, longnameof test_cuda = CUDA.functional()