Skip to content

Commit

Permalink
cts1, tlcc2: Switch from Ninja to Unix Makefiles (trilinos#7094, ATDV…
Browse files Browse the repository at this point in the history 
…-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.
  • Loading branch information
@bartlettroscoe
bartlettroscoe committed Apr 2, 2020
1 parent 3c8a941 commit b667742
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmake/std/atdm/common/toss3/environment_new.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/std/atdm/common/toss3/environment_tlcc2.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b667742

Please sign in to comment.