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.

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

Framework: Remove atdm environments #9414

Merged
merged 4 commits into from
Jul 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 cmake/std/atdm/ats2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ TRIBITS_ADD_ADVANCED_TEST( ats2_custom_builds_unit_tests
ARGS SHUNIT_COLOR=none ${CMAKE_CURRENT_SOURCE_DIR}/custom_builds_unit_tests.sh
PASS_REGULAR_EXPRESSION_ALL
"ERROR: A supported compiler was not selected for 'ats2' env - anything-cudas-after"
"Ran 3 tests"
"Ran 1 test"
"[^]OK[$]"
ALWAYS_FAIL_ON_NONZERO_RETURN
)
4 changes: 0 additions & 4 deletions cmake/std/atdm/ats2/all_supported_builds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,4 @@ export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=(
ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_static_opt
ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_static_dbg
ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_complex_static_opt
#ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt
#ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg
#ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt
#ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg
)
25 changes: 0 additions & 25 deletions cmake/std/atdm/ats2/custom_builds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,6 @@

# Custom compiler selection logic
if atdm_match_any_buildname_keyword \
cuda-10.1.243-xl-2020.03.18-spmpi-rolling \
cuda-10.1.243-xl-2020.03.18_spmpi-rolling \
cuda-10.1.243_xl-2020.03.18-spmpi-rolling \
cuda-10.1.243_xl-2020.03.18_spmpi-rolling \
cuda-10.1.243-xl-2020.03.18 \
cuda-10.1.243_xl-2020.03.18 \
cuda-10.1.243-xl-2020 \
cuda-10.1.243_xl-2020 \
cuda-xl \
cuda_xl \
; then
export ATDM_CONFIG_COMPILER=CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING

elif atdm_match_any_buildname_keyword \
xl-2020.03.18-spmpi-rolling \
xl-2020.03.18_spmpi-rolling \
xl-2020.03.18 \
xl-2020 \
xl \
; then
export ATDM_CONFIG_COMPILER=XL-2020.03.18_SPMPI-ROLLING

elif atdm_match_any_buildname_keyword \
cuda-10.1.243-gnu-7.3.1-spmpi-rolling \
cuda-10.1.243_gnu-7.3.1_spmpi-rolling \
cuda-10.1.243-gnu-7.3.1 \
Expand Down Expand Up @@ -64,8 +41,6 @@ else
echo "***"
echo "**** gnu-7.3.1_spmpi-rolling (default, default gnu)"
echo "**** cuda-10.1.243_gnu-7.3.1_spmpi-rolling (default cuda)"
echo "**** xl-2020.03.18_spmpi-rolling (default xl)"
echo "**** cuda-10.1.243-xl-2020.03.18_spmpi-rolling (default cuda-xl)"
echo "***"
return

Expand Down
82 changes: 0 additions & 82 deletions cmake/std/atdm/ats2/custom_builds_unit_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,88 +12,6 @@ else
SHUNIT2_DIR=`readlink -f ${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2`
fi

testXl() {
ATDM_CONFIG_BUILD_NAME=default-xl
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_xl-2020.03.18-spmpi-rolling_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_xl-2020.03.18_spmpi-rolling_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_xl-2020.03.18_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_xl-2020_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_xl_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

# This should not match anything and should be an error!
ATDM_CONFIG_BUILD_NAME=anything-xls-after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} DEFAULT ${ATDM_CONFIG_COMPILER}
}

testXlCuda() {
ATDM_CONFIG_BUILD_NAME=default-cuda-xl
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-xl-2020.03.18-spmpi-rolling_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-xl-2020.03.18_spmpi-rolling_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-xl-2020.03.18_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-xl-2020_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_cuda-xl_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_xl-2020.03.18-spmpi-rolling_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_xl-2020.03.18_spmpi-rolling_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_xl-2020.03.18_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_xl-2020_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_cuda_xl_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}

# This should not match anything and should be an error!
ATDM_CONFIG_BUILD_NAME=anything-cudas-xls-after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} DEFAULT ${ATDM_CONFIG_COMPILER}
}

#
# Test compiler parsing
#
Expand Down
25 changes: 1 addition & 24 deletions cmake/std/atdm/ats2/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
# Handle KOKKOS_ARCH
#

if [[ "$ATDM_CONFIG_COMPILER" == "GNU"* || \
"$ATDM_CONFIG_COMPILER" == "XL"* ]]; then
if [[ "$ATDM_CONFIG_COMPILER" == "GNU"* ]]; then
if [[ "$ATDM_CONFIG_KOKKOS_ARCH" == "DEFAULT" || \
"$ATDM_CONFIG_KOKKOS_ARCH" == "Power9" ]] ; then
export ATDM_CONFIG_KOKKOS_ARCH=Power9
Expand Down Expand Up @@ -96,28 +95,6 @@ if [[ "$ATDM_CONFIG_COMPILER" == *"GNU"* ]]; then

export ATDM_CONFIG_USE_NINJA=ON

elif [[ "$ATDM_CONFIG_COMPILER" == *"XL"* ]]; then

# Point to binutils root.
export BINUTILS_ROOT=/usr/tce/packages/gcc/gcc-7.3.1
export LD_LIBRARY_PATH=${BINUTILS_ROOT}/lib:${LD_LIBRARY_PATH}
export LIBRARY_PATH=${BINUTILS_ROOT}/lib
export INCLUDE=${BINUTILS_ROOT}/include:${INCLUDE}
export CPATH=${BINUTILS_ROOT}/include:${CPATH}
export BLAS_ROOT=${CBLAS_ROOT}

# Don't use ninja as the fortran compiler test is broken.
export ATDM_CONFIG_USE_NINJA=OFF

if [[ "CUDA" == "$ATDM_CONFIG_NODE_TYPE" ]]; then
export ATDM_CONFIG_CXX_FLAGS="-ccbin xlc++ -qxflag=disable__cplusplusOverride"
else
export ATDM_CONFIG_CXX_FLAGS="-qxflag=disable__cplusplusOverride"
fi

# set the gcc compiler XL will use for backend to one that handles c++14
export XLC_USR_CONFIG=/opt/ibm/xlC/16.1.1/etc/xlc.cfg.rhel.7.6.gcc.7.3.1.cuda.10.1.243
export XLF_USR_CONFIG=/opt/ibm/xlf/16.1.1/etc/xlf.cfg.rhel.7.5.gcc.7.3.1.cuda.10.1.243
fi

# Set up stuff related to CUDA
Expand Down
4 changes: 0 additions & 4 deletions cmake/std/atdm/van1-tx2/all_supported_builds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm-

export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=(
van1-tx2_arm-20.0_openmpi-4.0.2_openmp_static_opt
van1-tx2_arm-20.0_openmpi-4.0.2_openmp_static_dbg
van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_opt
van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_dbg
van1-tx2_arm-20.1_openmpi-4.0.5_openmp_static_opt
van1-tx2_arm-20.1_openmpi-4.0.5_openmp_static_dbg
)
14 changes: 0 additions & 14 deletions cmake/std/atdm/van1-tx2/custom_builds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,7 @@
# Custom builds for van1-tx2 env
#

# Try matching against arm-20.1 before arm-20 or arm
if atdm_match_any_buildname_keyword \
arm-20.0-openmpi-4.0.2 \
arm-20.0_openmpi-4.0.2 \
arm-20.0 \
; then
export ATDM_CONFIG_COMPILER=ARM-20.0_OPENMPI-4.0.2
elif atdm_match_any_buildname_keyword \
arm-20.1-openmpi-4.0.3 \
arm-20.1_openmpi-4.0.3 \
; then
export ATDM_CONFIG_COMPILER=ARM-20.1_OPENMPI-4.0.3
elif atdm_match_any_buildname_keyword \
arm-20.1-openmpi-4.0.5 \
arm-20.1_openmpi-4.0.5 \
arm-20.1 \
Expand All @@ -30,8 +18,6 @@ else
echo "***"
echo "*** Supported compilers include:"
echo "***"
echo "**** arm-20.0-openmpi-4.0.2 (arm-20.0)"
echo "**** arm-20.1-openmpi-4.0.3"
echo "**** arm-20.1-openmpi-4.0.5 (arm, arm-20, arm-20.1, default)"
echo "***"
return
Expand Down
22 changes: 0 additions & 22 deletions cmake/std/atdm/van1-tx2/custom_builds_unit_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,6 @@ testAll() {

ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/van1-tx2

#### TEST ARM-20.0 ####
ATDM_CONFIG_BUILD_NAME=before-arm-20.0-openmpi-4.0.2_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before-arm-20.0_openmpi-4.0.2-after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before_arm-20.0-after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER}

#### Test ARM-20.1 ####
ATDM_CONFIG_BUILD_NAME=before-arm-20.1-openmpi-4.0.3_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} ARM-20.1_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before-arm-20.1_openmpi-4.0.3-after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} ARM-20.1_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER}

ATDM_CONFIG_BUILD_NAME=before-arm-20.1-openmpi-4.0.5_after
. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
${_ASSERT_EQUALS_} ARM-20.1_OPENMPI-4.0.5 ${ATDM_CONFIG_COMPILER}
Expand Down
65 changes: 1 addition & 64 deletions cmake/std/atdm/van1-tx2/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,62 +45,7 @@ else
echo "NOTE: ATDM_CONFIG_DONT_LOAD_SPARC_MODULES_PLEASE=1 is set so using pre-loaded sparc-dev module!"
fi

if [[ "$ATDM_CONFIG_COMPILER" == "ARM-20.0_OPENMPI-4.0.2" ]]; then
module load devpack-arm
module unload yaml-cpp
# provides numpy module for empire
module load python/3.6.8-arm
module load arm/20.0
# Check if openmpi is already loaded. If it is, swap it. Otherwise, just load ompi4.
if [[ ! -z $(module list openmpi | grep '1)' | awk -F ' ' '{print $2}') ]]; then
module swap $(module list openmpi | grep '1)' | awk -F ' ' '{print $2}') openmpi4/4.0.2
else
module load openmpi4/4.0.2
fi
module load armpl/20.0.0

export LAPACK_ROOT="$ARMPL_LIB"
export ATDM_CONFIG_LAPACK_LIBS="-L${LAPACK_ROOT};-larmpl_ilp64_mp"
export ATDM_CONFIG_BLAS_LIBS="-L${LAPACK_ROOT};-larmpl_ilp64_mp"

# We'll use TPL_ROOT for consistency across ATDM environments
export MPI_ROOT=${MPI_DIR}
export BLAS_ROOT=${ARMPL_DIR}
export LAPACK_ROOT=${ARMPL_DIR}
export HDF5_ROOT=${HDF5_DIR}
export NETCDF_ROOT=${NETCDF_DIR}
export PNETCDF_ROOT=${PNETCDF_DIR}
export ZLIB_ROOT=${ZLIB_DIR}
export CGNS_ROOT=${CGNS_DIR}
export BOOST_ROOT=${BOOST_DIR}
export METIS_ROOT=${METIS_DIR}
export PARMETIS_ROOT=${PARMETIS_DIR}
export SUPERLUDIST_ROOT=${SUPERLU_DIST_DIR}
export BINUTILS_ROOT=${BINUTILS_DIR}

module load git/2.19.2
elif [[ "$ATDM_CONFIG_COMPILER" == "ARM-20.1_OPENMPI-4.0.3" ]]; then
atdm_config_load_sparc_dev_module sparc-dev/arm-20.1_openmpi-4.0.3
module unload yaml-cpp

if [ "$ATDM_CONFIG_NODE_TYPE" == "OPENMP" ] ; then
unset OMP_PLACES
unset OMP_PROC_BIND
fi

# We'll use TPL_ROOT for consistency across ATDM environments
export MPI_ROOT=${MPI_DIR}
export BLAS_ROOT=${ARMPL_DIR}
export HDF5_ROOT=${HDF5_DIR}
export NETCDF_ROOT=${NETCDF_DIR}
export PNETCDF_ROOT=${PNETCDF_DIR}
export ZLIB_ROOT=${ZLIB_DIR}
export CGNS_ROOT=${CGNS_DIR}
export METIS_ROOT=${METIS_DIR}
export PARMETIS_ROOT=${PARMETIS_DIR}
export SUPERLUDIST_ROOT=${SUPERLU_DIST_DIR}
export BINUTILS_ROOT=${BINUTILS_DIR}
elif [[ "$ATDM_CONFIG_COMPILER" == "ARM-20.1_OPENMPI-4.0.5" ]]; then
if [[ "$ATDM_CONFIG_COMPILER" == "ARM-20.1_OPENMPI-4.0.5" ]]; then
module load sparc-dev/arm-20.1_openmpi-4.0.5
module unload yaml-cpp

Expand Down Expand Up @@ -193,14 +138,6 @@ export ATMD_CONFIG_MPI_USE_COMPILER_WRAPPERS=ON

export ATDM_CONFIG_WCID_ACCOUNT_DEFAULT=fy150090

# Print deprecation warning
if [[ "$ATDM_CONFIG_COMPILER" != "ARM-20.1_OPENMPI-4.0.5" ]]; then
echo "***"
echo "*** DEPRECATION NOTICE:"
echo "**** WARNING: \"$ATDM_CONFIG_COMPILER\" will no longer be supported on 07-15-2021."
echo "***"
fi

#
# Done
#
Expand Down