Avoid setting the device multiple times

351f6455 · Peter Eastman · bb2c5f84 · 351f6455
Commit 351f6455 authored Jul 17, 2009 by Peter Eastman
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

platforms/cuda/src/kernels/gpu.cpp platforms/cuda/src/kernels/gpu.cpp +6 -2

No files found.
--- a/platforms/cuda/src/kernels/gpu.cpp
+++ b/platforms/cuda/src/kernels/gpu.cpp
@@ -1125,8 +1125,12 @@ void* gpuInit(int numAtoms, unsigned int device)
    int SMMinor = 0;

    // Select which device to use
-    cudaSetDevice(device); // Ignore errors
-    cudaError_t status = cudaGetDevice(&gpu->device);
+    int currentDevice;
+    cudaError_t status = cudaGetDevice(&currentDevice);
+    RTERROR(status, "Error getting CUDA device")
+    if (device != currentDevice)
+        cudaSetDevice(device); // Ignore errors
+    status = cudaGetDevice(&gpu->device);
    RTERROR(status, "Error getting CUDA device")

    // Determine kernel call configuration