Tony's changes to error handling in the CUDA platform so it throws exceptions...

Tony's changes to error handling in the CUDA platform so it throws exceptions instead of calling exit()

libraries/validate/src/ValidateOpenMMForces.cpp

@@ -24,6 +24,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.      *
  * -------------------------------------------------------------------------- */
 
+#include <iostream>
+#include <sstream>
+#include "openmm/OpenMMException.h"
 #include "ValidateOpenMMForces.h"
 
 using namespace OpenMM;
@@ -547,8 +550,10 @@ ForceValidationResult* ValidateOpenMMForces::compareForce(Context& context, std:
     for( int ii = 0; ii < system.getNumForces(); ii++ ){
         std::string forceName         = getForceName( system.getForce( ii ) );
         if( forceName.compare( "NA" ) == 0 ){
-            (void) fprintf( stderr, "Force at index=%d not found -- aborting!\n", ii );
-            exit(-1);
+            std::stringstream message;
+            message << "Force at index=" << ii << " not found -- aborting!";
+            std::cerr << message << std::endl;
+            throw OpenMM::OpenMMException(message.str());
         }
         systemForceNameMap[forceName] = ii;
         systemForceNameIndex[ii]      = forceName;

platforms/cuda/sharedTarget/CMakeLists.txt

@@ -11,6 +11,7 @@ FOREACH(subdir ${OPENMM_SOURCE_SUBDIRS})
     CUDA_INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/platforms/cuda/${subdir}/src)
 ENDFOREACH(subdir)
 CUDA_INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/jama/include)
+CUDA_INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/openmmapi/include)
 
 IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
     SET(MAIN_OPENMM_LIB ${OPENMM_LIBRARY_NAME}_d)

platforms/cuda/src/kernels/cudatypes.h

@@ -38,19 +38,18 @@
 #include <cufft.h>
 #include <builtin_types.h>
 #include <vector_functions.h>
+#include "openmm/OpenMMException.h"
 
 #define RTERROR(status, s) \
     if (status != cudaSuccess) { \
-        printf("%s %s\n", s, cudaGetErrorString(status)); \
-        exit(-1); \
+        throw OpenMM::OpenMMException(std::string(s) + " " + cudaGetErrorString(status)); \
     }
 
 #define LAUNCHERROR(s) \
     { \
         cudaError_t status = cudaGetLastError(); \
         if (status != cudaSuccess) { \
-            printf("Error: %s launching kernel %s\n", cudaGetErrorString(status), s); \
-            exit(-1); \
+            throw OpenMM::OpenMMException(std::string("Error: ") + cudaGetErrorString(status) + " launching kernel " + s); \
         } \
     }
 

platforms/reference/src/SimTKUtilities/SimTKOpenMMLog.cpp

@@ -24,6 +24,7 @@
 
 #include "SimTKOpenMMLog.h"
 #include <stdlib.h>
+#include "openmm/OpenMMException.h"
 
 // static settings
 
@@ -291,13 +292,13 @@ void SimTKOpenMMLog::printError( const std::stringstream& message ){
 
 // ---------------------------------------------------------------------------------------
 
-   if( _simTKOpenMMLog ){
    std::stringstream messageWithHeader;
    messageWithHeader << "Error: " << message.str();
+   if( _simTKOpenMMLog ){
       _simTKOpenMMLog->logMessage( messageWithHeader );
    } else {
-      (void) fprintf( stderr, "Error: %s", message.str().c_str() );
+      (void) fprintf( stderr, "%s", messageWithHeader.str().c_str() );
       (void) fflush( stderr );
    }
-   exit(-1);
+   throw OpenMM::OpenMMException(messageWithHeader.str());
 }