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' (ba3df3f) into 'EM-Plasma/Trilinos:…
…develop' (7591b32). * trilinos/develop: (77 commits) zoltan2: fix memory leak when sizeof(SCOTCH_Num) == sizeof(lno_t) trilinos#9312 Tpetra: Remove some output from the Bug7758 test MueLu Stratimikos adapter: Enable half precision for factory-style PLs Tpetra: remove some deprecated usage Fixed some deprecated code MueLu Thyra adapter: Allow construction of half precision operator ROL: implement the apply function for Thyra Vector Piro: changes to ROL adapters comply with ROL changes Piro: bug-fix in Piro::NOX_Solver MueLu: Print Scalar in MG Summary for high and extreme verbosity Ifpack2: disabling tests causing build errors with extended scalar types (see issue trilinos#9280). Ifpack2: cleaning up unused variables in tests. Ctest: Adding Amesos2/Belos tests Ctest: Stuff failing on ride that worked on ascicgpu Ctest: Enabling non-UVM Ifpack2 tests Ifpack2: changing GO to the one in Tpetra_Details_DefaultTypes.hpp. Disable support for Makefile.export.* files (trilinos#8498) Tpetra: remove unused variable (copied too many times when breaking up a function) ats2: Comment out listing of long-broken XL builds (trilinos#9270, trilinos#7376) Ifpack2: adding missing logic for new tests. ...
- Loading branch information
Showing
115 changed files
with
6,293 additions
and
2,328 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
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
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
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
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,81 @@ | ||
| from FindTribitsCiSupportDir import * | ||
| import GeneralScriptSupport as GSS | ||
|
|
||
|
|
||
| # Standard set of build stats fields we want to read in | ||
| # | ||
| def getStdBuildStatsColsAndTypesList(): | ||
| return [ | ||
| ColNameAndType('max_resident_size_Kb', 'float'), | ||
| ColNameAndType('elapsed_real_time_sec', 'float'), | ||
| ColNameAndType('FileName', 'string'), | ||
| ColNameAndType('FileSize', 'float'), | ||
| ] | ||
| # NOTE: Above, we use type 'float' instead of 'int' for fields that are ints | ||
| # because we want to allow a very large size. | ||
|
|
||
|
|
||
| def getColNameTypeIdxListGivenColNameAndTypeList(csvFileName, columnHeadersList, | ||
| colNameAndTypesToGetList, | ||
| ): | ||
| colNameTypeIdxList = [] | ||
| for colNameAndTypeToGet in colNameAndTypesToGetList: | ||
| colIdx = GSS.findInSequence(columnHeadersList, colNameAndTypeToGet.colName()) | ||
| if colIdx != -1: | ||
| colNameTypeIdxList.append(ColNameTypeIdx(colNameAndTypeToGet, colIdx)) | ||
| else: | ||
| raise Exception( | ||
| "Error, the CSV file column header '"+colNameAndTypeToGet.colName()+"'"+\ | ||
| " does not exist in the list of column headers "+str(columnHeadersList)+\ | ||
| " from the CSV file '"+csvFileName+"'!") | ||
| return colNameTypeIdxList | ||
|
|
||
|
|
||
| class ColNameAndType(object): | ||
| def __init__(self, colName, colType): | ||
| self.__colName = colName | ||
| self.__colType = colType | ||
| self.assertType() | ||
| def colName(self): | ||
| return self.__colName | ||
| def colType(self): | ||
| return self.__colType | ||
| def __repr__(self): | ||
| myStr = "ColNameAndType{"+self.__colName+","+str(self.__colType)+"}" | ||
| return myStr | ||
| def convertFromStr(self, strIn): | ||
| if self.__colType == "string": | ||
| return strIn | ||
| elif self.__colType == "int": | ||
| return int(strIn) | ||
| elif self.__colType == "float": | ||
| return float(strIn) | ||
| def assertType(self): | ||
| supportedTypes = [ "string", "int", "float" ] | ||
| if -1 == GSS.findInSequence(supportedTypes, self.__colType): | ||
| raise Exception( | ||
| "Error, type '"+str(self.__colType)+"' is not supported! Supported types"+\ | ||
| " include "+str(supportedTypes)+"!") | ||
| def __eq__(self, other): | ||
| return((self.__colName,self.__colType)==(other.__colName,other.__colType)) | ||
| def __ne__(self, other): | ||
| return((self.__colName,self.__colType)!=(other.__colName,other.__colType)) | ||
|
|
||
|
|
||
| class ColNameTypeIdx(object): | ||
| def __init__(self, colNameAndType, colIdx): | ||
| self.__colNameAndType = colNameAndType | ||
| self.__colIdx = colIdx | ||
| def colName(self): | ||
| return self.__colNameAndType.colName() | ||
| def getIdx(self): | ||
| return self.__colIdx | ||
| def convertFromStr(self, strIn): | ||
| return self.__colNameAndType.convertFromStr(strIn) | ||
| def __repr__(self): | ||
| myStr = "ColNameTypeIdx{"+str(self.__colNameAndType)+","+str(self.__colIdx)+"}" | ||
| return myStr | ||
| def __eq__(self, other): | ||
| return ((self.__colNameAndType,self.__colIdx)==(other.__colNameAndType,other.__colIdx)) | ||
| def __ne__(self, other): | ||
| return ((self.__colNameAndType,self.__colIdx)!=(other.__colNameAndType,other.__colIdx)) |
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,90 @@ | ||
| ################################################################################ | ||
| # | ||
| # Add target for gathering up build stats | ||
| # | ||
| ################################################################################ | ||
|
|
||
|
|
||
| include("${CMAKE_CURRENT_LIST_DIR}/BuildStatsSharedVars.cmake") | ||
|
|
||
|
|
||
| # Create custom 'gather-build-stats' target that will run last | ||
| # | ||
| # NOTE: This function must be called at the very end of all of the build | ||
| # targets that get created for a project! | ||
| # | ||
| function(add_target_gather_build_stats) | ||
|
|
||
| if (${PROJECT_NAME}_ENABLE_BUILD_STATS) | ||
|
|
||
| add_custom_command( | ||
| OUTPUT "${BUILD_STATS_CSV_FILE}" | ||
| COMMAND "${BUILD_STATS_SRC_DIR}/gather_build_stats.py" | ||
| WORKING_DIRECTORY "${${PROJECT_NAME}_BINARY_DIR}" ) | ||
|
|
||
| add_custom_target(gather-build-stats ALL | ||
| DEPENDS "${BUILD_STATS_CSV_FILE}") | ||
|
|
||
| get_all_build_targets_including_in_subdirs("${${PROJECT_NAME}_SOURCE_DIR}" | ||
| projectBuildTargetsList) | ||
|
|
||
| if (projectBuildTargetsList) | ||
| add_dependencies(gather-build-stats ${projectBuildTargetsList}) | ||
| endif() | ||
|
|
||
| endif() | ||
|
|
||
| endfunction() | ||
|
|
||
|
|
||
| # Get a list all of the lib and exec build targets starting in a subdir and in | ||
| # below subdirs. | ||
| # | ||
| function(get_all_build_targets_including_in_subdirs srcdir targetsListVarOut) | ||
|
|
||
| set(targetsList "") | ||
|
|
||
| # Recurse into subdirectories. | ||
| get_property(dirs DIRECTORY ${srcdir} PROPERTY SUBDIRECTORIES) | ||
| foreach(d IN LISTS dirs) | ||
| get_all_build_targets_including_in_subdirs(${d} targetsSubdirList) | ||
| list(APPEND targetsList ${targetsSubdirList}) | ||
| endforeach() | ||
|
|
||
| # Get the targets from this directory. | ||
| get_property(allTargetsThisDir DIRECTORY ${srcdir} PROPERTY BUILDSYSTEM_TARGETS) | ||
| filter_only_build_targets(allTargetsThisDir buildTargetsThisDir) | ||
| list(APPEND targetsList ${buildTargetsThisDir}) | ||
|
|
||
| # Return | ||
| set(${targetsListVarOut} ${targetsList} PARENT_SCOPE) | ||
|
|
||
| endfunction() | ||
|
|
||
|
|
||
| function(filter_only_build_targets targetListInVar targetListOutVar) | ||
|
|
||
| #print_var(targetListInVar) | ||
| #print_var(${targetListInVar}) | ||
|
|
||
| set(targetListOut "") | ||
|
|
||
| foreach (target IN LISTS ${targetListInVar}) | ||
| #print_var(target) | ||
| get_property(targetType TARGET ${target} PROPERTY TYPE) | ||
| #print_var(targetType) | ||
| if ( | ||
| targetType STREQUAL "STATIC_LIBRARY" OR | ||
| targetType STREQUAL "SHARED_LIBRARY" OR | ||
| targetType STREQUAL "EXECUTABLE" | ||
| ) | ||
| #message("-- " "${target} is a regular build target!") | ||
| list(APPEND targetListOut ${target}) | ||
| else() | ||
| #message("-- " "${target} is **NOT** a regular build target!") | ||
| endif() | ||
| endforeach() | ||
|
|
||
| set(${targetListOutVar} ${targetListOut} PARENT_SCOPE) | ||
|
|
||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| set(BUILD_STATS_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}") | ||
| set(BUILD_STATS_CSV_FILE "${${PROJECT_NAME}_BINARY_DIR}/build_stats.csv") |
Oops, something went wrong.