Merge pull request #1790 from LLNL/bugfix/burmark1/InitLocalMem

Use dynamically allocated buffer instead of dynamically sized local array in kernel InitLocalMem
LLNL · Feb 13, 2025 · 647b177 · 647b177
2 parents 579ff77 + 982851f
commit 647b177
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/include/RAJA/pattern/kernel/InitLocalMem.hpp b/include/RAJA/pattern/kernel/InitLocalMem.hpp
@@ -22,6 +22,7 @@
 
 #include <iostream>
 #include <type_traits>
+#include <memory>
 
 namespace RAJA
 {
@@ -83,23 +84,15 @@ struct StatementExecutor<statement::InitLocalMem<RAJA::cpu_tile_mem,
         Pos, typename camp::decay<Data>::param_tuple_t>::value_type;
 
     // Initialize memory
-#ifdef RAJA_COMPILER_MSVC
-    // MSVC doesn't like taking a pointer to stack allocated data?!?!
-    varType* ptr = new varType[camp::get<Pos>(data.param_tuple).size()];
-    camp::get<Pos>(data.param_tuple).set_data(ptr);
-#else
-    varType Array[camp::get<Pos>(data.param_tuple).size()];
-    camp::get<Pos>(data.param_tuple).set_data(&Array[0]);
-#endif
+    auto local_mem =
+        std::make_unique<varType[]>(camp::get<Pos>(data.param_tuple).size());
+    camp::get<Pos>(data.param_tuple).set_data(local_mem.get());
 
     // Initialize others and execute
     exec_expanded<others...>(data);
 
     // Cleanup and return
     camp::get<Pos>(data.param_tuple).set_data(nullptr);
-#ifdef RAJA_COMPILER_MSVC
-    delete[] ptr;
-#endif
   }
 
   template<typename Data>