Merge branch 'develop' of https://github.com/trilinos/Trilinos into f…

…rosch-albany * 'develop' of https://github.com/trilinos/Trilinos: (138 commits) IOSS: Serialize IO test only with parallel-aware exodus Amesos2: Count entries in matrix before allocating (trilinos#5745) Piro: fix Tpetra ordinal issues. (trilinos#5747) Trilinos Couplings: Fix for trilinos#5754 (trilinos#5755) Tpetra: Fix trilinos#5762 Ctest: Fixing missing space Ctest: geminga test updates Xpetra: remove Tpetra deprecated code (trilinos#5750) Testing: change valgrind test days Xpetra: MapFactory - ETI - Update (PR trilinos#5723) Automatic snapshot commit from seacas at e6496d0cc0 Fix smart-jenkins-driver.sh (trilinos#4933) KokkosKernels: CUDA SPGEMM symbolic workaround MueLu RefMaxwell: Allow setting importer parameters MueLu: Allow setting distributor parameters at end of setup Xpetra: Allow setting parameters on Distributor of Import/Export Xpetra::ImportFactory: Add optional parameter list Panzer: require Epetra to build MueLu: add some braces to region MG smoothers Stokhos: fix for trilinos#5742 (trilinos#5743) ... # Conflicts: # packages/shylu/shylu_dd/frosch/cmake/Dependencies.cmake
searhein · Aug 20, 2019 · 5e14cae · 5e14cae
2 parents f5b59c2 + a3794e6
commit 5e14cae
Show file tree

Hide file tree

Showing 1,007 changed files with 19,366 additions and 13,548 deletions.
diff --git a/TPLsList.cmake b/TPLsList.cmake
@@ -57,8 +57,8 @@ TRIBITS_REPOSITORY_DEFINE_TPLS(
   MKL             "cmake/TPLs/"    EX
   yaml-cpp        "cmake/TPLs/"    EX
   Peano           "cmake/TPLs/"    EX
-  CUDA            "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/"    ST
-  CUSPARSE        "cmake/TPLs/"    ST
+  CUDA            "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/"    PT
+  CUSPARSE        "cmake/TPLs/"    PT
   Thrust          "cmake/TPLs/"    ST
   Cusp            "cmake/TPLs/"    ST
   TBB             "cmake/TPLs/"    EX

diff --git a/cmake/ctest/drivers/atdm/README.md b/cmake/ctest/drivers/atdm/README.md
@@ -339,7 +339,7 @@ ${WORKSPACE}/Trilinos/cmake/ctest/drivers/atdm/smart-jenkins-driver.sh
 This will result in the alternate workspace directory being create as:
 
 ```
-export WORKSPACE=${ATDM_CONFIG_WORKSPACE_BASE}/${ATDM_CONFIG_KNOWN_SYSTEM_NAME}/${JOB_NAME}
+export WORKSPACE=${ATDM_CONFIG_WORKSPACE_BASE}/${ATDM_CONFIG_SYSTEM_NAME}/${JOB_NAME}
 ```
 
 The inner clone of Trilinos and the build of Trilinos will be performed under
@@ -411,8 +411,6 @@ The following `<system_name>` sub-directories exist (in alphabetical order):
 * `cee-rhel6/`: Contains files to drive builds on CEE LAnL RHEL6 machines with
   a SEMS environment.
 
-* `tlcc2/`: Contains files to drive builds on the SRN HPC tlcc2 machines.
-
 * `mutrino/`: Contains files to drive builds on SNL machine mutrino.
 
 * `ride/`: Contains the files to drive builds on the SRN test bed machine
@@ -432,6 +430,9 @@ The following `<system_name>` sub-directories exist (in alphabetical order):
 * `shiller/`: Contains the files to drive builds on the SRN test bed machine
   `shiller` which also can be run on the SON machine `hansen`.
 
+* `tlcc2/`: Contains files to drive builds on the SRN HPC TLCC-2 machines
+  (e.g. 'chama', 'skybridge', etc.).
+
 * `waterman/`: Contains files to drive builds on the SRN Test Bed machine
   `waterman`.
 
@@ -444,15 +445,15 @@ To add a new system, first add a new `elseif` statement for the new system in
 the file:
 
 ```
-  Trilinos/cmake/std/atdm/utils/get_known_system_name.sh
+  Trilinos/cmake/std/atdm/utils/get_known_system_info.sh
 ```
 
 Note that more than one `hostname` machine may map to the same
 `<new_system_name>` (e.g. both `white` and `ride` machines map to the system
 `ride`).
 
 The variable `ATDM_HOSTNAME` (set to exported variable
-`ATDM_CONFIG_KNOWN_HOSTNAME`) is used for the CDash site name.  This makes it
+`ATDM_CONFIG_CDASH_HOSTNAME`) is used for the CDash site name.  This makes it
 so that any node `white05`, `white12`, etc. just says `white` on CDash.  This
 is important for the CDash 'next' and 'previous' relationships to work.  (But
 for `CTEST_TEST_TYPE=Experimental` builds, the real `hostname` is used which
@@ -461,7 +462,7 @@ ensures that queries with `cdash/queryTests.php` don't accidentally pick up
 tests from "Experimental" builds.)
 
 The variable `ATDM_SYSTEM_NAME` (set to the exported variable
-`ATDM_CONFIG_KNOWN_SYSTEM_NAME`) must be set to `<new_system_name>` which is
+`ATDM_CONFIG_SYSTEM_NAME`) must be set to `<new_system_name>` which is
 selected for this new system type.
 
 Then, create a new directory for the new system called `<new_system_name>`:

diff --git a/cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake b/cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake
@@ -16,8 +16,8 @@ MACRO(ATDM_ASSERT_ENV_VAR_SET VAR_NAME)
 ENDMACRO()
 
 ATDM_ASSERT_ENV_VAR_SET(JOB_NAME)
-ATDM_ASSERT_ENV_VAR_SET(ATDM_CONFIG_KNOWN_HOSTNAME)
-ATDM_ASSERT_ENV_VAR_SET(ATDM_CONFIG_KNOWN_SYSTEM_NAME)
+ATDM_ASSERT_ENV_VAR_SET(ATDM_CONFIG_CDASH_HOSTNAME)
+ATDM_ASSERT_ENV_VAR_SET(ATDM_CONFIG_SYSTEM_NAME)
 ATDM_ASSERT_ENV_VAR_SET(ATDM_CONFIG_USE_NINJA)
 ATDM_ASSERT_ENV_VAR_SET(ATDM_CONFIG_CTEST_PARALLEL_LEVEL)
 ATDM_ASSERT_ENV_VAR_SET(ATDM_CONFIG_BUILD_COUNT)
@@ -40,8 +40,8 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
   # Add this script and the shiller env script to the notes
   SET( CTEST_NOTES_FILES
     ${CTEST_NOTES_FILES}
-    "${TRIBITS_PROJECT_ROOT}/cmake/std/atdm/$ENV{ATDM_CONFIG_KNOWN_SYSTEM_NAME}/environment.sh"
-    "${THIS_FILE_LIST_DIR}/$ENV{ATDM_CONFIG_KNOWN_SYSTEM_NAME}/drivers/$ENV{JOB_NAME}.sh"
+    "${TRIBITS_PROJECT_ROOT}/cmake/std/atdm/$ENV{ATDM_CONFIG_SYSTEM_NAME}/environment.sh"
+    "${THIS_FILE_LIST_DIR}/$ENV{ATDM_CONFIG_SYSTEM_NAME}/drivers/$ENV{JOB_NAME}.sh"
     "${CMAKE_CURRENT_LIST_FILE}"
     )
 
@@ -152,7 +152,7 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
     # so that it does not change depending on what node on a given machine
     # runs the build.  If you don't, CDash can't compare to previous builds
     # for the number of new warnings, errors, tests, etc.
-    SET(CTEST_SITE "$ENV{ATDM_CONFIG_KNOWN_HOSTNAME}")
+    SET(CTEST_SITE "$ENV{ATDM_CONFIG_CDASH_HOSTNAME}")
   ENDIF()
 
   # Don't process any extra repos

diff --git a/...rs/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-10.1-gnu-7.2.0-rdc-release-debug-pt.sh b/...rs/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-10.1-gnu-7.2.0-rdc-release-debug-pt.sh
@@ -2,7 +2,7 @@
 if [ "${Trilinos_TRACK}" == "" ] ; then
   export Trilinos_TRACK=Specialized
 fi
-if [ "${ATDM_CONFIG_KNOWN_HOSTNAME}" == "ride" ] ; then
+if [ "${ATDM_CONFIG_CDASH_HOSTNAME}" == "ride" ] ; then
   export EXCLUDE_NODES_FROM_BSUB="-R hname!=ride7"
 fi
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
diff --git a/...ers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-9.2-gnu-7.2.0-rdc-release-debug-pt.sh b/...ers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-9.2-gnu-7.2.0-rdc-release-debug-pt.sh
@@ -2,7 +2,7 @@
 if [ "${Trilinos_TRACK}" == "" ] ; then
   export Trilinos_TRACK=Specialized
 fi
-if [ "${ATDM_CONFIG_KNOWN_HOSTNAME}" == "ride" ] ; then
+if [ "${ATDM_CONFIG_CDASH_HOSTNAME}" == "ride" ] ; then
   export EXCLUDE_NODES_FROM_BSUB="-R hname!=ride7"
 fi
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
diff --git a/cmake/ctest/drivers/atdm/ride/local-driver.sh b/cmake/ctest/drivers/atdm/ride/local-driver.sh
@@ -9,7 +9,7 @@ if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
 fi
 
 if [ "${EXCLUDE_NODES_FROM_BSUB}" == "" ] ; then
-  if [ "${ATDM_CONFIG_KNOWN_HOSTNAME}" == "white" ] ; then
+  if [ "${ATDM_CONFIG_CDASH_HOSTNAME}" == "white" ] ; then
     EXCLUDE_NODES_FROM_BSUB="-R hname!=white26&&hname!=white27"
   fi
 fi

diff --git a/cmake/ctest/drivers/atdm/smart-jenkins-driver.sh b/cmake/ctest/drivers/atdm/smart-jenkins-driver.sh
@@ -21,12 +21,13 @@ if [ "${WORKSPACE}" == ""  ] ; then
 fi
 
 export ATDM_CONFIG_BUILD_NAME=$JOB_NAME
-source $WORKSPACE/Trilinos/cmake/std/atdm/utils/get_known_system_name.sh
+export ATDM_CONFIG_SCRIPT_DIR=$WORKSPACE/Trilinos/cmake/std/atdm
+source ${ATDM_CONFIG_SCRIPT_DIR}/utils/get_system_info.sh
 
 echo
-echo "Running: $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/$ATDM_CONFIG_KNOWN_SYSTEM_NAME/drivers/$JOB_NAME.sh ..."
+echo "Running: $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/$ATDM_CONFIG_SYSTEM_NAME/drivers/$JOB_NAME.sh ..."
 
-$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/$ATDM_CONFIG_KNOWN_SYSTEM_NAME/drivers/$JOB_NAME.sh
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/$ATDM_CONFIG_SYSTEM_NAME/drivers/$JOB_NAME.sh
 
 echo
 echo "End: smart-jenkins-drivers.sh"

diff --git a/cmake/ctest/drivers/atdm/utils/create-src-and-build-dir.sh b/cmake/ctest/drivers/atdm/utils/create-src-and-build-dir.sh
@@ -20,7 +20,7 @@ ulimit -c 0
 
 if [[ "${ATDM_CONFIG_WORKSPACE_BASE}" != "" ]] ; then
 
-  ATDM_CONFIG_WORKSPACE="${ATDM_CONFIG_WORKSPACE_BASE}/${ATDM_CONFIG_KNOWN_SYSTEM_NAME}/${JOB_NAME}"
+  ATDM_CONFIG_WORKSPACE="${ATDM_CONFIG_WORKSPACE_BASE}/${ATDM_CONFIG_SYSTEM_NAME}/${JOB_NAME}"
 
   echo
   echo "Using alternate workspace dir '${ATDM_CONFIG_WORKSPACE}'" 

diff --git a/cmake/ctest/drivers/geminga/CMakeLists.txt b/cmake/ctest/drivers/geminga/CMakeLists.txt
@@ -7,18 +7,15 @@ execute_process(COMMAND date +%A OUTPUT_VARIABLE DAYOFWEEK)
 # parallel valgrind tests run every night except Sunday
 # coverage tests run on Saturday night
 
-if(${DAYOFWEEK} MATCHES "Saturday")
+if((${DAYOFWEEK} MATCHES "Sunday") OR (${DAYOFWEEK} MATCHES "Tuesday") OR (${DAYOFWEEK} MATCHES "Thursday")) 
   SET(RUN_HEAVY_MEMORY_TESTS ON)
   SET(RUN_COVERAGE_TESTS OFF)
-  SET(RUN_CUDA_OLD_TESTS ON)
-elseif(${DAYOFWEEK} MATCHES "Sunday")
+elseif((${DAYOFWEEK} MATCHES "Monday") OR (${DAYOFWEEK} MATCHES "Wednesday"))
   SET(RUN_HEAVY_MEMORY_TESTS OFF)
   SET(RUN_COVERAGE_TESTS ON)
-  SET(RUN_CUDA_OLD_TESTS OFF)
 else()
   SET(RUN_HEAVY_MEMORY_TESTS OFF)
   SET(RUN_COVERAGE_TESTS OFF)
-  SET(RUN_CUDA_OLD_TESTS OFF)
 endif()
 
 SET(RUN_CUDA_OLD_TESTS ON)

diff --git a/cmake/ctest/drivers/geminga/TrilinosCTestDriverCore.geminga.gcc.cmake b/cmake/ctest/drivers/geminga/TrilinosCTestDriverCore.geminga.gcc.cmake
@@ -102,6 +102,11 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
 
   SET_DEFAULT(COMPILER_VERSION "$ENV{SEMS_COMPILER_NAME}-$ENV{SEMS_COMPILER_VERSION}")
 
+  # Options for valgrind, if needed
+  SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS
+      "--leak-check=full --gen-suppressions=all --error-limit=no --log-file=nightly_suppressions.txt" ${CTEST_MEMORYCHECK_COMMAND_OPTIONS} )
+
+
   # Ensure that MPI is on for all parallel builds that might be run.
   IF(COMM_TYPE STREQUAL MPI)
 
@@ -112,8 +117,6 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
             "-DMPI_EXEC_POST_NUMPROCS_FLAGS:STRING=--bind-to\\\;socket\\\;--map-by\\\;socket"
        )
 
-    SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS
-        "--gen-suppressions=all --error-limit=no --log-file=nightly_suppressions.txt" ${CTEST_MEMORYCHECK_COMMAND_OPTIONS} )
 
   ELSE()
 

diff --git a/cmake/ctest/drivers/rocketman/CMakeLists.txt b/cmake/ctest/drivers/rocketman/CMakeLists.txt
@@ -12,7 +12,7 @@ if(DEFINED ENV{DO_TPETRA_TESTING})
 
   TRILINOS_DRIVER_ADD_DASHBOARD(
     OPENMPI-1.10.1_RELEASE_TPETRA_PERFORMANCE
-    ctest_experimental_nightly_mpi_release_tpetra_performance_rocketman.cmake
+    ctest_linux_experimental_mpi_release_tpetra_performance_rocketman.cmake
     CTEST_INSTALLER_TYPE release
     RUN_SERIAL
     TIMEOUT_MINUTES 330

diff --git a/...drivers/rocketman/ctest_linux_experimental_mpi_release_tpetra_performance_rocketman.cmake b/...drivers/rocketman/ctest_linux_experimental_mpi_release_tpetra_performance_rocketman.cmake
@@ -78,6 +78,8 @@ SET(Trilinos_PACKAGES Tpetra)
 SET(EXTRA_CONFIGURE_OPTIONS
   "-DTrilinos_ENABLE_DEPENDENCY_UNIT_TESTS=OFF"
   "-DTrilinos_TEST_CATEGORIES:STRING=PERFORMANCE"
+  "-DMPI_EXEC_MAX_NUMPROCS=36"
+  "-DMPI_EXEC_DEFAULT_NUMPROCS=36"
 )
 
 #

diff --git a/cmake/std/atdm/ATDMDevEnvSettings.cmake b/cmake/std/atdm/ATDMDevEnvSettings.cmake
@@ -26,7 +26,8 @@ ASSERT_DEFINED(ENV{ATDM_CONFIG_BUILD_NAME})
 
 ASSERT_DEFINED(ENV{ATDM_CONFIG_BUILD_COUNT})
 
-ASSERT_DEFINED(ENV{ATDM_CONFIG_KNOWN_SYSTEM_NAME})
+ASSERT_DEFINED(ENV{ATDM_CONFIG_SYSTEM_NAME})
+ASSERT_DEFINED(ENV{ATDM_CONFIG_SYSTEM_DIR})
 ASSERT_DEFINED(ENV{ATDM_CONFIG_COMPILER})
 ASSERT_DEFINED(ENV{ATDM_CONFIG_BUILD_TYPE})
 ASSERT_DEFINED(ENV{ATDM_CONFIG_CUDA_RDC})
@@ -132,7 +133,7 @@ ATDM_SET_ATDM_VAR_FROM_ENV_AND_DEFAULT(MPI_EXEC_NUMPROCS_FLAG -np)
 # 
 
 SET(ATDM_TWEAKS_FILE_DEFAULT_DEFAULT
-  "${CMAKE_CURRENT_LIST_DIR}/$ENV{ATDM_CONFIG_KNOWN_SYSTEM_NAME}/tweaks/${ATDM_BUILD_NAME_KEYS_STR}.cmake")
+  "${CMAKE_CURRENT_LIST_DIR}/$ENV{ATDM_CONFIG_SYSTEM_NAME}/tweaks/${ATDM_BUILD_NAME_KEYS_STR}.cmake")
 IF (EXISTS "${ATDM_TWEAKS_FILE_DEFAULT_DEFAULT}")
   SET(ATDM_TWEAKS_FILES_DEFAULT "${ATDM_TWEAKS_FILE_DEFAULT_DEFAULT}")
 ELSE()
@@ -373,10 +374,12 @@ ATDM_SET_CACHE(TPL_CGNS_LIBRARIES "$ENV{ATDM_CONFIG_CGNS_LIBS}" CACHE FILEPATH)
 # HDF5
 ATDM_SET_ENABLE(TPL_ENABLE_HDF5 ON)
 ATDM_SET_CACHE(HDF5_INCLUDE_DIRS "$ENV{HDF5_ROOT}/include" CACHE FILEPATH)
-IF ("$ENV{ATDM_CONFIG_HDF5_LIBS}" STREQUAL "")
-  MESSAGE(FATAL_ERROR "Error: ToDo: Implement default HDF5 libs")
+IF (NOT "$ENV{ATDM_CONFIG_HDF5_LIBS}" STREQUAL "")
+  ATDM_SET_CACHE(TPL_HDF5_LIBRARIES "$ENV{ATDM_CONFIG_HDF5_LIBS}" CACHE FILEPATH)
+ELSE()
+  ASSERT_DEFINED(ENV{ZLIB_ROOT})
+  ATDM_SET_CACHE(TPL_HDF5_LIBRARIES "$ENV{HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};$ENV{HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl" CACHE FILEPATH)
 ENDIF()
-ATDM_SET_CACHE(TPL_HDF5_LIBRARIES "$ENV{ATDM_CONFIG_HDF5_LIBS}" CACHE FILEPATH)
 
 # Netcdf
 ATDM_SET_ENABLE(TPL_ENABLE_Netcdf ON)
@@ -387,11 +390,13 @@ IF (ATDM_USE_SPARC_TPL_FIND_SETTINGS)
   ATDM_SET_CACHE(PNetCDF_ROOT "$ENV{PNETCDF_ROOT}" CACHE FILEPATH)
   ATDM_SET_CACHE(NetCDF_ROOT "$ENV{NETCDF_ROOT}" CACHE FILEPATH)
 ELSE()
-  IF ("$ENV{ATDM_CONFIG_NETCDF_LIBS}" STREQUAL "")
-    MESSAGE(FATAL_ERROR "Error: ToDo: Implement default Netcdf libs")
-  ENDIF()
   ATDM_SET_CACHE(Netcdf_INCLUDE_DIRS "$ENV{NETCDF_ROOT}/include" CACHE FILEPATH)
-  ATDM_SET_CACHE(TPL_Netcdf_LIBRARIES "$ENV{ATDM_CONFIG_NETCDF_LIBS}" CACHE FILEPATH)
+  IF (NOT "$ENV{ATDM_CONFIG_NETCDF_LIBS}" STREQUAL "")
+    ATDM_SET_CACHE(TPL_Netcdf_LIBRARIES "$ENV{ATDM_CONFIG_NETCDF_LIBS}" CACHE FILEPATH)
+  ELSE()
+    ASSERT_DEFINED(ENV{ZLIB_ROOT})
+    ATDM_SET_CACHE(TPL_Netcdf_LIBRARIES "${TPL_BoostLib_LIBRARIES};$ENV{NETCDF_ROOT}/lib/libnetcdf.${ATDM_TPL_LIB_EXT};$ENV{NETCDF_ROOT}/lib/libpnetcdf.a;$ENV{HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};$ENV{HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl;-lcurl" CACHE FILEPATH)
+  ENDIF()
 ENDIF()
 
 # SuperLUDist
@@ -473,10 +478,6 @@ IF (COMMAND INSTALL AND NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
     DESTINATION ${ATDM_CONFIG_SCRIPTS_INSTALL_DIR}
     PATTERN "*.cmake" EXCLUDE )
 
-  INSTALL( DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/$ENV{ATDM_CONFIG_KNOWN_SYSTEM_NAME}
-    DESTINATION ${ATDM_CONFIG_SCRIPTS_INSTALL_DIR}
-    PATTERN "*.cmake" EXCLUDE )
-
   INSTALL( DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/common
     DESTINATION ${ATDM_CONFIG_SCRIPTS_INSTALL_DIR}
     PATTERN "*.cmake" EXCLUDE )
@@ -491,6 +492,20 @@ IF (COMMAND INSTALL AND NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
     CACHE STRING
     "Name of env var set to <CMAKE_INSTALL_PREFIX> set in installed script <ATDM_INSTALLED_ENV_LOAD_SCRIPT_NAME>." )
 
+  SET(ATDM_CONFIG_SYSTEM_NAME $ENV{ATDM_CONFIG_SYSTEM_NAME})
+  SET(ATDM_CUSTOM_CONFIG_DIR_PATH $ENV{ATDM_CONFIG_CUSTOM_CONFIG_DIR_PATH})
+  IF (ATDM_CUSTOM_CONFIG_DIR_PATH)
+    SET(ATDM_CUSTOM_CONFIG_DIR_ARG
+      "${ATDM_CONFIG_SCRIPTS_INSTALL_DIR}/${ATDM_CONFIG_SYSTEM_NAME}")
+    INSTALL( DIRECTORY ${ATDM_CUSTOM_CONFIG_DIR_PATH}
+      DESTINATION ${ATDM_CONFIG_SCRIPTS_INSTALL_DIR} )
+  ELSE()
+    SET(ATDM_CUSTOM_CONFIG_DIR_ARG)
+    INSTALL( DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/${ATDM_CONFIG_SYSTEM_NAME}"
+      DESTINATION ${ATDM_CONFIG_SCRIPTS_INSTALL_DIR}
+      PATTERN "*.cmake" EXCLUDE )
+  ENDIF()
+
   CONFIGURE_FILE( ${CMAKE_CURRENT_LIST_DIR}/utils/load_matching_env.sh.in
     ${CMAKE_CURRENT_BINARY_DIR}/cmake/std/atdm/utils/load_matching_env.sh @ONLY )