Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make UCX/UCC required dependencies #184

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Make UCX/UCC required dependencies #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e91edd
Update UCX/UCC support
dalcinl Oct 24, 2024
f2a399b
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.0, and co…
dalcinl Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ...da_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ mpi_type:
- conda
target_platform:
- linux-64
ucc:
- '1'
ucx:
- '1.17'
zip_keys:
Expand Down
2 changes: 2 additions & 0 deletions ...compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ mpi_type:
- external
target_platform:
- linux-64
ucc:
- '1'
ucx:
- '1.17'
zip_keys:
Expand Down
2 changes: 2 additions & 0 deletions ...da_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ mpi_type:
- conda
target_platform:
- linux-aarch64
ucc:
- '1'
ucx:
- '1.17'
zip_keys:
Expand Down
2 changes: 2 additions & 0 deletions ...compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ mpi_type:
- external
target_platform:
- linux-aarch64
ucc:
- '1'
ucx:
- '1.17'
zip_keys:
Expand Down
2 changes: 0 additions & 2 deletions ...da_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ mpi_type:
- conda
target_platform:
- linux-ppc64le
ucx:
- '1.17'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
2 changes: 0 additions & 2 deletions ...compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ mpi_type:
- external
target_platform:
- linux-ppc64le
ucx:
- '1.17'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
8 changes: 0 additions & 8 deletions .ci_support/migrations/ucx117.yaml
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 27 additions & 16 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 28 additions & 3 deletions azure-pipelines.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions recipe/build-mpi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/bash

set -ex

# avoid absolute-paths in compilers
Expand Down Expand Up @@ -83,12 +82,11 @@ fi
--with-hwloc=$PREFIX \
--with-libevent=$PREFIX \
--with-zlib=$PREFIX \
--enable-mca-dso \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@minrk I seems it works w.r.t. CUDA. Am I missing something?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like cuda components are DSOs by default in openmpi 5: open-mpi/ompi#12055 (also reflected in build output, which shows all the components that link libcuda are in DSOs).

but the docs haven't been updated to reflect that: open-mpi/ompi#12911

--enable-ipv6 \
$build_with_ucx \
$build_with_ucc \
$build_with_cuda \
|| (cat config.log; false)
|| (cat config.log; exit 1)

make -j"${CPU_COUNT:-1}"
make install
Expand Down
7 changes: 1 addition & 6 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% set version = "5.0.5" %}
{% set major = version.rpartition('.')[0] %}
{% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %}
{% set build = 3 %}
{% set build = 4 %}

# give conda package a higher build number
{% if mpi_type == 'conda' %}
Expand Down Expand Up @@ -40,9 +40,6 @@ outputs:
track_features:
- openmpi_{{ mpi_type }}
{% endif %}
ignore_run_exports:
- ucx # [linux]
- ucc # [linux]
ignore_run_exports_from:
- {{ compiler('cuda') }} # [cuda_compiler != "None"]
requirements:
Expand Down Expand Up @@ -73,8 +70,6 @@ outputs:
#- openpmix
#- prrte
run_constrained:
- {{ pin_compatible("ucx", max_pin="x.x") }} # [linux and not ppc64le]
- {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not ppc64le]
# Open MPI only uses CUDA Driver APIs, set the minimal driver version
- __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"]
# Ensure a consistent CUDA environment
Expand Down
25 changes: 12 additions & 13 deletions recipe/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ pushd "tests"

if [[ $PKG_NAME == "openmpi" ]]; then

if [[ -n "$(conda list | grep ucx)" ]]; then
echo "Improper UCX dependency!"
exit 1
fi

if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then
if [[ -z "$(ompi_info | grep ucx)" ]]; then
echo "OpenMPI configured without UCX support!"
exit 1
fi
if [[ -z "$(ompi_info | grep ucc)" ]]; then
echo "OpenMPI configured without UCC support!"
exit 1
fi
if [[ -z "$(ompi_info | grep ucx)" ]]; then
echo "OpenMPI configured without UCX support!"
exit 1
fi
fi

if [[ -n "$(conda list | grep cuda-version)" ]]; then
Expand All @@ -25,10 +24,10 @@ if [[ $PKG_NAME == "openmpi" ]]; then
fi

if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then
if [[ -z "$(ompi_info | grep cuda)" ]]; then
echo "OpenMPI configured without CUDA support!"
exit 1
fi
if [[ -z "$(ompi_info | grep cuda)" ]]; then
echo "OpenMPI configured without CUDA support!"
exit 1
fi
fi

command -v ompi_info
Expand Down