Skip to content

Commit b18e519

Browse files
committed
add pack-run in intel/amd
1 parent 65ddd66 commit b18e519

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

toolchain/scripts/stage0/install_amd.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ case "${with_amd}" in
3333
;;
3434
__SYSTEM__)
3535
echo "==================== Finding AMD compiler from system paths ===================="
36+
if [ "${PACK_RUN}" = "__TRUE__" ]; then
37+
echo "--pack-run mode specified, skip system check"
38+
else
3639
check_command clang "amd" && CC="$(realpath $(command -v clang))" || exit 1
3740
check_command clang++ "amd" && CXX="$(realpath $(command -v clang++))" || exit 1
3841
if [ "${WITH_FLANG}" = "yes" ]; then
@@ -41,6 +44,7 @@ case "${with_amd}" in
4144
check_command gfortran "gcc" && FC="gfortran" || exit 1
4245
add_lib_from_paths GCC_LDFLAGS "libgfortran.*" ${LIB_PATHS}
4346
fi
47+
fi
4448
F90="${FC}"
4549
F77="${FC}"
4650
;;

toolchain/scripts/stage0/install_intel.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ case "${with_intel}" in
3333
;;
3434
__SYSTEM__)
3535
echo "==================== Finding Intel compiler from system paths ===================="
36+
if [ "${PACK_RUN}" = "__TRUE__" ]; then
37+
echo "--pack-run mode specified, skip system check"
38+
else
3639
if [ "${intel_classic}" = "yes" ]; then
3740
check_command icc "intel" && CC="$(realpath $(command -v icc))" || exit 1
3841
check_command icpc "intel" && CXX="$(realpath $(command -v icpc))" || exit 1
@@ -46,6 +49,7 @@ case "${with_intel}" in
4649
check_command ifort "intel" && FC="$(realpath $(command -v ifort))" || exit 1
4750
fi
4851
fi
52+
fi
4953
F90="${FC}"
5054
F77="${FC}"
5155
;;

toolchain/scripts/stage1/install_intelmpi.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ case "${with_intelmpi}" in
3333
;;
3434
__SYSTEM__)
3535
echo "==================== Finding Intel MPI from system paths ===================="
36+
if [ "${PACK_RUN}" = "__TRUE__" ]; then
37+
echo "--pack-run mode specified, skip system check"
38+
else
3639
check_command mpiexec "intelmpi" && MPIRUN="$(realpath $(command -v mpiexec))"
3740
if [ "${intel_classic}" = "yes" ]; then
3841
# if intel compiler used as classic, so as intelmpi
@@ -63,6 +66,7 @@ case "${with_intelmpi}" in
6366
add_lib_from_paths INTELMPI_LDFLAGS "libmpi.*" $LIB_PATHS
6467
check_lib -lmpi "intelmpi"
6568
check_lib -lmpicxx "intelmpi"
69+
fi
6670
;;
6771
__DONTUSE__)
6872
# Nothing to do

0 commit comments

Comments
 (0)