Merge pull request #158 from LLNL/task/update-umpire-v4.1.2

davidbeckingsale · web-flow · commit 075575778cd0 · 2020-10-07T10:27:23.000-07:00
Update Umpire to 4.1.2 and fix bug in deepCopyRecord
diff --git a/src/chai/ArrayManager.cpp b/src/chai/ArrayManager.cpp
@@ -445,8 +445,11 @@ PointerRecord* ArrayManager::deepCopyRecord(PointerRecord const* record)
   copy->m_user_callback = [] (const PointerRecord*, Action, ExecutionSpace) {};
 
   const ExecutionSpace last_space = record->m_last_space;
-
   copy->m_last_space = last_space;
+  for (int space = CPU; space < NUM_EXECUTION_SPACES; ++space) {
+    copy->m_allocators[space] = record->m_allocators[space];
+  }
+
   allocate(copy, last_space);
 
   for (int space = CPU; space < NUM_EXECUTION_SPACES; ++space) {
diff --git a/src/tpl/umpire b/src/tpl/umpire
@@ -1 +1 @@
-Subproject commit bdd598512516bdc4238502f180c8a7e145c6e68f
+Subproject commit 447f4640eff7b8f39d3c59404f3b03629b90c021
