Merge pull request #106 from LLNL/bugfix/develop/debug-mpi-off-builds

Fixing Debug & MPI-Off builds

cmake/spheral/SpheralAddLibs.cmake

@@ -121,7 +121,7 @@ function(spheral_add_pybind11_library package_name)
 
   # Set the r-path of the C++ lib such that it is independent of the build dir when installed
   set_target_properties(${MODULE_NAME} PROPERTIES
-                        INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${boost_DIR}/lib;${python_DIR}/lib"
+    INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${boost_DIR}/lib;${python_DIR}/lib"
                         )
 
 endfunction()

cmake/tpl/hdf5.cmake

@@ -15,7 +15,7 @@ if(${lib_name}_BUILD)
     URL ${HDF5_URL} 
     URL_HASH "MD5=${HDF5_MD5}"
     DOWNLOAD_DIR ${CACHE_DIR}
-    CONFIGURE_COMMAND env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CXXFLAGS=-fPIC FCFLAGS=-fPIC ${HDF5_PREFIX}/src/hdf5/configure --prefix=${${lib_name}_DIR}
+    CONFIGURE_COMMAND env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CXXFLAGS=-fPIC FCFLAGS=-fPIC ${HDF5_PREFIX}/src/hdf5/configure --prefix=${${lib_name}_DIR} --enable-shared=no
     BUILD_COMMAND make 
     INSTALL_COMMAND make install
 

scripts/lc-builds/blueos_gcc8.3.1-debug-mpi-python.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=${0%/*}
+. "$SCRIPT_PATH/utils/parse-args.sh"
+
+# Inherit build directory name from script name
+BUILD_SUFFIX="lc_$(TMP=${BASH_SOURCE##*/}; echo ${TMP%.*})"
+
+rm -rf ${BUILD_SUFFIX} 2>/dev/null
+mkdir -p ${BUILD_SUFFIX}/install
+mkdir -p ${BUILD_SUFFIX}/build && cd ${BUILD_SUFFIX}/build
+
+module load cmake/3.14.5
+module load gcc/8.3.1
+
+cmake \
+  ../.. \
+  -DCMAKE_BUILD_TYPE=Debug \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
+  -C ${HOST_CONFIGS_DIR}/lc-builds/blueos/gcc8.3.1_tpl.cmake \
+  -DBLT_CXX_STD=c++14 \
+  -DENABLE_OPENMP=On \
+  -DENABLE_MPI=On \
+  -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
+  "$@" \
+  #-DSPHERAL_TPL_DIR=/usr/workspace/wsrzd/davis291/SPHERAL/blueos_Spheral_gcc8_noMPI/install/tpl \

scripts/lc-builds/blueos_gcc8.3.1-debug-seq-python.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=${0%/*}
+. "$SCRIPT_PATH/utils/parse-args.sh"
+
+# Inherit build directory name from script name
+BUILD_SUFFIX="lc_$(TMP=${BASH_SOURCE##*/}; echo ${TMP%.*})"
+
+rm -rf ${BUILD_SUFFIX} 2>/dev/null
+mkdir -p ${BUILD_SUFFIX}/install
+mkdir -p ${BUILD_SUFFIX}/build && cd ${BUILD_SUFFIX}/build
+
+module load cmake/3.14.5
+module load gcc/8.3.1
+
+cmake \
+  ../.. \
+  -DCMAKE_BUILD_TYPE=Debug \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
+  -C ${HOST_CONFIGS_DIR}/lc-builds/blueos/gcc8.3.1_tpl.cmake \
+  -DBLT_CXX_STD=c++14 \
+  -DENABLE_OPENMP=On \
+  -DENABLE_MPI=Off \
+  -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
+  "$@" \
+  #-DSPHERAL_TPL_DIR=/usr/workspace/wsrzd/davis291/SPHERAL/blueos_Spheral_gcc8_noMPI/install/tpl \

scripts/lc-builds/blueos_gcc8.3.1-release-mpi-cxx.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=${0%/*}
+. "$SCRIPT_PATH/utils/parse-args.sh"
+
+# Inherit build directory name from script name
+BUILD_SUFFIX="lc_$(TMP=${BASH_SOURCE##*/}; echo ${TMP%.*})"
+
+rm -rf ${BUILD_SUFFIX} 2>/dev/null
+mkdir -p ${BUILD_SUFFIX}/install
+mkdir -p ${BUILD_SUFFIX}/build && cd ${BUILD_SUFFIX}/build
+
+module load cmake/3.14.5
+module load gcc/8.3.1
+
+cmake \
+  ../.. \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
+  -C ${HOST_CONFIGS_DIR}/lc-builds/blueos/gcc8.3.1_tpl.cmake \
+  -DBLT_CXX_STD=c++14 \
+  -DENABLE_OPENMP=On \
+  -DENABLE_MPI=On \
+  -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
+  -DENABLE_STATIC_CXXONLY=On \
+  "$@" \
+  #-DSPHERAL_TPL_DIR=/usr/workspace/wsrzd/davis291/SPHERAL/blueos_Spheral_gcc8_noMPI/install/tpl \

scripts/lc-builds/blueos_gcc8.3.1-release-mpi-python.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=${0%/*}
+. "$SCRIPT_PATH/utils/parse-args.sh"
+
+# Inherit build directory name from script name
+BUILD_SUFFIX="lc_$(TMP=${BASH_SOURCE##*/}; echo ${TMP%.*})"
+
+rm -rf ${BUILD_SUFFIX} 2>/dev/null
+mkdir -p ${BUILD_SUFFIX}/install
+mkdir -p ${BUILD_SUFFIX}/build && cd ${BUILD_SUFFIX}/build
+
+module load cmake/3.14.5
+module load gcc/8.3.1
+
+cmake \
+  ../.. \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
+  -C ${HOST_CONFIGS_DIR}/lc-builds/blueos/gcc8.3.1_tpl.cmake \
+  -DBLT_CXX_STD=c++14 \
+  -DENABLE_OPENMP=On \
+  -DENABLE_MPI=On \
+  -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
+  "$@" \
+  #-DSPHERAL_TPL_DIR=/usr/workspace/wsrzd/davis291/SPHERAL/blueos_Spheral_gcc8_noMPI/install/tpl \

scripts/lc-builds/blueos_gcc8.3.1-release-seq-cxx.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=${0%/*}
+. "$SCRIPT_PATH/utils/parse-args.sh"
+
+# Inherit build directory name from script name
+BUILD_SUFFIX="lc_$(TMP=${BASH_SOURCE##*/}; echo ${TMP%.*})"
+
+rm -rf ${BUILD_SUFFIX} 2>/dev/null
+mkdir -p ${BUILD_SUFFIX}/install
+mkdir -p ${BUILD_SUFFIX}/build && cd ${BUILD_SUFFIX}/build
+
+module load cmake/3.14.5
+module load gcc/8.3.1
+
+cmake \
+  ../.. \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
+  -C ${HOST_CONFIGS_DIR}/lc-builds/blueos/gcc8.3.1_tpl.cmake \
+  -DENABLE_OPENMP=On \
+  -DENABLE_MPI=Off \
+  -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
+  -DENABLE_STATIC_CXXONLY=On \
+  "$@" \
+  #-DSPHERAL_TPL_DIR=/usr/workspace/wsrzd/davis291/SPHERAL/blueos_Spheral_gcc8_noMPI/install/tpl \

scripts/lc-builds/blueos_gcc8.3.1-release-seq-python.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=${0%/*}
+. "$SCRIPT_PATH/utils/parse-args.sh"
+
+# Inherit build directory name from script name
+BUILD_SUFFIX="lc_$(TMP=${BASH_SOURCE##*/}; echo ${TMP%.*})"
+
+rm -rf ${BUILD_SUFFIX} 2>/dev/null
+mkdir -p ${BUILD_SUFFIX}/install
+mkdir -p ${BUILD_SUFFIX}/build && cd ${BUILD_SUFFIX}/build
+
+module load cmake/3.14.5
+module load gcc/8.3.1
+
+cmake \
+  ../.. \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
+  -C ${HOST_CONFIGS_DIR}/lc-builds/blueos/gcc8.3.1_tpl.cmake \
+  -DBLT_CXX_STD=c++14 \
+  -DENABLE_OPENMP=On \
+  -DENABLE_MPI=Off \
+  -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
+  "$@" \
+  #-DSPHERAL_TPL_DIR=/usr/workspace/wsrzd/davis291/SPHERAL/blueos_Spheral_gcc8_noMPI/install/tpl \

scripts/lc-builds/blueos_xl2021.03.11-release-seq-cxx.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=${0%/*}
+. "$SCRIPT_PATH/utils/parse-args.sh"
+
+# Inherit build directory name from script name
+BUILD_SUFFIX="lc_$(TMP=${BASH_SOURCE##*/}; echo ${TMP%.*})"
+
+rm -rf ${BUILD_SUFFIX} 2>/dev/null
+mkdir -p ${BUILD_SUFFIX}/install
+mkdir -p ${BUILD_SUFFIX}/build && cd ${BUILD_SUFFIX}/build
+
+module load cmake/3.14.5
+module load xl/2021.03.11
+
+cmake \
+  ${SRC_DIR} \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/xl/xl-2021.03.11/bin/xlc++ \
+  -DCMAKE_Fortran_COMPILER=/usr/tce/packages/xl/xl-2021.03.11/bin/xlf \
+  -DENABLE_OPENMP=Off \
+  -DENABLE_MPI=Off \
+  -DENABLE_ANEOS=Off \
+  -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
+  -DENABLE_STATIC_CXXONLY=On \
+  $CMAKE_ARGS \
+  #-C ${HOST_CONFIGS_DIR}/lc-builds/toss3/gcc8.3.1_tpl.cmake \

scripts/lc-builds/toss3_gcc8.3.1-debug-mpi-python.sh

@@ -18,6 +18,7 @@ cmake \
   -DCMAKE_BUILD_TYPE=Debug \
   -DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
   -C ${HOST_CONFIGS_DIR}/lc-builds/toss3/gcc8.3.1_tpl.cmake \
+  -DBLT_CXX_STD=c++14 \
   -DENABLE_OPENMP=On \
   -DENABLE_MPI=On \
   -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \

scripts/lc-builds/toss3_gcc8.3.1-release-seq-python.sh

@@ -18,6 +18,7 @@ cmake \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
   -C ${HOST_CONFIGS_DIR}/lc-builds/toss3/gcc8.3.1_tpl.cmake \
+  -DBLT_CXX_STD=c++14 \
   -DENABLE_OPENMP=On \
   -DENABLE_MPI=Off \
   -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \

src/CMakeLists.txt

@@ -45,18 +45,11 @@ list(APPEND _packages
 
 if(NOT ENABLE_CXXONLY)
   list(APPEND _packages 
-    PythonMPIInterfaces
     SimulationControl
     Pybind11Wraps
     )
 endif()
 
-if(NOT ENABLE_MPI)
-  list(REMOVE_ITEM _packages
-    Distributed
-    )
-endif()
-
 foreach(_package ${_packages})
   add_subdirectory(${_package})
 endforeach()

src/DataOutput/RestartRegistrar.cc

@@ -41,27 +41,6 @@ struct CompareWeakPtr: public std::binary_function<std::weak_ptr<T>, std::weak_p
   }
 };
 
-//------------------------------------------------------------------------------
-// Get the instance.
-//------------------------------------------------------------------------------
-RestartRegistrar&
-RestartRegistrar::
-instance() {
-  return *RestartRegistrar::instancePtr();
-}
-
-//------------------------------------------------------------------------------
-// Get the instance (pointer).
-//------------------------------------------------------------------------------
-RestartRegistrar*
-RestartRegistrar::
-instancePtr() {
-   if (mInstancePtr == 0) mInstancePtr = new RestartRegistrar;
-   CHECK(mInstancePtr != 0);
-   mInstancePtr->removeExpiredPointers();
-   return mInstancePtr;
-}
-
 //------------------------------------------------------------------------------
 // Register a RestartHandle.
 //------------------------------------------------------------------------------
@@ -235,8 +214,3 @@ RestartRegistrar::
 }
 
 }
-
-//------------------------------------------------------------------------------
-// Initialize the static instance pointer.
-//-----------------------------------------------------------------------------
-Spheral::RestartRegistrar* Spheral::RestartRegistrar::mInstancePtr = 0;

src/DataOutput/RestartRegistrar.hh

@@ -32,7 +32,6 @@ public:
 
   // Get the instance.
   static RestartRegistrar& instance();
-  static RestartRegistrar* instancePtr();
 
   // Methods for registering a RestartHandle.
   void registerRestartHandle(std::shared_ptr<RestartHandle> restartHandlePtr,
@@ -68,9 +67,6 @@ private:
   typedef PriorityContainer::const_iterator const_priority_iterator;
   typedef PriorityContainer::iterator priority_iterator;
 
-  // The one and only instance.
-  static RestartRegistrar* mInstancePtr;
-
   // The list of RestartHandles and their priorities.
   RestartHandleContainer mRestartHandles;
   PriorityContainer mPriorities;

src/DataOutput/RestartRegistrarInline.hh

@@ -1,5 +1,16 @@
 namespace Spheral {
 
+//------------------------------------------------------------------------------
+// Get the instance.
+//------------------------------------------------------------------------------
+inline
+RestartRegistrar&
+RestartRegistrar::
+instance() {
+  static RestartRegistrar theInstance;
+  return theInstance;
+}
+
 //------------------------------------------------------------------------------
 // The non-const iterators.
 //------------------------------------------------------------------------------

src/Distributed/BoundingVolumeDistributedBoundary.cc

@@ -37,31 +37,6 @@ using std::abs;
 
 namespace Spheral {
 
-// Static initialization of singleton instance.
-template <typename Dimension>
-BoundingVolumeDistributedBoundary<Dimension>*
-BoundingVolumeDistributedBoundary<Dimension>::mInstance = 0;
-
-//------------------------------------------------------------------------------
-// Singleton instance method.
-//------------------------------------------------------------------------------
-template<typename Dimension>
-BoundingVolumeDistributedBoundary<Dimension>&
-BoundingVolumeDistributedBoundary<Dimension>::
-instance() {
-  if (mInstance == 0) {
-    mInstance = new BoundingVolumeDistributedBoundary();
-  } // end if
-  return *mInstance;
-}
-
-template<typename Dimension>
-BoundingVolumeDistributedBoundary<Dimension>*
-BoundingVolumeDistributedBoundary<Dimension>::
-instancePtr() {
-  return &(instance());
-}
-
 //------------------------------------------------------------------------------
 // Constructor.
 //------------------------------------------------------------------------------

src/Distributed/BoundingVolumeDistributedBoundary.hh

@@ -37,7 +37,6 @@ public:
 
   // This method returns the singleton instance of the object.
   static BoundingVolumeDistributedBoundary& instance();
-  static BoundingVolumeDistributedBoundary* instancePtr();
 
   // Destructor.
   virtual ~BoundingVolumeDistributedBoundary();
@@ -50,9 +49,6 @@ public:
 
 private:
   //--------------------------- Private Interface ---------------------------//
-  // Singleton instance pointer.
-  static BoundingVolumeDistributedBoundary* mInstance;
-
   // Disabled methods.
   BoundingVolumeDistributedBoundary();
   BoundingVolumeDistributedBoundary(const BoundingVolumeDistributedBoundary&);
@@ -68,6 +64,8 @@ private:
 
 }
 
+#include "BoundingVolumeDistributedBoundaryInline.hh"
+
 #else
 
 // Forward declaration.

src/Distributed/BoundingVolumeDistributedBoundaryInline.hh

@@ -0,0 +1,15 @@
+namespace Spheral {
+
+//------------------------------------------------------------------------------
+// Singleton instance method.
+//------------------------------------------------------------------------------
+template<typename Dimension>
+inline
+BoundingVolumeDistributedBoundary<Dimension>&
+BoundingVolumeDistributedBoundary<Dimension>::
+instance() {
+  static BoundingVolumeDistributedBoundary<Dimension> theInstance;
+  return theInstance;
+}
+
+}