Remove unsupported machines from platform check, add clang exclusion …

…to gcc macros
lanl · Aug 30, 2022 · bfbffee · bfbffee
1 parent 4379057
commit bfbffee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/config/platform_checks.cmake b/config/platform_checks.cmake
@@ -1,11 +1,13 @@
 # ------------------------------------------------------------------------------------------------ #
 # file   : platform_checks.cmake
 # brief  : Platform Checks for Draco Build System
-# note   : Copyright (C) 2016-2021 Triad National Security, LLC., All rights reserved
+# note   : Copyright (C) 2011-2022 Triad National Security, LLC., All rights reserved.
 # ------------------------------------------------------------------------------------------------ #
 
 include_guard(GLOBAL)
 
+# cmake-lint: disable=R0912,R0915
+
 # ------------------------------------------------------------------------------------------------ #
 # Identify machine and save name in ds++/config.h
 # ------------------------------------------------------------------------------------------------ #
@@ -22,16 +24,7 @@ function(dbs_set_sitename)
   site_name(SITENAME)
   string(REGEX REPLACE "([A-z0-9]+).*" "\\1" SITENAME ${SITENAME})
   set(SITENAME_FAMILY "unknown")
-  if(${SITENAME} MATCHES "ba")
-    set(SITENAME "Badger")
-    set(SITENAME_FAMILY "CTS-1")
-  elseif(
-    ${SITENAME} MATCHES "cp-rfe"
-    OR ${SITENAME} MATCHES "cp-login"
-    OR ${SITENAME} MATCHES "cp-rlogin")
-    set(SITENAME "Capulin")
-    set(SITENAME_FAMILY "IC-ARM")
-  elseif(${SITENAME} MATCHES "ccscs[0-9]+")
+  if(${SITENAME} MATCHES "ccscs[0-9]+")
     set(SITENAME_FAMILY "CCS-NET")
   elseif(${SITENAME} MATCHES "fi")
     set(SITENAME "Fire")
@@ -43,9 +36,6 @@ function(dbs_set_sitename)
     if("$ENV{SLURM_CLUSTER_NAME}" MATCHES "trinity")
       set(SITENAME "Trinity")
       set(SITENAME_FAMILY "ATS-1")
-    elseif("$ENV{SLURM_CLUSTER_NAME}" MATCHES "capulin")
-      set(SITENAME "Capulin")
-      set(SITENAME_FAMILY "IC-ARM")
     else()
       set(SITENAME "Trinitite")
       set(SITENAME_FAMILY "ATS-1")

diff --git a/src/c4/bin/xthi.cc b/src/c4/bin/xthi.cc
@@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
 
 // KPL: See https://gcc.gnu.org/gcc-9/porting_to.html#ompdatasharing for info on the following
 // version-specific gcc macro.
-#if defined(__GNUC__) && __GNUC__ < 9
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 9
   // gcc-8.X complains about normal syntax. ATS-2 requires different code from all the other
   // machines - these systems must handle const strings differently.
 #ifdef draco_isATS2

diff --git a/src/c4/test/tstOMP.cc b/src/c4/test/tstOMP.cc
@@ -307,7 +307,7 @@ void MandelbrotDriver(rtt_dsxx::UnitTest &ut) {
 
   // gcc-8.X complains about the normal syntax since some variables are automatically marked as
   // shared.
-#if defined(__GNUC__) && __GNUC__ < 9
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 9
 #pragma omp parallel for ordered schedule(dynamic) default(none) shared(image1)
 #else
 #pragma omp parallel for ordered schedule(dynamic) default(none)                                   \