forked from trilinos/Trilinos
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge 'trilinos/Trilinos:develop' (4968200) into 'tcad-charon/Trilino…
…s:develop' (4539a08). * trilinos-develop: (64 commits) Phalanx: fix exec space instance init for UVM=ON SEACAS: Fix for netcdf without pnetcdf EXODUS: Add a missed ifdef Sacado: Remove a few instances of use of deprecated Rank Sacado fix subview for LayoutContiguous<LayoutLeft> Intrepid2: fix for trilinos#12037; resolves a test failure on certain CUDA platforms. (PR trilinos#12047) EXODUS: Need to check whether nc_def_var_fill is defined in netCDF IOSS: Fix bad changes from !compare to != Use OpenMPI 1.10.1 for CXX20 build APREPRO: Fix "if" instead of "else if" in arg parsing IOSS: Remove fmt dependency for Trilinos users STK: Snapshot 07-12-23 07:43 from Sierra simon_2023-07-10-63-g4c25d07a Update logic for enabling TrilinosInstallTests in CI testing (trilinos#12024) Tempus: Example Problem to Use SolutionState Tempus: Example Problem to Use SolutionState Phalanx: only use partition_space if enough concurrency available Fix accidental debuggery Chomp usage whitespace before assertion Panzer : Remove deprecated STK code. Fix some error message testing ...
- Loading branch information
Showing
1,154 changed files
with
46,978 additions
and
36,633 deletions.
There are no files selected for viewing
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
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,13 @@ | ||
| # Set up C++ language standard selection (rest is handled by TriBITS) | ||
| SET(${PROJECT_NAME}_CMAKE_CXX_STANDARD_DEFAULT 17) | ||
| SET(${PROJECT_NAME}_CMAKE_CXX_STANDARDS_ALLOWED "(17|20|23)") | ||
| ADVANCED_SET(CMAKE_CXX_STANDARD ${${PROJECT_NAME}_CMAKE_CXX_STANDARD_DEFAULT} | ||
| CACHE STRING | ||
| "C++ standard number with values ${${PROJECT_NAME}_CMAKE_CXX_STANDARDS_ALLOWED} (default ${${PROJECT_NAME}_CMAKE_CXX_STANDARD_DEFAULT})") | ||
| IF (NOT CMAKE_CXX_STANDARD MATCHES "^${${PROJECT_NAME}_CMAKE_CXX_STANDARDS_ALLOWED}$") | ||
| MESSAGE(FATAL_ERROR | ||
| "CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} is not in the allowed set " | ||
| "${${PROJECT_NAME}_CMAKE_CXX_STANDARDS_ALLOWED}") | ||
| ENDIF () | ||
|
|
||
| message(STATUS "The Current CXX Standard is : " ${CMAKE_CXX_STANDARD}) |
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,12 @@ | ||
| # Install TriBITS so that other projects can use it. | ||
| ADVANCED_SET(${PROJECT_NAME}_INSTALL_TriBITS ON CACHE BOOL | ||
| "If ture, install TriBITS into <lib-install-dir>/cmake/tribits/") | ||
| IF (${PROJECT_NAME}_INSTALL_TriBITS) | ||
| ASSERT_DEFINED(Trilinos_SOURCE_DIR) | ||
| ASSERT_DEFINED(${PROJECT_NAME}_INSTALL_LIB_DIR) | ||
| INSTALL( | ||
| DIRECTORY "${Trilinos_SOURCE_DIR}/cmake/tribits" | ||
| DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake" | ||
| PATTERN "*.pyc" EXCLUDE | ||
| ) | ||
| ENDIF() |
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,8 @@ | ||
| # | ||
| # Define Some CMake and TriBiTS tweaks just for Trilinos (a.k.a. hacks) | ||
| # | ||
|
|
||
| # Define empty macro to allow Kokkos and KokkosKernels to keep working until | ||
| # updated versions after Kokkos 4.1 are snapshotted in. | ||
| macro(tribits_exclude_autotools_files) | ||
| endmacro() |
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,13 @@ | ||
| if($ENV{CCACHE_NODISABLE}) | ||
| find_program(CCACHE_PROGRAM ccache) | ||
| if(CCACHE_PROGRAM) | ||
| if(CMAKE_GENERATOR STREQUAL "Xcode") | ||
| message(FATAL_ERROR "ccache not supported with Xcode in Trilinos") | ||
| else() | ||
| set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}") | ||
| set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}") | ||
| endif() | ||
| else() | ||
| message(FATAL_ERROR "ccache requested but not found") | ||
| endif() | ||
| endif() |
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
97 changes: 97 additions & 0 deletions
97
cmake/tribits/core/package_arch/TribitsConfigureTiming.cmake
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,97 @@ | ||
| # @HEADER | ||
| # ************************************************************************ | ||
| # | ||
| # TriBITS: Tribal Build, Integrate, and Test System | ||
| # Copyright 2013 Sandia Corporation | ||
| # | ||
| # Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, | ||
| # the U.S. Government retains certain rights in this software. | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions are | ||
| # met: | ||
| # | ||
| # 1. Redistributions of source code must retain the above copyright | ||
| # notice, this list of conditions and the following disclaimer. | ||
| # | ||
| # 2. Redistributions in binary form must reproduce the above copyright | ||
| # notice, this list of conditions and the following disclaimer in the | ||
| # documentation and/or other materials provided with the distribution. | ||
| # | ||
| # 3. Neither the name of the Corporation nor the names of the | ||
| # contributors may be used to endorse or promote products derived from | ||
| # this software without specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY | ||
| # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE | ||
| # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
| # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
| # PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
| # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
| # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| # | ||
| # ************************************************************************ | ||
| # @HEADER | ||
|
|
||
|
|
||
| include(TimingUtils) | ||
|
|
||
|
|
||
| # Optionally start CMake code configure timing | ||
| # | ||
| function(tribits_config_code_start_timer START_TIMER_SECONDS_VAR_OUT) | ||
| if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING) | ||
| timer_get_raw_seconds(START_TIMER_SECONDS) | ||
| set(${START_TIMER_SECONDS_VAR_OUT} ${START_TIMER_SECONDS} PARENT_SCOPE) | ||
| endif() | ||
| endfunction() | ||
|
|
||
|
|
||
| # Optionally stop CMake code configure timing | ||
| # | ||
| function(tribits_config_code_stop_timer START_TIMER_SECONDS_VAR_IN | ||
| TIMER_STR | ||
| ) | ||
| if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING) | ||
| timer_get_raw_seconds(TIMER_STOP_SECONDS) | ||
| timer_print_rel_time(${${START_TIMER_SECONDS_VAR_IN}} | ||
| ${TIMER_STOP_SECONDS} | ||
| "${TIMER_STR}") | ||
| endif() | ||
| endfunction() | ||
|
|
||
|
|
||
| # Optionally start CMake code **package** configure timing | ||
| # | ||
| function(tribits_package_config_code_start_timer START_TIMER_SECONDS_VAR_OUT) | ||
| if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING | ||
| AND | ||
| ( ${PROJECT_NAME}_ENABLE_PACKAGE_CONFIGURE_TIMING | ||
| OR ${TRIBITS_PACKAGE}_PACKAGE_CONFIGURE_TIMING ) | ||
| ) | ||
| timer_get_raw_seconds(START_TIMER_SECONDS) | ||
| set(${START_TIMER_SECONDS_VAR_OUT} ${START_TIMER_SECONDS} PARENT_SCOPE) | ||
| endif() | ||
| endfunction() | ||
|
|
||
|
|
||
| # Optionally stop CMake code **package** configure timing | ||
| # | ||
| function(tribits_package_config_code_stop_timer START_TIMER_SECONDS_VAR_IN | ||
| TIMER_STR | ||
| ) | ||
| if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING | ||
| AND | ||
| ( ${PROJECT_NAME}_ENABLE_PACKAGE_CONFIGURE_TIMING | ||
| OR ${TRIBITS_PACKAGE}_PACKAGE_CONFIGURE_TIMING ) | ||
| ) | ||
| timer_get_raw_seconds(TIMER_STOP_SECONDS) | ||
| timer_print_rel_time(${${START_TIMER_SECONDS_VAR_IN}} | ||
| ${TIMER_STOP_SECONDS} | ||
| "${TIMER_STR}") | ||
| endif() | ||
| endfunction() |
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
Oops, something went wrong.