Merge pull request #184 from dalcinl/update-ucx-ucc

Make UCX/UCC required dependencies
conda-forge · Nov 13, 2024 · f12332c · f12332c
2 parents 3d726bd + 575dead
commit f12332c
Show file tree

Hide file tree

Showing 18 changed files with 96 additions and 116 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/...da_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/...da_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -34,14 +34,15 @@ mpi_type:
 - conda
 target_platform:
 - linux-64
+ucc:
+- '1'
 ucx:
 - '1.17'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image

diff --git a/...compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/...compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -34,14 +34,15 @@ mpi_type:
 - external
 target_platform:
 - linux-64
+ucc:
+- '1'
 ucx:
 - '1.17'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image

diff --git a/...da_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/...da_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_arch:
 - aarch64
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -38,14 +38,15 @@ mpi_type:
 - conda
 target_platform:
 - linux-aarch64
+ucc:
+- '1'
 ucx:
 - '1.17'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image

diff --git a/...compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/...compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_arch:
 - aarch64
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -38,14 +38,15 @@ mpi_type:
 - external
 target_platform:
 - linux-aarch64
+ucc:
+- '1'
 ucx:
 - '1.17'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image

diff --git a/...da_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/...da_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -34,14 +34,11 @@ mpi_type:
 - conda
 target_platform:
 - linux-ppc64le
-ucx:
-- '1.17'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image

diff --git a/...compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/...compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -34,14 +34,11 @@ mpi_type:
 - external
 target_platform:
 - linux-ppc64le
-ucx:
-- '1.17'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image

diff --git a/.ci_support/migrations/ucx117.yaml b/.ci_support/migrations/ucx117.yaml
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,7 +21,7 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,7 +21,7 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -ex
 
 # avoid absolute-paths in compilers
@@ -83,29 +82,16 @@ fi
             --with-hwloc=$PREFIX \
             --with-libevent=$PREFIX \
             --with-zlib=$PREFIX \
-            --enable-mca-dso \
             --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
 
 POST_LINK=$PREFIX/bin/.openmpi-post-link.sh
-if [ -n "$build_with_ucx" ]; then
-    echo "setting MCA pml to ^ucx..."
-    echo "pml = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf
-    echo "setting MCA osc to ^ucx..."
-    echo "osc = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf
-    cat $RECIPE_DIR/post-link-ucx.sh >> $POST_LINK
-fi
-if [ -n "$build_with_ucc" ]; then
-    echo "setting MCA coll_ucc_enable to 0..."
-    echo "coll_ucc_enable = 0" >> $PREFIX/etc/openmpi-mca-params.conf
-    cat $RECIPE_DIR/post-link-ucc.sh >> $POST_LINK
-fi
 if [ -n "$build_with_cuda" ]; then
     echo "setting MCA mca_base_component_show_load_errors to 0..."
     echo "mca_base_component_show_load_errors = 0" >> $PREFIX/etc/openmpi-mca-params.conf