Skip to content

Commit

Permalink
reverting back to original and shelving work
Browse files Browse the repository at this point in the history
  • Loading branch information
djdunning committed Aug 7, 2024
1 parent fb9d5b1 commit 0ef5f46
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .conda/heffte/cuda/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ source "$RECIPE_DIR/../../cross-compile-setup.sh"

export OMPI_CXX=$(which nvcc)
# Only do this for cross compiling
#if [ "$PLATFORM" != "linux-64" ] ; then
# export NVCC_PREPEND_FLAGS="-ccbin $CXX";
#fi
if [ "$PLATFORM" != "linux-64" ] ; then
export NVCC_PREPEND_FLAGS="-ccbin $CXX";
fi
# These things need to be set for certain cmake versions.
# The cmake CUDA compiler tests need to see the host env libs
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH $PREFIX/lib"
Expand Down
12 changes: 4 additions & 8 deletions .conda/heffte/cuda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,16 @@ 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 }}
- cuda-nvcc
#- cuda-toolkit
# These host CUDA dependencies are definitely overspecified.
# Not sure which ones are totally necessary.
host:
- cuda-cudart-static={{ cuda_version }} # Make sure your nvcc version and cudart versions are the same
#- cuda-cudart-static
- libcusolver-dev
- libcufft-dev
- libcublas-dev
Expand Down

0 comments on commit 0ef5f46

Please sign in to comment.