Skip to content

Commit 33b3810

Browse files
authored
Merge pull request #103 from minrk/ucx-run-constrained
put ucx dependency in run_constrained
2 parents 6e0ab71 + 8770f85 commit 33b3810

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

recipe/meta.yaml

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

55
# give conda package a higher build number
66
{% if mpi_type == 'conda' %}
@@ -22,25 +22,14 @@ build:
2222
skip: true # [win]
2323

2424
outputs:
25-
{% if mpi_type == 'external' %}
26-
- name: openmpi
27-
build:
28-
noarch: generic
29-
string: {{ mpi_type }}_{{ build }}
30-
track_features:
31-
- openmpi_{{ mpi_type }}
32-
requirements:
33-
run:
34-
- mpi 1.0 openmpi
35-
test:
36-
commands:
37-
- echo "It works!"
38-
{% else %}
25+
{% if mpi_type == 'conda' %}
3926
- name: openmpi
4027
script: build-mpi.sh
4128
build:
4229
run_exports:
4330
- {{ pin_subpackage('openmpi', min_pin='x.x.x', max_pin='x') }}
31+
ignore_run_exports:
32+
- ucx # [enable_cuda]
4433
script_env:
4534
- CUDA_HOME # [enable_cuda]
4635
requirements:
@@ -62,7 +51,7 @@ outputs:
6251
- mpi 1.0 openmpi
6352
run_constrained:
6453
- cudatoolkit >= {{ cudatoolkit }} # [enable_cuda]
65-
- ucx # [enable_cuda]
54+
- {{ pin_compatible("ucx", max_pin="x.x") }} # [enable_cuda]
6655
test:
6756
script: run_test.sh
6857
files:
@@ -122,6 +111,19 @@ outputs:
122111
- mpiexec.sh
123112
- tests/helloworld.f
124113
- tests/helloworld.f90
114+
{% else %}
115+
- name: openmpi
116+
build:
117+
string: {{ mpi_type }}_{{ build }}
118+
track_features:
119+
- openmpi_{{ mpi_type }}
120+
requirements:
121+
host: []
122+
run:
123+
- mpi 1.0 openmpi
124+
test:
125+
commands:
126+
- echo "It works!"
125127
{% endif %}
126128

127129
about:

recipe/run_test.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ if [[ $PKG_NAME == "openmpi" ]]; then
1212
command -v ompi_info
1313
ompi_info
1414

15+
if [[ ! -z "$(conda list | grep ucx)" ]]; then
16+
echo "Improper UCX dependency!"
17+
exit 1
18+
fi
19+
if [[ ! -z "$(conda list | grep cudatoolkit)" ]]; then
20+
echo "Improper cuda dependency!"
21+
exit 1
22+
fi
23+
1524
command -v mpiexec
1625
which mpiexec
1726
$MPIEXEC --help

0 commit comments

Comments
 (0)