Removed MPI dependency.

Author: corbett5

CMakeLists.txt

@@ -29,7 +29,6 @@ if( NOT is_submodule )
     option( ENABLE_CUDA "Build with CUDA" OFF )
     option( ENABLE_UMPIRE "Build with UMPIRE" OFF )
     option( ENABLE_CHAI "Build with CHAI" OFF )
-    option( ENABLE_MPI "Build with MPI" OFF )
     option( ENABLE_CALIPER "Build with Caliper" OFF )
 
     include( cmake/blt/SetupBLT.cmake )
@@ -48,10 +47,6 @@ if( ENABLE_CHAI )
     set( lvarray_dependencies ${lvarray_dependencies} chai umpire )
 endif()
 
-if( ENABLE_MPI )
-    set( lvarray_dependencies ${lvarray_dependencies} mpi )
-endif()
-
 if( ENABLE_CUDA )
     set( lvarray_dependencies ${lvarray_dependencies} cuda )
 endif()

cmake/Config.cmake

@@ -1,7 +1,6 @@
 #
 set( PREPROCESSOR_DEFINES CHAI
                           CUDA
-                          MPI
                           TOTALVIEW_OUTPUT
                           CALIPER )
 

src/LvArrayConfig.hpp.in

@@ -18,8 +18,6 @@
 
 #cmakedefine LVARRAY_USE_CUDA
 
-#cmakedefine LVARRAY_USE_MPI
-
 #cmakedefine LVARRAY_USE_TOTALVIEW_OUTPUT
 
 #cmakedefine LVARRAY_USE_CALIPER

src/Macros.hpp

@@ -110,7 +110,7 @@
       __oss << MSG << "\n"; \
       __oss << LvArray::system::stackTrace( true ); \
       std::cout << __oss.str() << std::endl; \
-      LvArray::system::abort(); \
+      LvArray::system::callErrorHandler(); \
     } \
   } while( false )
 #endif

src/system.cpp

@@ -30,10 +30,6 @@
   #include <sys/wait.h>
 #endif
 
-#if defined( LVARRAY_USE_MPI )
-  #include <mpi.h>
-#endif
-
 /**
  * @struct UnwindState
  * @brief Holds info used in unwindCallback.
@@ -429,18 +425,27 @@ std::string calculateSize( size_t const bytes )
   return result;
 }
 
+#if defined( __ibmxl__ )
+// For whatever reason XL emits an error when assigning std::abort to @c s_errorHandler.
+static void ibmAbort()
+{ std::abort(); }
+
+std::function< void() > s_errorHandler = ibmAbort;
+#else
+std::function< void() > s_errorHandler = std::abort;
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void abort()
+void setErrorHandler( std::function< void() > const & handler )
 {
-#ifdef LVARRAY_USE_MPI
-  int mpi = 0;
-  MPI_Initialized( &mpi );
-  if( mpi )
-  {
-    MPI_Abort( MPI_COMM_WORLD, EXIT_FAILURE );
-  }
-#endif
-  std::abort();
+  LVARRAY_ERROR_IF( handler == nullptr, "Error handler cannot be null." );
+  s_errorHandler = handler;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void callErrorHandler()
+{
+  s_errorHandler();
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -467,7 +472,7 @@ void stackTraceHandler( int const sig, bool const exit )
     // An infinite loop was encountered when an FPE was received. Resetting the handlers didn't
     // fix it because they would just recurse. This does.
     setSignalHandling( nullptr );
-    abort();
+    callErrorHandler();
   }
 }
 

src/system.hpp

@@ -13,10 +13,9 @@
 #pragma once
 
 // System includes
-#include <vector>
-#include <array>
 #include <string>
 #include <typeinfo>
+#include <functional>
 
 namespace LvArray
 {
@@ -60,9 +59,16 @@ inline std::string demangleType( T const & )
 { return demangle( typeid( T ).name() ); }
 
 /**
- * @brief Abort the program, correctly finalizing MPI.
+ * @brief Set the error handler called by LVARRAY_ERROR and others.
+ * @param handler The error handler.
+ * @note By default the error handler is std::abort.
  */
-void abort();
+void setErrorHandler( std::function< void() > const & handler );
+
+/**
+ * @brief Call the error handler, by default this is std::abort.
+ */
+void callErrorHandler();
 
 /**
  * @brief Print signal information and a stack trace to standard out, optionally aborting.