From b66774225001c0214f20f08eb9d6d73bbe35ceef Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Wed, 1 Apr 2020 18:01:42 -0600 Subject: [PATCH] cts1, tlcc2: Switch from Ninja to Unix Makefiles (#7094, ATDV-328) For some reason, this seems to fix the compiler check on CTS-1 and TLCC-2 systems. Something happened between testing day 2020-03-27 and 2020-03-28 to break this. This is just a stop-gap measure to address this until we can see how to fix the configure with the Ninja generator. --- cmake/std/atdm/common/toss3/environment_new.sh | 2 +- cmake/std/atdm/common/toss3/environment_tlcc2.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/std/atdm/common/toss3/environment_new.sh b/cmake/std/atdm/common/toss3/environment_new.sh index 7577f41c60fc..e0cbd02ab66c 100755 --- a/cmake/std/atdm/common/toss3/environment_new.sh +++ b/cmake/std/atdm/common/toss3/environment_new.sh @@ -9,7 +9,7 @@ echo "Using $ATDM_CONFIG_SYSTEM_NAME toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE" export ATDM_CONFIG_ENABLE_SPARC_SETTINGS=ON -export ATDM_CONFIG_USE_NINJA=ON +export ATDM_CONFIG_USE_NINJA=OFF export ATDM_CONFIG_BUILD_COUNT=8 # export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2 # NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build diff --git a/cmake/std/atdm/common/toss3/environment_tlcc2.sh b/cmake/std/atdm/common/toss3/environment_tlcc2.sh index 702b638c7c78..484ffa80c7f3 100755 --- a/cmake/std/atdm/common/toss3/environment_tlcc2.sh +++ b/cmake/std/atdm/common/toss3/environment_tlcc2.sh @@ -12,7 +12,7 @@ fi echo "Using toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE" -export ATDM_CONFIG_USE_NINJA=ON +export ATDM_CONFIG_USE_NINJA=OFF export ATDM_CONFIG_BUILD_COUNT=8 # export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2 # NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build