-
Notifications
You must be signed in to change notification settings - Fork 578
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge Pull Request #7427 from bartlettroscoe/Trilinos/atdv-351-atdm-a…
…ts2-refactor Automatically Merged using Trilinos Pull Request AutoTester PR Title: ATDM: Address several 'ats2' issues (#7402, #7406, #7122, #2422) PR Author: bartlettroscoe
- Loading branch information
Showing
15 changed files
with
248 additions
and
201 deletions.
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| TRIBITS_ADD_ADVANCED_TEST( ats2_custom_builds_unit_tests | ||
| OVERALL_WORKING_DIRECTORY TEST_NAME | ||
| OVERALL_NUM_MPI_PROCS 1 | ||
| TEST_0 CMND env | ||
| ARGS SHUNIT_COLOR=none ${CMAKE_CURRENT_SOURCE_DIR}/custom_builds_unit_tests.sh | ||
| PASS_REGULAR_EXPRESSION_ALL | ||
| "ERROR: A supported compiler was not selected for 'ats2' env - anything-cudas-after" | ||
| "Ran 1 test" | ||
| "[^]OK[$]" | ||
| ALWAYS_FAIL_ON_NONZERO_RETURN | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
|
|
||
| export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm- | ||
|
|
||
| # ats2-xl-2019.08.20-spmpi-2019.06.24_openmp_static_opt | ||
| # ats2-xl-2019.08.20-spmpi-2019.06.24_openmp_static_dbg | ||
| # ats2-xl-2019.08.20-spmpi-rolling_openmp_static_opt | ||
| # ats2-xl-2019.08.20-spmpi-rolling_openmp_static_dbg | ||
| export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=( | ||
| ats2-gnu-7.3.1-spmpi-2019.06.24_serial_static_opt | ||
| ats2-gnu-7.3.1-spmpi-2019.06.24_serial_static_dbg | ||
| ats2-cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24_static_opt | ||
| ats2-cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24_static_dbg | ||
| ats2-gnu-7.3.1-spmpi-rolling_serial_static_opt | ||
| ats2-gnu-7.3.1-spmpi-rolling_serial_static_dbg | ||
| 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 | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| #!/bin/bash | ||
|
|
||
| CURRENT_SCRIPTS_DIR=`echo $BASH_SOURCE | sed "s/\(.*\)\/.*\.sh/\1/g"` | ||
| ATDM_CONFIG_SCRIPT_DIR=`readlink -f ${CURRENT_SCRIPTS_DIR}/..` | ||
| ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/ats2 | ||
|
|
||
| # | ||
| # Test compiler parsing | ||
| # | ||
|
|
||
| testAll() { | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=default | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-gnu-7.3.1-spmpi-rolling_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_gnu-7.3.1_spmpi-rolling_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-gnu-7.3.1_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_gnu-7.3.1_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-gnu-7_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_gnu-7_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_cuda-10_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_cuda_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_gnu-7.3.1-spmpi-rolling_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_gnu-7.3.1_spmpi-rolling_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_gnu-7.3.1_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_gnu-7_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| ATDM_CONFIG_BUILD_NAME=before_gnu_after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| # This should not match anything and should be an error! | ||
| ATDM_CONFIG_BUILD_NAME=anything-cudas-after | ||
| . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh | ||
| ${_ASSERT_EQUALS_} DEFAULT ${ATDM_CONFIG_COMPILER} | ||
|
|
||
| } | ||
|
|
||
|
|
||
| # | ||
| # Run the unit tests | ||
| # | ||
|
|
||
| SHUNIT2_DIR=`readlink -f ${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2` | ||
| . ${SHUNIT2_DIR}/shunit2 |
Oops, something went wrong.