use all blessed host-configs and remove old ones"

LLNL · Mar 15, 2024 · 01ef627 · 01ef627
1 parent f3ac7f1
commit 01ef627
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 30 deletions.
diff --git a/.gitlab/build_lassen.yml b/.gitlab/build_lassen.yml
@@ -67,5 +67,5 @@ lassen-clang_14.0.5_with_gcc_8.3.1_nvcc_c++_only:
 lassen-clang_10.0.1_nvcc_cuda_clang_test:
   variables:
     ENABLED_BLT_TESTS: "cuda-arch cuda-mpi-cpp"
-    HOST_CONFIG: "host-configs/llnl/blueos_3_ppc64le_ib_p9/[email protected]_nvcc_c++17.cmake"
+    HOST_CONFIG: "[email protected]_nvcc_c++17.cmake"
   extends: [.run_project_integration_test_on_lassen, .with_cuda]
diff --git a/.gitlab/build_quartz.yml b/.gitlab/build_quartz.yml
@@ -78,6 +78,6 @@ quartz-intel_2022_1_0_cxx17:
 # HIP project tests
 quartz_openmp_mpi_fortran_tests:
   variables:
-    HOST_CONFIG: openmp-cpp-fortran/base/[email protected]
     ENABLED_BLT_TESTS: "mpi-cpp-fortran,openmp-cpp-fortran,openmp-mpi-cpp"
+    HOST_CONFIG: "[email protected]"
   extends: [.run_project_integration_test_on_quartz]
diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml
@@ -38,5 +38,5 @@ tioga-clang_14_0_0_hip:
 tioga-clang_14.0.1_hip_config_test:
   variables:
     ENABLED_BLT_TESTS: "hip-config-test"
-    HOST_CONFIG: "hip-config-test/base/[email protected]_hip.cmake"
+    HOST_CONFIG: "[email protected]_hip.cmake"
   extends: [.run_project_integration_test_on_tioga]
diff --git a/.gitlab/run_project_integration_tests.sh b/.gitlab/run_project_integration_tests.sh
@@ -5,7 +5,7 @@ RUNNER_SCRIPT=`pwd`/tests/projects/run_tests.py
 cd `pwd`/tests/projects/
 
 if [[ -z $HOST_CONFIG  ]]; then
-    HOST_CONFIG=`pwd`/tests/projects/$HOST_CONFIG
+    HOST_CONFIG=`pwd`/host-configs/llnl/$SYS_TYPE/$HOST_CONFIG
     python3 $RUNNER_SCRIPT --run-test $ENABLED_BLT_TESTS --verbose --clean --blt-source-dir $BLT_DIR
 else
     python3 $RUNNER_SCRIPT --run-test $ENABLED_BLT_TESTS --host-config $HOST_CONFIG --verbose --clean --blt-source-dir $BLT_DIR

diff --git a/host-configs/llnl/toss_4_x86_64_ib/[email protected] b/host-configs/llnl/toss_4_x86_64_ib/[email protected]
@@ -8,7 +8,7 @@
 #------------------------------------------------------------------------------
 #
 # This file provides CMake with paths / details for:
-#  C,C++, & Fortran compilers + MPI
+#  C,C++, & Fortran compilers + MPI + OpenMP
 #------------------------------------------------------------------------------
 # clang-14.0.6 compilers
 
@@ -27,6 +27,8 @@ set(ENABLE_FORTRAN ON CACHE BOOL "")
 # fortran compiler
 set(CMAKE_Fortran_COMPILER "${GNU_HOME}/bin/gfortran" CACHE PATH "")
 
+set(ENABLE_OPENMP ON CACHE BOOL "")
+
 #------------------------------------------------------------------------------
 # Static Analysis Support
 #------------------------------------------------------------------------------

diff --git a/tests/projects/hip-config-test/base/[email protected]_hip.cmake b/tests/projects/hip-config-test/base/[email protected]_hip.cmake
diff --git a/tests/projects/openmp-cpp-fortran/base/[email protected] b/tests/projects/openmp-cpp-fortran/base/[email protected]