Merge pull request #1208 from rmcgibbo/cl-test-device

Control what device is used for OpenCL tests

platforms/opencl/tests/CMakeLists.txt

@@ -8,6 +8,11 @@ ENABLE_TESTING()
 INCLUDE_DIRECTORIES(${OPENCL_INCLUDE_DIR})
 
 SET(OPENMM_BUILD_OPENCL_DOUBLE_PRECISION_TESTS TRUE CACHE BOOL "Whether to build double precision versions of OpenCL test cases")
+set(OPENCL_TEST_PLATFORM_INDEX -1 CACHE STRING "OpenCL platform index used for running OpenCL test cases. The default, -1, selects the fastest platform")
+set(OPENCL_TEST_DEVICE_INDEX -1 CACHE STRING "OpenCL device index used for running OpenCL test cases. The default, -1, selects the fastest device")
+MARK_AS_ADVANCED(OPENCL_TEST_PLATFORM_INDEX)
+MARK_AS_ADVANCED(OPENCL_TEST_DEVICE_INDEX)
+
 
 SET( INCLUDE_SERIALIZATION FALSE )
 #SET( INCLUDE_SERIALIZATION TRUE )
@@ -27,10 +32,10 @@ FOREACH(TEST_PROG ${TEST_PROGS})
     TARGET_LINK_LIBRARIES(${TEST_ROOT} ${SHARED_TARGET})
     SET_TARGET_PROPERTIES(${TEST_ROOT} PROPERTIES LINK_FLAGS "${EXTRA_LINK_FLAGS}" COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS}")
 
-    ADD_TEST(${TEST_ROOT}Single ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT} single)
+    ADD_TEST(${TEST_ROOT}Single ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT} single ${OPENCL_TEST_PLATFORM_INDEX} ${OPENCL_TEST_DEVICE_INDEX})
     IF (OPENMM_BUILD_OPENCL_DOUBLE_PRECISION_TESTS)
-        ADD_TEST(${TEST_ROOT}Mixed ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT} mixed)
-        ADD_TEST(${TEST_ROOT}Double ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT} double)
+        ADD_TEST(${TEST_ROOT}Mixed ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT} mixed ${OPENCL_TEST_PLATFORM_INDEX} ${OPENCL_TEST_DEVICE_INDEX})
+        ADD_TEST(${TEST_ROOT}Double ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT} double ${OPENCL_TEST_PLATFORM_INDEX} ${OPENCL_TEST_DEVICE_INDEX})
     ENDIF(OPENMM_BUILD_OPENCL_DOUBLE_PRECISION_TESTS)
 
     # Link with static library

platforms/opencl/tests/OpenCLTests.h

@@ -40,4 +40,8 @@ OpenMM::OpenCLPlatform platform;
 void initializeTests(int argc, char* argv[]) {
     if (argc > 1)
         platform.setPropertyDefaultValue("OpenCLPrecision", std::string(argv[1]));
+    if (argc > 2)
+        platform.setPropertyDefaultValue("OpenCLPlatformIndex", std::string(argv[2]));
+    if (argc > 3)
+        platform.setPropertyDefaultValue("OpenCLDeviceIndex", std::string(argv[3]));
 }