Call cudaSetDevice() in all thread pool worker threads.

Possible fix for #63.
mmp · Oct 21, 2020 · 8578a3e · 8578a3e
1 parent 00bfa32
commit 8578a3e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/pbrt/gpu/init.cpp b/src/pbrt/gpu/init.cpp
@@ -86,4 +86,10 @@ void GPUInit() {
     CUDA_CHECK(cudaDeviceSetCacheConfig(cudaFuncCachePreferL1));
 }
 
+void GPUThreadInit() {
+    int device = Options->gpuDevice ? *Options->gpuDevice : 0;
+    LOG_VERBOSE("Selecting GPU device %d", device);
+    CUDA_CHECK(cudaSetDevice(device));
+}
+
 }  // namespace pbrt
diff --git a/src/pbrt/gpu/init.h b/src/pbrt/gpu/init.h
@@ -8,6 +8,7 @@
 namespace pbrt {
 
 void GPUInit();
+void GPUThreadInit();
 
 }  // namespace pbrt
 

diff --git a/src/pbrt/util/parallel.cpp b/src/pbrt/util/parallel.cpp
@@ -6,6 +6,9 @@
 
 #include <pbrt/util/check.h>
 #include <pbrt/util/print.h>
+#ifdef PBRT_BUILD_GPU_RENDERER
+#include <pbrt/gpu/init.h>
+#endif  // PBRT_BUILD_GPU_RENDERER
 
 #include <iterator>
 #include <list>
@@ -110,6 +113,10 @@ void ThreadPool::workerFunc(int tIndex) {
     LOG_VERBOSE("Started execution in worker thread %d", tIndex);
     ThreadIndex = tIndex;
 
+#ifdef PBRT_BUILD_GPU_RENDERER
+    GPUThreadInit();
+#endif  // PBRT_BUILD_GPU_RENDERER
+
     std::unique_lock<std::mutex> lock(mutex);
     while (!shutdownThreads)
         WorkOrWait(&lock);