Apply suggestions from code review

Co-authored-by: Weiqun Zhang <[email protected]>
ajnonaka · Nov 1, 2024 · 47db38b · 47db38b
1 parent e6f6c39
commit 47db38b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/ExampleCodes/FFT/Basic/GNUmakefile b/ExampleCodes/FFT/Basic/GNUmakefile
@@ -15,15 +15,5 @@ include $(AMREX_HOME)/Src/Base/Make.package
 include $(AMREX_HOME)/Src/FFT/Make.package
 include Make.package
 
-ifeq ($(USE_CUDA),TRUE)
-  libraries += -lcufft
-else ifeq ($(USE_HIP),TRUE)
-  # Use rocFFT.  ROC_PATH is defined in amrex
-  INCLUDE_LOCATIONS += $(ROC_PATH)/rocfft/include
-  LIBRARY_LOCATIONS += $(ROC_PATH)/rocfft/lib
-  LIBRARIES += -L$(ROC_PATH)/rocfft/lib -lrocfft
-else
-  libraries += -lfftw3_mpi -lfftw3f -lfftw3
-endif
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.rules
diff --git a/ExampleCodes/FFT/Basic/main.cpp b/ExampleCodes/FFT/Basic/main.cpp
@@ -115,7 +115,7 @@ int main (int argc, char* argv[])
 
         const Box& bx = mfi.fabbox();
 
-        amrex::ParallelForRNG(bx, [=] AMREX_GPU_DEVICE (int i, int j, int k, RandomEngine const& engine) noexcept
+        amrex::ParallelFor(bx, [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
         {
 
             // **********************************
@@ -154,7 +154,7 @@ int main (int argc, char* argv[])
 
         const Box& bx = mfi.fabbox();
 
-        amrex::ParallelForRNG(bx, [=] AMREX_GPU_DEVICE (int i, int j, int k, RandomEngine const& engine) noexcept
+        amrex::ParallelFor(bx, [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
         {
             phi_fft_realimag_ptr(i,j,k,0) = phi_fft_ptr(i,j,k).real();
             phi_fft_realimag_ptr(i,j,k,1) = phi_fft_ptr(i,j,k).imag();

diff --git a/ExampleCodes/FFT/Poisson/GNUmakefile b/ExampleCodes/FFT/Poisson/GNUmakefile
@@ -15,15 +15,5 @@ include $(AMREX_HOME)/Src/Base/Make.package
 include $(AMREX_HOME)/Src/FFT/Make.package
 include Make.package
 
-ifeq ($(USE_CUDA),TRUE)
-  libraries += -lcufft
-else ifeq ($(USE_HIP),TRUE)
-  # Use rocFFT.  ROC_PATH is defined in amrex
-  INCLUDE_LOCATIONS += $(ROC_PATH)/rocfft/include
-  LIBRARY_LOCATIONS += $(ROC_PATH)/rocfft/lib
-  LIBRARIES += -L$(ROC_PATH)/rocfft/lib -lrocfft
-else
-  libraries += -lfftw3_mpi -lfftw3f -lfftw3
-endif
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.rules
diff --git a/ExampleCodes/FFT/Poisson/main.cpp b/ExampleCodes/FFT/Poisson/main.cpp
@@ -113,7 +113,7 @@ int main (int argc, char* argv[])
 
         const Box& bx = mfi.fabbox();
 
-        amrex::ParallelForRNG(bx, [=] AMREX_GPU_DEVICE (int i, int j, int k, RandomEngine const& engine) noexcept
+        amrex::ParallelFor(bx, [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
         {
 
             // **********************************