Merge pull request #60 from LLNL/feature/weiss27/update-tpls

TPL updates for Axom
LLNL · Jul 1, 2019 · 339aa29 · 339aa29
2 parents 47fd6e5 + 4b0f4d6
commit 339aa29
Show file tree

Hide file tree

Showing 28 changed files with 655 additions and 99 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -49,6 +49,8 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 ### Deprecated
 
 ### Changed
+- Updated conduit TPL to v0.4.0
+- Updated mfem TPL to v4.0
 - Slam's Set and Relation classes are now parameterized by a PositionType and ElementType.
   Its Map classes are now parametrized by a SetType.
 - Updated the fmt tpl.

diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@upstream_nvcc_xlf.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@upstream_nvcc_xlf.cmake
@@ -0,0 +1,119 @@
+##################################
+# !!!! This is a generated file, edit at own risk !!!!
+##################################
+
+# Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
+# other Axom Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+##################################
+
+##################################
+
+# SYS_TYPE: blueos_3_ppc64le_ib_p9
+# Compiler Spec: clang@upstream_nvcc_xlf
+##################################
+
+# CMake executable path: /usr/WS1/axom/thirdparty_libs/builds/2019_06_27_22_06_03/clang-upstream_nvcc_xlf/cmake-3.9.6/bin/cmake
+
+##############
+# Compilers
+##############
+
+# C compiler used by spack
+set(CMAKE_C_COMPILER "/usr/tce/packages/clang/clang-upstream-2019.03.26/bin/clang" CACHE PATH "")
+
+# C++ compiler used by spack
+set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-upstream-2019.03.26/bin/clang++" CACHE PATH "")
+
+# Fortran compiler used by spack
+set(ENABLE_FORTRAN ON CACHE BOOL "")
+
+set(CMAKE_Fortran_COMPILER "/usr/tce/packages/xl/xl-2019.06.12/bin/xlf2003" CACHE PATH "")
+
+##############
+# TPLs
+##############
+
+# Root directory for generated TPLs
+set(TPL_ROOT "/usr/WS1/axom/thirdparty_libs/builds/2019_06_27_22_06_03/clang-upstream_nvcc_xlf" CACHE PATH "")
+
+# conduit from uberenv
+set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.4.0" CACHE PATH "")
+
+# mfem from uberenv
+set(MFEM_DIR "${TPL_ROOT}/mfem-4.0" CACHE PATH "")
+
+# hdf5 from uberenv
+set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.19" CACHE PATH "")
+
+# scr not built by uberenv
+
+# raja from uberenv
+set(RAJA_DIR "${TPL_ROOT}/raja-0.7.0/share/raja/cmake" CACHE PATH "")
+
+# umpire from uberenv
+set(UMPIRE_DIR "${TPL_ROOT}/umpire-0.3.2/share/umpire/cmake" CACHE PATH "")
+
+# python not built by uberenv
+
+set(ENABLE_DOCS OFF CACHE BOOL "")
+
+# shroud not built by uberenv
+
+# uncrustify not built by uberenv
+
+# lcov and genhtml not built by uberenv
+
+# cppcheck not built by uberenv
+
+##############
+# MPI
+##############
+
+set(ENABLE_MPI ON CACHE BOOL "")
+
+set(MPI_C_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-upstream-2019.03.26/bin/mpicc" CACHE PATH "")
+
+set(MPI_CXX_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-upstream-2019.03.26/bin/mpicxx" CACHE PATH "")
+
+set(MPI_Fortran_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-upstream-2019.03.26/bin/mpif90" CACHE PATH "")
+
+set(MPIEXEC "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-upstream-2019.03.26/bin/mpirun" CACHE PATH "")
+
+set(MPIEXEC_NUMPROC_FLAG "-np" CACHE PATH "")
+
+set(BLT_MPI_COMMAND_APPEND "mpibind" CACHE PATH "")
+
+##############
+# Other machine specifics
+##############
+
+set(ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "")
+
+set(CMAKE_Fortran_COMPILER_ID "XL" CACHE PATH "All of BlueOS compilers report clang due to nvcc, override to proper compiler family")
+
+set(BLT_FORTRAN_FLAGS "-WF,-C!" CACHE PATH "Converts C-style comments to Fortran style in preprocessed files")
+
+set(BLT_EXE_LINKER_FLAGS "-Wl,-rpath,/usr/tce/packages/xl/xl-2018.05.18/lib/" CACHE PATH "Adds a missing rpath for libraries associated with the fortran compiler")
+
+##############
+# Cuda
+##############
+
+set(ENABLE_CUDA ON CACHE BOOL "")
+
+set(CUDA_TOOLKIT_ROOT_DIR "/usr/tce/packages/cuda/cuda-9.2.148" CACHE PATH "")
+
+set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc" CACHE PATH "")
+
+set(CUDA_ARCH "sm_60" CACHE PATH "")
+
+set(CMAKE_CUDA_FLAGS "-restrict -arch ${CUDA_ARCH} -std=c++11 --expt-extended-lambda -G" CACHE PATH "")
+
+set(CMAKE_CUDA_HOST_COMPILER "${MPI_CXX_COMPILER}" CACHE PATH "")
+
+# nvcc does not like gtest's 'pthreads' flag
+set(gtest_disable_pthreads ON CACHE BOOL "")
+
+
diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@upstream_xlf.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@upstream_xlf.cmake
@@ -0,0 +1,100 @@
+##################################
+# !!!! This is a generated file, edit at own risk !!!!
+##################################
+
+# Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
+# other Axom Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+##################################
+
+##################################
+
+# SYS_TYPE: blueos_3_ppc64le_ib_p9
+# Compiler Spec: clang@upstream_xlf
+##################################
+
+# CMake executable path: /usr/WS1/axom/thirdparty_libs/builds/2019_06_27_22_06_03/clang-upstream_xlf/cmake-3.9.6/bin/cmake
+
+##############
+# Compilers
+##############
+
+# C compiler used by spack
+set(CMAKE_C_COMPILER "/usr/tce/packages/clang/clang-upstream-2019.03.26/bin/clang" CACHE PATH "")
+
+# C++ compiler used by spack
+set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-upstream-2019.03.26/bin/clang++" CACHE PATH "")
+
+# Fortran compiler used by spack
+set(ENABLE_FORTRAN ON CACHE BOOL "")
+
+set(CMAKE_Fortran_COMPILER "/usr/tce/packages/xl/xl-2019.06.12/bin/xlf2003" CACHE PATH "")
+
+##############
+# TPLs
+##############
+
+# Root directory for generated TPLs
+set(TPL_ROOT "/usr/WS1/axom/thirdparty_libs/builds/2019_06_27_22_06_03/clang-upstream_xlf" CACHE PATH "")
+
+# conduit from uberenv
+set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.4.0" CACHE PATH "")
+
+# mfem from uberenv
+set(MFEM_DIR "${TPL_ROOT}/mfem-4.0" CACHE PATH "")
+
+# hdf5 from uberenv
+set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.19" CACHE PATH "")
+
+# scr not built by uberenv
+
+# raja from uberenv
+set(RAJA_DIR "${TPL_ROOT}/raja-0.7.0/share/raja/cmake" CACHE PATH "")
+
+# umpire from uberenv
+set(UMPIRE_DIR "${TPL_ROOT}/umpire-0.3.2/share/umpire/cmake" CACHE PATH "")
+
+# python not built by uberenv
+
+set(ENABLE_DOCS OFF CACHE BOOL "")
+
+# shroud not built by uberenv
+
+# uncrustify not built by uberenv
+
+# lcov and genhtml not built by uberenv
+
+# cppcheck not built by uberenv
+
+##############
+# MPI
+##############
+
+set(ENABLE_MPI ON CACHE BOOL "")
+
+set(MPI_C_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-upstream-2019.03.26/bin/mpicc" CACHE PATH "")
+
+set(MPI_CXX_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-upstream-2019.03.26/bin/mpicxx" CACHE PATH "")
+
+set(MPI_Fortran_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-upstream-2019.03.26/bin/mpif90" CACHE PATH "")
+
+set(MPIEXEC "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-upstream-2019.03.26/bin/mpirun" CACHE PATH "")
+
+set(MPIEXEC_NUMPROC_FLAG "-np" CACHE PATH "")
+
+set(BLT_MPI_COMMAND_APPEND "mpibind" CACHE PATH "")
+
+##############
+# Other machine specifics
+##############
+
+set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "")
+
+set(CMAKE_Fortran_COMPILER_ID "XL" CACHE PATH "All of BlueOS compilers report clang due to nvcc, override to proper compiler family")
+
+set(BLT_FORTRAN_FLAGS "-WF,-C!" CACHE PATH "Converts C-style comments to Fortran style in preprocessed files")
+
+set(BLT_EXE_LINKER_FLAGS "-Wl,-rpath,/usr/tce/packages/xl/xl-2018.05.18/lib/" CACHE PATH "Adds a missing rpath for libraries associated with the fortran compiler")
+
+
diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@7.3.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@7.3.1.cmake
@@ -0,0 +1,96 @@
+##################################
+# !!!! This is a generated file, edit at own risk !!!!
+##################################
+
+# Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
+# other Axom Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+##################################
+
+##################################
+
+# SYS_TYPE: blueos_3_ppc64le_ib_p9
+# Compiler Spec: gcc@7.3.1
+##################################
+
+# CMake executable path: /usr/WS1/axom/thirdparty_libs/builds/2019_06_27_22_06_03/gcc-7.3.1/cmake-3.9.6/bin/cmake
+
+##############
+# Compilers
+##############
+
+# C compiler used by spack
+set(CMAKE_C_COMPILER "/usr/tce/packages/gcc/gcc-7.3.1/bin/gcc" CACHE PATH "")
+
+# C++ compiler used by spack
+set(CMAKE_CXX_COMPILER "/usr/tce/packages/gcc/gcc-7.3.1/bin/g++" CACHE PATH "")
+
+# Fortran compiler used by spack
+set(ENABLE_FORTRAN ON CACHE BOOL "")
+
+set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-7.3.1/bin/gfortran" CACHE PATH "")
+
+##############
+# TPLs
+##############
+
+# Root directory for generated TPLs
+set(TPL_ROOT "/usr/WS1/axom/thirdparty_libs/builds/2019_06_27_22_06_03/gcc-7.3.1" CACHE PATH "")
+
+# conduit from uberenv
+set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.4.0" CACHE PATH "")
+
+# mfem from uberenv
+set(MFEM_DIR "${TPL_ROOT}/mfem-4.0" CACHE PATH "")
+
+# hdf5 from uberenv
+set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.19" CACHE PATH "")
+
+# scr not built by uberenv
+
+# raja from uberenv
+set(RAJA_DIR "${TPL_ROOT}/raja-0.7.0/share/raja/cmake" CACHE PATH "")
+
+# umpire from uberenv
+set(UMPIRE_DIR "${TPL_ROOT}/umpire-0.3.2/share/umpire/cmake" CACHE PATH "")
+
+# python not built by uberenv
+
+set(ENABLE_DOCS OFF CACHE BOOL "")
+
+# shroud not built by uberenv
+
+# uncrustify not built by uberenv
+
+# lcov and genhtml not built by uberenv
+
+# cppcheck not built by uberenv
+
+##############
+# MPI
+##############
+
+set(ENABLE_MPI ON CACHE BOOL "")
+
+set(MPI_C_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-7.3.1/bin/mpicc" CACHE PATH "")
+
+set(MPI_CXX_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-7.3.1/bin/mpicxx" CACHE PATH "")
+
+set(MPI_Fortran_COMPILER "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-7.3.1/bin/mpif90" CACHE PATH "")
+
+set(MPIEXEC "/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-7.3.1/bin/mpirun" CACHE PATH "")
+
+set(MPIEXEC_NUMPROC_FLAG "-np" CACHE PATH "")
+
+set(BLT_MPI_COMMAND_APPEND "mpibind" CACHE PATH "")
+
+##############
+# Other machine specifics
+##############
+
+set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "")
+
+set(ENABLE_OPENMP ON CACHE BOOL "")
+
+