setExecutionSpace thread safety(#230)

Co-authored-by: Neela Kausik <[email protected]>
LLNL · Jul 17, 2023 · 7e5350d · 7e5350d
1 parent fa2fbc1
commit 7e5350d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/chai/ArrayManager.cpp b/src/chai/ArrayManager.cpp
@@ -16,6 +16,8 @@
 
 namespace chai
 {
+thread_local ExecutionSpace ArrayManager::m_current_execution_space;
+thread_local bool ArrayManager::m_synced_since_last_kernel = false;
 
 PointerRecord ArrayManager::s_null_record = PointerRecord();
 

diff --git a/src/chai/ArrayManager.hpp b/src/chai/ArrayManager.hpp
@@ -489,7 +489,7 @@ class ArrayManager
   /*!
    * Current execution space.
    */
-  ExecutionSpace m_current_execution_space;
+  static thread_local ExecutionSpace m_current_execution_space;
 
   /**
    * Default space for new allocations.
@@ -536,7 +536,7 @@ class ArrayManager
    * Whether or not a synchronize has been performed since the launch of the last
    * GPU context
    */
-  bool m_synced_since_last_kernel = false;
+  static thread_local bool m_synced_since_last_kernel;
 
 #if defined(CHAI_ENABLE_GPU_SIMULATION_MODE)
   /*!