ATDM/ats2: Remove all XL envs (related to #9292)

trilinos · Jul 12, 2021 · 77a5747 · 77a5747
1 parent c915912
commit 77a5747
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 53 deletions.
diff --git a/cmake/std/atdm/ats2/all_supported_builds.sh b/cmake/std/atdm/ats2/all_supported_builds.sh
@@ -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
   )
diff --git a/cmake/std/atdm/ats2/custom_builds.sh b/cmake/std/atdm/ats2/custom_builds.sh
@@ -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 \
@@ -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
 

diff --git a/cmake/std/atdm/ats2/environment.sh b/cmake/std/atdm/ats2/environment.sh
@@ -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
@@ -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