diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-09-25 13:55:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:55:23 +0200 |
| commit | 1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3 (patch) | |
| tree | d326f7936b3dec5c0d61349047516a67127da7a6 /python/conda/libastra | |
| parent | 6e9fb3ec670863b62006288cd8bba5b773530a53 (diff) | |
| parent | d621b2ceed23f4ecc945b00ffd6e859b70b89b50 (diff) | |
| download | astra-1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3.tar.gz astra-1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3.tar.bz2 astra-1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3.tar.xz astra-1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3.zip | |
Merge pull request #214 from ahendriksen/CI-use-conda-c-compiler-toolchain
Use conda compiler toolchain for conda builds
Diffstat (limited to 'python/conda/libastra')
| -rwxr-xr-x[-rw-r--r--] | python/conda/libastra/build.sh | 26 | ||||
| -rw-r--r-- | python/conda/libastra/linux_build_config.yaml | 4 | ||||
| -rw-r--r-- | python/conda/libastra/meta.yaml | 13 |
3 files changed, 20 insertions, 23 deletions
diff --git a/python/conda/libastra/build.sh b/python/conda/libastra/build.sh index d19c7af..4e48ba6 100644..100755 --- a/python/conda/libastra/build.sh +++ b/python/conda/libastra/build.sh @@ -18,35 +18,27 @@ cd $SRC_DIR/build/linux $SRC_DIR/build/linux/autogen.sh -# Add C++11 to compiler flags if nvcc supports it, mostly to work around a boost bug +# Add C++11 to compiler flags, mostly to work around a boost bug. +# Since we require cudatoolkit>=8.0 nvcc supports this. NVCC=$CUDA_ROOT/bin/nvcc -echo "int main(){return 0;}" > $CONDA_PREFIX/test.cu -$NVCC $CONDA_PREFIX/test.cu -ccbin $CC --std=c++11 -o $CONDA_PREFIX/test.out > /dev/null 2>&1 && EXTRA_NVCCFLAGS="--std=c++11" || true -rm -f $CONDA_PREFIX/test.out $CONDA_PREFIX/test.cu +EXTRA_NVCCFLAGS="--std=c++11" -$SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT --prefix=$CONDA_PREFIX NVCCFLAGS="-ccbin $CC -I$CONDA_PREFIX/include $EXTRA_NVCCFLAGS" CC=$CC CXX=$CXX CPPFLAGS="-I$CONDA_PREFIX/include" + +$SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT --prefix=$PREFIX NVCCFLAGS="-ccbin $CC -I$PREFIX/include $EXTRA_NVCCFLAGS" CC=$CC CXX=$CXX CPPFLAGS="-I$PREFIX/include" # Clean, because we may be re-using this source tree when building # multiple variants of this conda package. make clean -make -j $CPU_COUNT install-libraries +make -j $CPU_COUNT +make -j $CPU_COUNT install-dev test -d $CUDA_ROOT/lib64 && LIBPATH="$CUDA_ROOT/lib64" || LIBPATH="$CUDA_ROOT/lib" case `uname` in Darwin*) - cp -P $LIBPATH/libcudart.*.dylib $CONDA_PREFIX/lib - cp -P $LIBPATH/libcufft.*.dylib $CONDA_PREFIX/lib - ;; - Linux*) - if [ "$cudatoolkit" = "7.0" ]; then - # For some reason conda-build adds these symlinks automatically for - # cudatoolkit-5.5 and 6.0, but not 7.0. For 7.5 these symlinks are not - # necessary, and for 8.0 the cudatoolkit packages includes them. - ln -T -s libcudart.so.7.0.28 $CONDA_PREFIX/lib/libcudart.so.7.0 - ln -T -s libcufft.so.7.0.35 $CONDA_PREFIX/lib/libcufft.so.7.0 - fi + cp -P $LIBPATH/libcudart.*.dylib $PREFIX/lib + cp -P $LIBPATH/libcufft.*.dylib $PREFIX/lib ;; esac diff --git a/python/conda/libastra/linux_build_config.yaml b/python/conda/libastra/linux_build_config.yaml index 41db828..b415b4a 100644 --- a/python/conda/libastra/linux_build_config.yaml +++ b/python/conda/libastra/linux_build_config.yaml @@ -4,3 +4,7 @@ cudatoolkit: - 9.2 - 10.0 - 10.1 +c_compiler_version: # [linux or win] + - 5.4 # [linux or win] +cxx_compiler_version: # [linux or win] + - 5.4 # [linux or win] diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index 59c3a09..407929b 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -8,21 +8,22 @@ source: build: number: 0 - script_env: - - CC # [linux] - - CXX # [linux] + string: cuda_{{ cudatoolkit }} # [linux] requirements: build: - - {{compiler('c')}} # [win] + - {{ compiler('c') }} # [win or linux] + - {{ compiler('cxx') }} # [linux] - boost # [osx] - automake # [osx] - autoconf # [osx] - libtool # [osx] + host: + - boost # [osx or linux] - cudatoolkit {{ cudatoolkit }} # [linux] - run: - - cudatoolkit {{ cudatoolkit }} # [linux] + # See: https://github.com/conda-forge/conda-forge.github.io/issues/687#issuecomment-460095230 + - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} # [linux] about: home: http://www.astra-toolbox.com |