-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #471 from sony/feature/20230614-combine-hpcx-openmpi
Support HPC-X for release docker images
- Loading branch information
Showing
5 changed files
with
186 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| --- old/hpcx-init-ompi.sh 2023-06-14 19:39:44.791319808 +0900 | ||
| +++ new/hpcx-init-ompi.sh 2023-06-14 19:42:08.339318226 +0900 | ||
| @@ -1,5 +1,5 @@ | ||
| #!/bin/bash | ||
| -mydir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
| +mydir="/opt/mpi/hpcx-v2.12" | ||
|
|
||
| export HPCX_DIR=$mydir | ||
| export HPCX_UCX_DIR=${HPCX_DIR}/ucx | ||
| @@ -20,13 +20,18 @@ | ||
| export OSHMEM_HOME=${HPCX_MPI_DIR} | ||
| export SHMEM_HOME=${HPCX_MPI_DIR} | ||
|
|
||
| -function hpcx_load() | ||
| -{ | ||
| - PATH=${PATH:-""} | ||
| - OPAL_PREFIX=${OPAL_PREFIX:-""} | ||
| +hpcx_load() { | ||
| + if [ "x$PATH" = "x" ]; then | ||
| + export PATH="" | ||
| + fi | ||
| + if [ "x$OPAL_PREFIX" = "x" ]; then | ||
| + export OPAL_PREFIX="" | ||
| + fi | ||
| export OLD_PATH=$PATH | ||
| export OLD_OPAL_PREFIX=${OPAL_PREFIX} | ||
| + export OLD_PMIX_INSTALL_PREFIX=${PMIX_INSTALL_PREFIX} | ||
| export OPAL_PREFIX=${HPCX_MPI_DIR} | ||
| + export PMIX_INSTALL_PREFIX=${HPCX_MPI_DIR} | ||
| export PATH=${HPCX_MPI_DIR}/bin:$PATH | ||
| export PATH=${HPCX_UCX_DIR}/bin:$PATH | ||
| export PATH=${HPCX_UCC_DIR}/bin:$PATH | ||
| @@ -34,7 +39,9 @@ | ||
| export PATH=${HPCX_CLUSTERKIT_DIR}/bin:$PATH | ||
| export PATH=${HPCX_SHARP_DIR}/bin:$PATH | ||
|
|
||
| - LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-""} | ||
| + if [ "x$LD_LIBRARY_PATH" = "x" ]; then | ||
| + export LD_LIBRARY_PATH="" | ||
| + fi | ||
| export OLD_LD_LIBRARY_PATH=${LD_LIBRARY_PATH} | ||
| export LD_LIBRARY_PATH=${HPCX_MPI_DIR}/lib:${LD_LIBRARY_PATH} | ||
| export LD_LIBRARY_PATH=${HPCX_HCOLL_DIR}/lib:${LD_LIBRARY_PATH} | ||
| @@ -45,7 +52,9 @@ | ||
| export LD_LIBRARY_PATH=${HPCX_UCC_DIR}/lib/ucc:${LD_LIBRARY_PATH} | ||
| export LD_LIBRARY_PATH=${HPCX_NCCL_RDMA_SHARP_PLUGIN_DIR}/lib:${LD_LIBRARY_PATH} | ||
|
|
||
| - LIBRARY_PATH=${LIBRARY_PATH:-""} | ||
| + if [ "x$LIBRARY_PATH" = "x" ]; then | ||
| + export LIBRARY_PATH="" | ||
| + fi | ||
| export OLD_LIBRARY_PATH=${LIBRARY_PATH} | ||
| export LIBRARY_PATH=${HPCX_MPI_DIR}/lib:${LIBRARY_PATH} | ||
| export LIBRARY_PATH=${HPCX_HCOLL_DIR}/lib:${LIBRARY_PATH} | ||
| @@ -55,7 +64,9 @@ | ||
| export LIBRARY_PATH=${HPCX_MPI_DIR}/lib:${LIBRARY_PATH} | ||
| export LIBRARY_PATH=${HPCX_NCCL_RDMA_SHARP_PLUGIN_DIR}/lib:${LIBRARY_PATH} | ||
|
|
||
| - CPATH=${CPATH:-""} | ||
| + if [ "x$CPATH" = "x" ]; then | ||
| + export CPATH="" | ||
| + fi | ||
| export OLD_CPATH=$CPATH | ||
| export CPATH=${HPCX_HCOLL_DIR}/include:$CPATH | ||
| export CPATH=${HPCX_SHARP_DIR}/include:$CPATH | ||
| @@ -63,18 +74,20 @@ | ||
| export CPATH=${HPCX_UCC_DIR}/include:$CPATH | ||
| export CPATH=${HPCX_MPI_DIR}/include:$CPATH | ||
|
|
||
| - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-""} | ||
| + if [ "x$PKG_CONFIG_PATH" = "x" ]; then | ||
| + export PKG_CONFIG_PATH="" | ||
| + fi | ||
| export OLD_PKG_CONFIG_PATH=${PKG_CONFIG_PATH} | ||
| export PKG_CONFIG_PATH=${HPCX_MPI_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} | ||
| export PKG_CONFIG_PATH=${HPCX_HCOLL_DIR}/lib/pkgconfig:${HPCX_SHARP_DIR}/lib/pkgconfig:${HPCX_UCX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} | ||
| } | ||
|
|
||
| -function hpcx_unload() | ||
| -{ | ||
| +hpcx_unload() { | ||
| export PATH=${OLD_PATH} | ||
| export LD_LIBRARY_PATH=${OLD_LD_LIBRARY_PATH} | ||
| export LIBRARY_PATH=${OLD_LIBRARY_PATH} | ||
| export OPAL_PREFIX=${OLD_OPAL_PREFIX} | ||
| + export PMIX_INSTALL_PREFIX=${OLD_PMIX_INSTALL_PREFIX} | ||
| export CPATH=${OLD_CPATH} | ||
| export PKG_CONFIG_PATH=${OLD_PKG_CONFIG_PATH} | ||
| for var in $(env|grep HPCX_|cut -f1 -d=) MPI_HOME OSHMEM_HOME SHMEM_HOME OMPI_HOME; do |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| --- old/ompi/etc/openmpi-mca-params.conf 2023-06-26 20:44:30.747239585 +0900 | ||
| +++ new/ompi/etc/openmpi-mca-params.conf 2023-06-26 20:49:55.143401095 +0900 | ||
| @@ -59,8 +59,7 @@ | ||
| # parameters available and their default values. | ||
| #rmaps_base_mapping_policy = dist:auto | ||
| coll = ^ml | ||
| -hwloc_base_binding_policy = core | ||
| -btl = self | ||
| +hwloc_base_binding_policy = none # core | ||
| pml_ucx_tls = any | ||
| pml_ucx_devices = any | ||
| opal_common_ucx_opal_mem_hooks = 0 | ||
| @@ -92,4 +91,6 @@ | ||
| coll_tuned_scatter_large_msg = 250000 | ||
| coll_tuned_scatter_min_procs = 1048510 | ||
| coll_tuned_scatter_algorithm_max_requests = 64 | ||
| +coll_hcoll_enable = 0 | ||
|
|
||
| +btl_openib_allow_ib = 1 |