Merge pull request #2717 from thtrummer/master

Add OpenCL platform index for tests that use two devices

platforms/opencl/tests/TestOpenCLCheckpoints.cpp

@@ -95,9 +95,12 @@ void testCheckpoint() {
     
     // Create a new Context that uses multiple devices.
 
-    string deviceIndex = platform.getPropertyValue(context, OpenCLPlatform::OpenCLDeviceIndex());
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     VerletIntegrator integrator2(0.001);
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);

platforms/opencl/tests/TestOpenCLCustomAngleForce.cpp

@@ -50,9 +50,13 @@ void testParallelComputation() {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);

platforms/opencl/tests/TestOpenCLCustomBondForce.cpp

@@ -50,9 +50,13 @@ void testParallelComputation() {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);

platforms/opencl/tests/TestOpenCLCustomCompoundBondForce.cpp

@@ -54,9 +54,13 @@ void testParallelComputation() {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);

platforms/opencl/tests/TestOpenCLCustomExternalForce.cpp

@@ -53,9 +53,13 @@ void testParallelComputation() {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);

platforms/opencl/tests/TestOpenCLCustomNonbondedForce.cpp

@@ -58,9 +58,13 @@ void testParallelComputation() {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);

platforms/opencl/tests/TestOpenCLCustomTorsionForce.cpp

@@ -50,9 +50,13 @@ void testParallelComputation() {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);

platforms/opencl/tests/TestOpenCLHarmonicAngleForce.cpp

@@ -51,9 +51,13 @@ void testParallelComputation() {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);

platforms/opencl/tests/TestOpenCLHarmonicBondForce.cpp

@@ -50,9 +50,13 @@ void testParallelComputation() {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+    
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);

platforms/opencl/tests/TestOpenCLNonbondedForce.cpp

@@ -62,9 +62,13 @@ void testParallelComputation(NonbondedForce::NonbondedMethod method) {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);

platforms/opencl/tests/TestOpenCLPeriodicTorsionForce.cpp

@@ -49,9 +49,13 @@ void testParallelComputation() {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);

platforms/opencl/tests/TestOpenCLRBTorsionForce.cpp

@@ -49,9 +49,13 @@ void testParallelComputation() {
     context1.setPositions(positions);
     State state1 = context1.getState(State::Forces | State::Energy);
     VerletIntegrator integrator2(0.01);
-    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
+
     map<string, string> props;
+    string deviceIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLDeviceIndex());
     props[OpenCLPlatform::OpenCLDeviceIndex()] = deviceIndex+","+deviceIndex;
+    string platformIndex = platform.getPropertyValue(context1, OpenCLPlatform::OpenCLPlatformIndex());
+    props[OpenCLPlatform::OpenCLPlatformIndex()] = platformIndex;
+
     Context context2(system, integrator2, platform, props);
     context2.setPositions(positions);
     State state2 = context2.getState(State::Forces | State::Energy);