Commit 7e4fc401 authored by one's avatar one
Browse files

Remove deprecated args in openmpi configure cmd

parent f5a53cbe
...@@ -131,7 +131,7 @@ index 6d6be5d..d11c01a 100644 ...@@ -131,7 +131,7 @@ index 6d6be5d..d11c01a 100644
include(ROCMSetupVersion) include(ROCMSetupVersion)
diff --git a/install.sh b/install.sh diff --git a/install.sh b/install.sh
index b30a3fb..52bb5d9 100755 index b30a3fb..e577627 100755
--- a/install.sh --- a/install.sh
+++ b/install.sh +++ b/install.sh
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
...@@ -263,7 +263,7 @@ index b30a3fb..52bb5d9 100755 ...@@ -263,7 +263,7 @@ index b30a3fb..52bb5d9 100755
fi fi
# Check for successful build # Check for successful build
@@ -152,31 +173,25 @@ install_openmpi( ) @@ -152,31 +173,24 @@ install_openmpi( )
exit 3 exit 3
fi fi
...@@ -296,10 +296,9 @@ index b30a3fb..52bb5d9 100755 ...@@ -296,10 +296,9 @@ index b30a3fb..52bb5d9 100755
+ ./configure --prefix=${ompi_prefix} \ + ./configure --prefix=${ompi_prefix} \
+ --with-ucx=${ucx_prefix} \ + --with-ucx=${ucx_prefix} \
+ --with-rocm=${with_rocm} \ + --with-rocm=${with_rocm} \
+ --disable-man-pages \
+ --enable-builtin-atomics \ + --enable-builtin-atomics \
+ --enable-wrapper-rpath \ + --enable-wrapper-rpath \
+ --without-verbs --enable-mca-no-build=btl-uct + --enable-mca-no-build=btl-uct
check_exit_code 2 check_exit_code 2
make -j$(nproc) make -j$(nproc)
check_exit_code 2 check_exit_code 2
...@@ -309,7 +308,7 @@ index b30a3fb..52bb5d9 100755 ...@@ -309,7 +308,7 @@ index b30a3fb..52bb5d9 100755
fi fi
# Check for successful build # Check for successful build
@@ -184,6 +199,13 @@ install_openmpi( ) @@ -184,6 +198,13 @@ install_openmpi( )
echo "Error: OpenMPI install unsuccessful." echo "Error: OpenMPI install unsuccessful."
exit_with_error 2 exit_with_error 2
fi fi
...@@ -323,7 +322,7 @@ index b30a3fb..52bb5d9 100755 ...@@ -323,7 +322,7 @@ index b30a3fb..52bb5d9 100755
} }
# ################################################# # #################################################
@@ -232,7 +254,7 @@ enable_tracing=false @@ -232,7 +253,7 @@ enable_tracing=false
# check if we have a modern version of getopt that can handle whitespace and long parameters # check if we have a modern version of getopt that can handle whitespace and long parameters
getopt -T getopt -T
if [[ $? -eq 4 ]]; then if [[ $? -eq 4 ]]; then
...@@ -332,7 +331,7 @@ index b30a3fb..52bb5d9 100755 ...@@ -332,7 +331,7 @@ index b30a3fb..52bb5d9 100755
else else
echo "Need a new version of getopt" echo "Need a new version of getopt"
exit_with_error 1 exit_with_error 1
@@ -263,6 +285,9 @@ while true; do @@ -263,6 +284,9 @@ while true; do
--with-mpi) --with-mpi)
with_mpi=${2} with_mpi=${2}
shift 2 ;; shift 2 ;;
...@@ -342,7 +341,7 @@ index b30a3fb..52bb5d9 100755 ...@@ -342,7 +341,7 @@ index b30a3fb..52bb5d9 100755
--with-mpi-gtl) --with-mpi-gtl)
with_mpi_gtl=${2} with_mpi_gtl=${2}
shift 2 ;; shift 2 ;;
@@ -294,9 +319,6 @@ printf "\033[32mCreating project build directory in: \033[33m${build_dir}\033[0m @@ -294,9 +318,6 @@ printf "\033[32mCreating project build directory in: \033[33m${build_dir}\033[0m
# ################################################# # #################################################
# prep # prep
# ################################################# # #################################################
...@@ -352,7 +351,7 @@ index b30a3fb..52bb5d9 100755 ...@@ -352,7 +351,7 @@ index b30a3fb..52bb5d9 100755
# Default cmake executable is called cmake # Default cmake executable is called cmake
cmake_executable=cmake cmake_executable=cmake
@@ -311,7 +333,7 @@ pushd . @@ -311,7 +332,7 @@ pushd .
# ################################################# # #################################################
if [[ "${with_mpi}" == tpl/openmpi ]]; then if [[ "${with_mpi}" == tpl/openmpi ]]; then
...@@ -361,7 +360,7 @@ index b30a3fb..52bb5d9 100755 ...@@ -361,7 +360,7 @@ index b30a3fb..52bb5d9 100755
install_openmpi install_openmpi
fi fi
@@ -347,11 +369,14 @@ pushd . @@ -347,11 +368,14 @@ pushd .
if [[ "${enable_tracing}" == on || "${enable_tracing}" == true || "${enable_tracing}" == 1 || "${enable_tracing}" == enabled ]]; then if [[ "${enable_tracing}" == on || "${enable_tracing}" == true || "${enable_tracing}" == 1 || "${enable_tracing}" == enabled ]]; then
cmake_common_options="${cmake_common_options} -DHPL_TRACING=ON" cmake_common_options="${cmake_common_options} -DHPL_TRACING=ON"
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment