Skip to content

Commit e864c4e

Browse files
committed
build CUDA support on all Linux platforms
1 parent 19449fe commit e864c4e

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

recipe/build-mpi.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ if [[ "$target_platform" == osx-* ]]; then
2121
fi
2222
fi
2323

24-
if [[ -z $CUDA_HOME ]]; then
24+
if [[ -z $CUDA_PATH ]]; then
2525
build_with_cuda=""
2626
else
27-
export CFLAGS="$CFLAGS -I$CUDA_HOME/include"
28-
export CXXFLAGS="$CXXFLAGS -I$CUDA_HOME/include"
27+
export CFLAGS="$CFLAGS -I$CUDA_PATH/include"
28+
export CXXFLAGS="$CXXFLAGS -I$CUDA_PATH/include"
2929
build_with_cuda="--with-cuda --with-ucx=$PREFIX"
3030
fi
3131

recipe/conda_build_config.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
mpi_type:
2-
- external # [linux and x86_64]
2+
- external # [linux]
33
- conda
4-
docker_image: # [linux and x86_64]
5-
- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 # [linux and x86_64]
6-
cudatoolkit: # [linux and x86_64]
7-
- 10.2 # [linux and x86_64]
4+
docker_image: # [linux]
5+
- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 # [linux64]
6+
- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 # [ppc64le]
7+
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 # [aarch64]
8+
cudatoolkit: # [linux]
9+
- 10.2 # [linux64]
10+
- 11.0 # [ppc64le]
11+
- 11.0 # [aarch64]
812
enable_cuda:
9-
- True # [linux and x86_64]
10-
- False # [not (linux and x86_64)]
13+
- True # [linux]
14+
- False # [not linux]

recipe/meta.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% set version = "4.1.4" %}
22
{% set major = version.rpartition('.')[0] %}
3-
{% set build = 1 %}
3+
{% set build = 2 %}
44

55
# give conda package a higher build number
66
{% if mpi_type == 'conda' %}
@@ -30,8 +30,6 @@ outputs:
3030
- {{ pin_subpackage('openmpi', min_pin='x.x.x', max_pin='x') }}
3131
ignore_run_exports:
3232
- ucx # [enable_cuda]
33-
script_env:
34-
- CUDA_HOME # [enable_cuda]
3533
requirements:
3634
build:
3735
- {{ compiler('c') }}
@@ -50,7 +48,7 @@ outputs:
5048
- zlib
5149
- mpi 1.0 openmpi
5250
run_constrained:
53-
- cudatoolkit >= {{ cudatoolkit }} # [enable_cuda]
51+
- cudatoolkit >= {{ cudatoolkit }} # [enable_cuda]
5452
- {{ pin_compatible("ucx", max_pin="x") }} # [enable_cuda]
5553
test:
5654
script: run_test.sh

0 commit comments

Comments
 (0)