Merge branch 'threaded-init' into 'master'

allow other threads to run during device init() and make_context() since those... See merge request inducer/pycuda!14
cf-natali · Jan 17, 2019 · fe27342 · fe27342
2 parents 1f517c6 + 73402db
commit fe27342
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/cpp/cuda.hpp b/src/cpp/cuda.hpp
@@ -497,7 +497,7 @@ namespace pycuda
   inline
   void init(unsigned int flags)
   {
-    CUDAPP_CALL_GUARDED(cuInit, (flags));
+    CUDAPP_CALL_GUARDED_THREADED(cuInit, (flags));
   }
 
   inline
@@ -822,7 +822,7 @@ namespace pycuda
     context::prepare_context_switch();
 
     CUcontext ctx;
-    CUDAPP_CALL_GUARDED(cuCtxCreate, (&ctx, flags, m_device));
+    CUDAPP_CALL_GUARDED_THREADED(cuCtxCreate, (&ctx, flags, m_device));
     boost::shared_ptr<context> result(new context(ctx));
     context_stack::get().push(result);
     return result;