Merge pull request #20 from LLNL/feature/update-toss3-clang-mvapich

Updates mvapich2 version for toss3 clang host-configs
LLNL · May 6, 2019 · b8d1ae4 · b8d1ae4
2 parents 082a47c + bf0208f
commit b8d1ae4
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 20 deletions.
diff --git a/.mailmap b/.mailmap
@@ -2,20 +2,22 @@ Aaron Black <black27@llnl.gov>                  Aaron C. Black <black27@llnl.gov
 Adam J. Kunen <kunen1@llnl.gov>                 Adam J. Kunen <kunen1@sierra1626.llnl.gov>
 Arlie Capps <capps2@llnl.gov>                   Arlie Capps <capps2@cab669.llnl.gov>
 Arlie Capps <capps2@llnl.gov>                   Arlie Capps <capps2@cab689.llnl.gov>
+Arlie Capps <capps2@llnl.gov>                   Arlie Capps <48997041+agcapps@users.noreply.github.com>
 Austin Stromme <stromme1@llnl.gov>              Austin James Stromme <stromme1@llnl.gov>
 Austin Stromme <stromme1@llnl.gov>              Austin James Stromme <stromme1@cab689.llnl.gov>
 Austin Stromme <stromme1@llnl.gov>              Austin James Stromme <stromme1@cab669.llnl.gov>
 Benjamin Curtice Corbett <corbett5@llnl.gov>    Benjamin Curtice Corbett <corbett5@cab668.llnl.gov>
 Benjamin Curtice Corbett <corbett5@llnl.gov>    Ben Corbett <corbett5@llnl.gov>
 Benjamin Curtice Corbett <corbett5@llnl.gov>    Benjamin Corbett <corbett5@llnl.gov>
-Brian Ryujin <ryujin1@llnl.gov>                 Brian R <bryujin@gmail.com>
+Benjamin Curtice Corbett <corbett5@llnl.gov>    Ben Corbett <32752943+corbett5@users.noreply.github.com>
 Chris White <white238@llnl.gov>                 Christopher A. White <white238@llnl.gov>
 Cyrus D. Harrison <harrison37@llnl.gov>         Cyrus Harrison <cyrush@llnl.gov>
 Cyrus D. Harrison <harrison37@llnl.gov>         Cyrus Harrison <harrison37@llnl.gov>
 Cyrus D. Harrison <harrison37@llnl.gov>         Cyrus <cyrush@llnl.gov>
 Evan Taylor Desantola <desantola1@llnl.gov>     Evan Taylor DeSantola <desantola1@llnl.gov>
 George Zagaris <zagaris2@llnl.gov>              George Zagaris <george.zagaris@gmail.com>
 Kenneth Weiss <weiss27@llnl.gov>                Kenneth Weiss <kweiss@llnl.gov>
+Kenneth Weiss <weiss27@llnl.gov>                Kenny Weiss <kennyweiss@users.noreply.github.com>
 Lee A. Taylor <taylor16@llnl.gov>               Lee A. Taylor <taylor@cab688.llnl.gov>
 Lee A. Taylor <taylor16@llnl.gov>               Lee A. Taylor <taylor@cab688.llnl.gov>
 Lee A. Taylor <taylor16@llnl.gov>               Lee Taylor <ltaylor@llnl.gov>

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Axom provides a robust, flexible software infrastructure for the development of
 Documentation
 -------------
 
-https://axom.readthedocs.io/en/develop/
+https://axom.readthedocs.io
 
 Getting Involved
 ----------------
@@ -46,7 +46,12 @@ Release
 Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC. 
 Produced at the Lawrence Livermore National Laboratory.
 
-All rights reserved. See details in the file [LICENSE](./LICENSE).
+All rights reserved. 
 
-Unlimited Open Source - BSD Distribution
+Unlimited Open Source - BSD 3-clause Distribution
 `LLNL-CODE-741217` `OCEC-17-187`
+
+Additional license and copyright information can be found in the following files:
+ * [LICENSE](./LICENSE)
+ * [COPYRIGHT](./COPYRIGHT)
+
diff --git a/host-configs/rzgenie-toss_3_x86_64_ib-clang@3.9.1.cmake b/host-configs/rzgenie-toss_3_x86_64_ib-clang@3.9.1.cmake
@@ -6,14 +6,15 @@
 # other Axom Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
+##################################
 
 ##################################
 
 # SYS_TYPE: toss_3_x86_64_ib
 # Compiler Spec: clang@3.9.1
 ##################################
 
-# CMake executable path: /usr/WS1/axom/thirdparty_libs/builds/2019_03_08_10_00_53/clang-3.9.1/cmake-3.9.6/bin/cmake
+# CMake executable path: /usr/WS1/axom/thirdparty_libs/builds/2019_05_02_14_58_31/clang-3.9.1/cmake-3.9.6/bin/cmake
 
 ##############
 # Compilers
@@ -35,7 +36,7 @@ set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-4.9.3/bin/gfortran" CACHE
 ##############
 
 # Root directory for generated TPLs
-set(TPL_ROOT "/usr/WS1/axom/thirdparty_libs/builds/2019_03_08_10_00_53/clang-3.9.1" CACHE PATH "")
+set(TPL_ROOT "/usr/WS1/axom/thirdparty_libs/builds/2019_05_02_14_58_31/clang-3.9.1" CACHE PATH "")
 
 # conduit from uberenv
 set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.3.1" CACHE PATH "")
@@ -44,7 +45,7 @@ set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.3.1" CACHE PATH "")
 set(MFEM_DIR "${TPL_ROOT}/mfem-3.4.0" CACHE PATH "")
 
 # hdf5 from uberenv
-set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.21" CACHE PATH "")
+set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.19" CACHE PATH "")
 
 # scr not built by uberenv
 
@@ -72,11 +73,11 @@ set(ENABLE_DOCS OFF CACHE BOOL "")
 
 set(ENABLE_MPI ON CACHE BOOL "")
 
-set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.2-clang-3.9.1/bin/mpicc" CACHE PATH "")
+set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-3.9.1/bin/mpicc" CACHE PATH "")
 
-set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.2-clang-3.9.1/bin/mpicxx" CACHE PATH "")
+set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-3.9.1/bin/mpicxx" CACHE PATH "")
 
-set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.2-clang-3.9.1/bin/mpif90" CACHE PATH "")
+set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-3.9.1/bin/mpif90" CACHE PATH "")
 
 set(MPIEXEC "/usr/bin/srun" CACHE PATH "")
 

diff --git a/host-configs/rzgenie-toss_3_x86_64_ib-clang@4.0.0.cmake b/host-configs/rzgenie-toss_3_x86_64_ib-clang@4.0.0.cmake
@@ -6,14 +6,15 @@
 # other Axom Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
+##################################
 
 ##################################
 
 # SYS_TYPE: toss_3_x86_64_ib
 # Compiler Spec: clang@4.0.0
 ##################################
 
-# CMake executable path: /usr/WS1/axom/thirdparty_libs/builds/2019_03_14_11_48_30/clang-4.0.0/cmake-3.9.6/bin/cmake
+# CMake executable path: /usr/WS1/axom/thirdparty_libs/builds/2019_05_02_14_58_31/clang-4.0.0/cmake-3.9.6/bin/cmake
 
 ##############
 # Compilers
@@ -35,7 +36,7 @@ set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-4.9.3/bin/gfortran" CACHE
 ##############
 
 # Root directory for generated TPLs
-set(TPL_ROOT "/usr/WS1/axom/thirdparty_libs/builds/2019_03_14_11_48_30/clang-4.0.0" CACHE PATH "")
+set(TPL_ROOT "/usr/WS1/axom/thirdparty_libs/builds/2019_05_02_14_58_31/clang-4.0.0" CACHE PATH "")
 
 # conduit from uberenv
 set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.3.1" CACHE PATH "")
@@ -82,11 +83,11 @@ set(CPPCHECK_EXECUTABLE "${TPL_ROOT}/cppcheck-1.81/bin/cppcheck" CACHE PATH "")
 
 set(ENABLE_MPI ON CACHE BOOL "")
 
-set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.2-clang-4.0.0/bin/mpicc" CACHE PATH "")
+set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-4.0.0/bin/mpicc" CACHE PATH "")
 
-set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.2-clang-4.0.0/bin/mpicxx" CACHE PATH "")
+set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-4.0.0/bin/mpicxx" CACHE PATH "")
 
-set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.2-clang-4.0.0/bin/mpif90" CACHE PATH "")
+set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-4.0.0/bin/mpif90" CACHE PATH "")
 
 set(MPIEXEC "/usr/bin/srun" CACHE PATH "")
 

diff --git a/scripts/uberenv/packages/uberenv-axom/package.py b/scripts/uberenv/packages/uberenv-axom/package.py
@@ -159,7 +159,7 @@ def install(self, spec, prefix):
         cfg.write("##################################\n")
         cfg.write("# !!!! This is a generated file, edit at own risk !!!!\n")
         cfg.write("##################################\n\n")
-        cfg.write("# Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and.\n")
+        cfg.write("# Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and\n")
         cfg.write("# other Axom Project Developers. See the top-level COPYRIGHT file for details.\n")
         cfg.write("#\n")
         cfg.write("# SPDX-License-Identifier: (BSD-3-Clause)\n")

diff --git a/scripts/uberenv/spack_configs/toss_3_x86_64_ib/packages.yaml b/scripts/uberenv/spack_configs/toss_3_x86_64_ib/packages.yaml
@@ -52,9 +52,9 @@ packages:
       mvapich2@2.2%intel@17.0.0 arch=linux-rhel7-x86_64: /usr/tce/packages/mvapich2/mvapich2-2.2-intel-17.0.0
       mvapich2@2.2%intel@17.0.2 arch=linux-rhel7-x86_64: /usr/tce/packages/mvapich2/mvapich2-2.2-intel-17.0.2
       mvapich2@2.2%intel@18.0.2 arch=linux-rhel7-x86_64: /usr/tce/packages/mvapich2/mvapich2-2.2-intel-18.0.2
-      mvapich2@2.2%clang@3.9.0 arch=linux-rhel7-x86_64: /usr/tce/packages/mvapich2/mvapich2-2.2-clang-3.9.0
-      mvapich2@2.2%clang@3.9.1 arch=linux-rhel7-x86_64: /usr/tce/packages/mvapich2/mvapich2-2.2-clang-3.9.1
-      mvapich2@2.2%clang@4.0.0 arch=linux-rhel7-x86_64: /usr/tce/packages/mvapich2/mvapich2-2.2-clang-4.0.0
+      mvapich2@2.3%clang@3.9.0 arch=linux-rhel7-x86_64: /usr/tce/packages/mvapich2/mvapich2-2.3-clang-3.9.0
+      mvapich2@2.3%clang@3.9.1 arch=linux-rhel7-x86_64: /usr/tce/packages/mvapich2/mvapich2-2.3-clang-3.9.1
+      mvapich2@2.3%clang@4.0.0 arch=linux-rhel7-x86_64: /usr/tce/packages/mvapich2/mvapich2-2.3-clang-4.0.0
     buildable: False
 # Spack may grab for mpi & we don't want to use them
   charm:

diff --git a/src/cmake/blt b/src/cmake/blt