committing to save

lanl · Dec 17, 2024 · 1242d71 · 1242d71
1 parent 9b2c0c8
commit 1242d71
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/.conda/evpfft/cuda/build.sh b/.conda/evpfft/cuda/build.sh
@@ -12,8 +12,12 @@ source "$RECIPE_DIR/../../cross-compile-setup.sh"
 #           ^ Passes $NVCC_WRAPPER_DEFAULT_COMPILER as the host compiler to nvcc
 # Setting NVCC_WRAPPER_DEFAULT_COMPILER=$GXX enforces that
 # nvcc gets the correct compiler for the target platform.
-export OMPI_CXX=nvcc_wrapper
-export NVCC_WRAPPER_DEFAULT_COMPILER=$GXX
+#export OMPI_CXX=nvcc_wrapper
+#export NVCC_WRAPPER_DEFAULT_COMPILER=$GXX
+
+    #-D CMAKE_CXX_COMPILER=$BUILD_PREFIX/bin/mpicxx \
+    #-D CMAKE_C_COMPILER=$BUILD_PREFIX/bin/mpicc \
+    #-D CUDAToolkit_ROOT=$PREFIX/bin \
 
 cd src/EVPFFT
 mkdir build
@@ -23,8 +27,5 @@ cmake ../src/ \
     -D USE_CUFFT=1 \
     $CMAKE_ARGS \
     -D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS" \
-    -D CUDAToolkit_ROOT=$PREFIX/bin \
-    -D CMAKE_CXX_COMPILER=$BUILD_PREFIX/bin/mpicxx \
-    -D CMAKE_C_COMPILER=$BUILD_PREFIX/bin/mpicc \
 
-make install
+make install
diff --git a/.conda/evpfft/cuda/meta.yaml b/.conda/evpfft/cuda/meta.yaml
@@ -27,6 +27,7 @@ requirements:
     - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
     - cuda-toolkit
     - kokkos=4.1
+    - matar-cuda
     - openmpi
   host:
     - openmpi

diff --git a/lib/Elements b/lib/Elements
diff --git a/src/EVPFFT/src/CMakeLists.txt b/src/EVPFFT/src/CMakeLists.txt
@@ -62,13 +62,13 @@ endif()
 # HAVE_KOKKOS must be defined for MATAR to build Kokkos types
 add_definitions(-DHAVE_KOKKOS=1)
 
-#if (NOT BUILD_EVPFFT_FIERRO)
-  #if (USE_CUFFT)
-  #  find_package(CUDAToolkit REQUIRED)
-  #endif()
-#  find_package(Kokkos REQUIRED)
-#endif()
-find_package(Kokkos REQUIRED)
+if (NOT BUILD_EVPFFT_FIERRO)
+  if (USE_CUFFT)
+    find_package(CUDAToolkit REQUIRED)
+  endif()
+  find_package(Kokkos REQUIRED)
+endif()
+#find_package(Kokkos REQUIRED)
 find_package(MPI REQUIRED)
 find_package(Heffte REQUIRED)
 # HDF5
@@ -136,8 +136,10 @@ elseif (USE_MKL)
   add_definitions(-DUSE_MKL=1)
 elseif (USE_CUFFT)
   add_definitions(-DUSE_CUFFT=1)
+  add_definitions(-DHAVE_CUDA=1)
 elseif (USE_ROCFFT)
   add_definitions(-DUSE_ROCFFT=1)
+  add_definitions(-DHAVE_HIP=1)
 else ()
   message(FATAL_ERROR "\nPlease specify what FFT backend to use: -DUSE_FFTW=1, -DUSE_MKL=1, -DUSE_CUFFT=1, or -DUSE_ROCFFT=1\n") 
 endif ()
+6 −16		CMakeLists.txt
+5 −0		examples/CMakeLists.txt
+5 −4		examples/average/test/CMakeLists.txt
+1 −1		matar
+0 −3		scripts/build-elements.sh
+3 −3		scripts/cmake_build_test.sh
+7 −7		scripts/elements-install.sh
+2 −2		scripts/setup-env.sh
+0 −3		src/elements_lib_dummy.cpp
+26 −8		tests/CMakeLists.txt