From a79d87fa3bfa66d60063f6a28b65a859f0501e1d Mon Sep 17 00:00:00 2001 From: Daniel Dunning <39738037+djdunning@users.noreply.github.com> Date: Wed, 7 Aug 2024 10:19:44 -0600 Subject: [PATCH] heffte cuda 8/7 --- .conda/heffte/cuda/build.sh | 2 +- .conda/heffte/cuda/meta.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.conda/heffte/cuda/build.sh b/.conda/heffte/cuda/build.sh index d813d98a8..daa329299 100755 --- a/.conda/heffte/cuda/build.sh +++ b/.conda/heffte/cuda/build.sh @@ -21,6 +21,7 @@ fi export LD_LIBRARY_PATH="$LD_LIBRARY_PATH $PREFIX/lib" export LIBRARIES="$LIBRARIES \"-L$PREFIX/lib\"" + #-D CMAKE_CUDA_HOST_LINK_LAUNCHER=$CXX \ cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \ -D BUILD_SHARED_LIBS=ON \ -D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \ @@ -32,7 +33,6 @@ cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \ -D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS" \ -D MPI_C_COMPILER="$BUILD_PREFIX/bin/mpicc" \ -D MPI_CXX_COMPILER="$BUILD_PREFIX/bin/mpicxx" \ - -D CMAKE_CUDA_HOST_LINK_LAUNCHER=$CXX \ -D CMAKE_CUDA_COMPILER=$(which nvcc) \ make install #-j 10 install diff --git a/.conda/heffte/cuda/meta.yaml b/.conda/heffte/cuda/meta.yaml index 7868d270b..49bf9018e 100644 --- a/.conda/heffte/cuda/meta.yaml +++ b/.conda/heffte/cuda/meta.yaml @@ -23,10 +23,10 @@ requirements: build: - cmake=3.24 - {{ compiler('fortran') }}={{ linux_compiler_version }} - - {{ compiler('c') }}={{ linux_compiler_version }} # [linux] - - {{ compiler('c') }}={{ macos_compiler_version }} # [osx] - - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux] - - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx] + #- {{ compiler('c') }}={{ linux_compiler_version }} # [linux] + #- {{ compiler('c') }}={{ macos_compiler_version }} # [osx] + #- {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux] + #- {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx] - openmpi - openmpi-mpicxx - cuda-toolkit={{ cuda_version }}