Unit tests for nonbonded and GBSAOBC

platforms/opencl/tests/CMakeLists.txt

@@ -7,6 +7,14 @@ ENABLE_TESTING()
 # INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../FindOpenCL.cmake)
 INCLUDE_DIRECTORIES(${OPENCL_INCLUDE_DIR})
 
+SET( INCLUDE_SERIALIZATION FALSE )
+#SET( INCLUDE_SERIALIZATION TRUE )
+
+IF( INCLUDE_SERIALIZATION )
+    INCLUDE_DIRECTORIES(${OPENMM_DIR}/serialization/include)
+    SET( SHARED_OPENMM_SERIALIZATION "OpenMMSerialization" )
+ENDIF( INCLUDE_SERIALIZATION )
+
 # Automatically create tests using files named "Test*.cpp"
 FILE(GLOB TEST_PROGS "*Test*.cpp")
 FOREACH(TEST_PROG ${TEST_PROGS})
@@ -15,6 +23,36 @@ FOREACH(TEST_PROG ${TEST_PROGS})
     # Link with shared library
     ADD_EXECUTABLE(${TEST_ROOT} ${TEST_PROG})
     TARGET_LINK_LIBRARIES(${TEST_ROOT} ${SHARED_TARGET})
+
+    IF( ${TEST_ROOT} STREQUAL "TestOpenCLGBSAOBCForce2" )
+
+        SET(DEFINE_STRING "-DTEST_PLATFORM=1 ")
+        IF( INCLUDE_SERIALIZATION )
+            SET(DEFINE_STRING "${DEFINE_STRING} -DOPENMM_SERIALIZE ")
+        ENDIF( INCLUDE_SERIALIZATION )
+    
+        # nonbond
+
+        SET(NONBOND_DEFINE_STRING "${DEFINE_STRING} -DIMPLICIT_SOLVENT=0")
+        SET(NONBOND_TEST "TestOpenCLNonbondForce2")
+        CUDA_ADD_EXECUTABLE(${NONBOND_TEST} ${TEST_PROG})
+
+        SET_TARGET_PROPERTIES(${NONBOND_TEST} PROPERTIES COMPILE_FLAGS ${NONBOND_DEFINE_STRING} )
+        ADD_TEST(${NONBOND_TEST} ${EXECUTABLE_OUTPUT_PATH}/${NONBOND_TEST})
+
+        # OBC
+
+        SET(DEFINE_STRING "${DEFINE_STRING} -DIMPLICIT_SOLVENT=1")
+        SET_TARGET_PROPERTIES(${TEST_ROOT} PROPERTIES COMPILE_FLAGS ${DEFINE_STRING} )
+
+        IF( INCLUDE_SERIALIZATION )
+            TARGET_LINK_LIBRARIES(${NONBOND_TEST} ${SHARED_TARGET} ${SHARED_OPENMM_SERIALIZATION} )
+            TARGET_LINK_LIBRARIES(${TEST_ROOT} ${SHARED_TARGET} ${SHARED_OPENMM_SERIALIZATION} )
+        ELSE( INCLUDE_SERIALIZATION )
+            TARGET_LINK_LIBRARIES(${NONBOND_TEST} ${SHARED_TARGET})
+        ENDIF( INCLUDE_SERIALIZATION )
+
+    ENDIF( ${TEST_ROOT} STREQUAL "TestOpenCLGBSAOBCForce2" )
     ADD_TEST(${TEST_ROOT} ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT})
 
     # Link with static library
@@ -29,27 +67,3 @@ FOREACH(TEST_PROG ${TEST_PROGS})
 
 ENDFOREACH(TEST_PROG ${TEST_PROGS})
 
-# TestOpenCLUsingParameterFile customized w/ command-line argument (input file name used in test)
-
-#ADD_EXECUTABLE(TestOpenCLUsingParameterFile TstOpenCLUsingParameterFile.cpp)
-#TARGET_LINK_LIBRARIES(TestOpenCLUsingParameterFile ${SHARED_TARGET})
-#ADD_TEST(TestOpenCLUsingParameterFile "${EXECUTABLE_OUTPUT_PATH}/TestOpenCLUsingParameterFile" "-parameterFileName" "${CMAKE_CURRENT_SOURCE_DIR}/lambdaSdObcParameters.txt")
-#ADD_TEST(TestOpenCLUsingParameterFile "${EXECUTABLE_OUTPUT_PATH}/TestOpenCLUsingParameterFile" "-parameterFileName" "${CMAKE_CURRENT_SOURCE_DIR}/bptiMdRfNoPbcParameters.txt")
-
-SET(TEST_ROOT TestOpenCLUsingParameterFile)
-SET(TEST_PROG TstOpenCLUsingParameterFile.cpp)
-SET(TEST_STATIC ${TEST_ROOT}Static)
-SET(INCLUDE_OPENCL_STATIC 1)
-#IF(INCLUDE_OPENCL_STATIC)
-#   ADD_EXECUTABLE(${TEST_STATIC} ${TEST_PROG})
-#   SET_TARGET_PROPERTIES(${TEST_STATIC}
-#                         PROPERTIES
-#                         COMPILE_FLAGS "-DOPENMM_USE_STATIC_LIBRARIES"
-#                        )
-#   TARGET_LINK_LIBRARIES(${TEST_STATIC} ${STATIC_TARGET} ${STATIC_BROOK_TARGET})
-#   ADD_TEST(${TEST_STATIC} "${EXECUTABLE_OUTPUT_PATH}/TestOpenCLUsingParameterFileStatic" "-parameterFileName" "${CMAKE_CURRENT_SOURCE_DIR}/lambdaSdObcParameters.txt")
-#   ADD_TEST(${TEST_STATIC} "${EXECUTABLE_OUTPUT_PATH}/TestOpenCLUsingParameterFileStatic" "-parameterFileName" "${CMAKE_CURRENT_SOURCE_DIR}/bptiMdRfNoPbcParameters.txt")
-#  ADD_TEST(${TEST_STATIC} "${EXECUTABLE_OUTPUT_PATH}/TestOpenCLUsingParameterFileStatic" "-parameterFileName" "${CMAKE_CURRENT_SOURCE_DIR}/bptiMdRfPbcParameters.txt" " +checkEnergyForceConsistent -checkForces" )
-#ENDIF(INCLUDE_OPENCL_STATIC)
-
-