diff --git a/Intro_Tutorial/lessons/01_blt_cmake/one.cpp b/Intro_Tutorial/lessons/01_blt_cmake/01_blt_cmake similarity index 100% rename from Intro_Tutorial/lessons/01_blt_cmake/one.cpp rename to Intro_Tutorial/lessons/01_blt_cmake/01_blt_cmake diff --git a/Intro_Tutorial/lessons/01_blt_cmake/CMakeLists.txt b/Intro_Tutorial/lessons/01_blt_cmake/CMakeLists.txt index 7a2b8eb..d69fb9a 100644 --- a/Intro_Tutorial/lessons/01_blt_cmake/CMakeLists.txt +++ b/Intro_Tutorial/lessons/01_blt_cmake/CMakeLists.txt @@ -1,3 +1,3 @@ blt_add_executable( - NAME one - SOURCES one.cpp) \ No newline at end of file + NAME 01_blt_cmake + SOURCES 01_blt_cmake.cpp) \ No newline at end of file diff --git a/Intro_Tutorial/lessons/02_raja_umpire/two.cpp b/Intro_Tutorial/lessons/02_raja_umpire/02_raja_umpire similarity index 100% rename from Intro_Tutorial/lessons/02_raja_umpire/two.cpp rename to Intro_Tutorial/lessons/02_raja_umpire/02_raja_umpire diff --git a/Intro_Tutorial/lessons/03_umpire_allocator/three.cpp b/Intro_Tutorial/lessons/03_umpire_allocator/03_umpire_allocator similarity index 100% rename from Intro_Tutorial/lessons/03_umpire_allocator/three.cpp rename to Intro_Tutorial/lessons/03_umpire_allocator/03_umpire_allocator diff --git a/Intro_Tutorial/lessons/03_umpire_allocator/solution/three_solution.cpp b/Intro_Tutorial/lessons/03_umpire_allocator/solution/03_umpire_allocator_solution.cpp similarity index 100% rename from Intro_Tutorial/lessons/03_umpire_allocator/solution/three_solution.cpp rename to Intro_Tutorial/lessons/03_umpire_allocator/solution/03_umpire_allocator_solution.cpp diff --git a/Intro_Tutorial/lessons/04_raja_forall/four.cpp b/Intro_Tutorial/lessons/04_raja_forall/04_raja_forall.cpp similarity index 100% rename from Intro_Tutorial/lessons/04_raja_forall/four.cpp rename to Intro_Tutorial/lessons/04_raja_forall/04_raja_forall.cpp diff --git a/Intro_Tutorial/lessons/04_raja_forall/CMakeLists.txt b/Intro_Tutorial/lessons/04_raja_forall/CMakeLists.txt index 8516df7..c5fbe91 100644 --- a/Intro_Tutorial/lessons/04_raja_forall/CMakeLists.txt +++ b/Intro_Tutorial/lessons/04_raja_forall/CMakeLists.txt @@ -1,4 +1,4 @@ blt_add_executable( - NAME four - SOURCES four.cpp + NAME 04_raja_forall + SOURCES 04_raja_forall.cpp DEPENDS_ON RAJA umpire cuda) diff --git a/Intro_Tutorial/lessons/04_raja_forall/solution/four_solution.cpp b/Intro_Tutorial/lessons/04_raja_forall/solution/04_raja_forall_solution.cpp similarity index 100% rename from Intro_Tutorial/lessons/04_raja_forall/solution/four_solution.cpp rename to Intro_Tutorial/lessons/04_raja_forall/solution/04_raja_forall_solution.cpp diff --git a/Intro_Tutorial/lessons/05_raja_reduce/five.cpp b/Intro_Tutorial/lessons/05_raja_reduce/05_raja_reduce.cpp similarity index 100% rename from Intro_Tutorial/lessons/05_raja_reduce/five.cpp rename to Intro_Tutorial/lessons/05_raja_reduce/05_raja_reduce.cpp diff --git a/Intro_Tutorial/lessons/05_raja_reduce/CMakeLists.txt b/Intro_Tutorial/lessons/05_raja_reduce/CMakeLists.txt index e6425ba..a6e6260 100644 --- a/Intro_Tutorial/lessons/05_raja_reduce/CMakeLists.txt +++ b/Intro_Tutorial/lessons/05_raja_reduce/CMakeLists.txt @@ -1,4 +1,4 @@ blt_add_executable( - NAME five - SOURCES five.cpp + NAME 05_raja_reduce + SOURCES 05_raja_reduce.cpp DEPENDS_ON RAJA umpire) diff --git a/Intro_Tutorial/lessons/05_raja_reduce/solution/five_solution.cpp b/Intro_Tutorial/lessons/05_raja_reduce/solution/05_raja_reduce_solution.cpp similarity index 100% rename from Intro_Tutorial/lessons/05_raja_reduce/solution/five_solution.cpp rename to Intro_Tutorial/lessons/05_raja_reduce/solution/05_raja_reduce_solution.cpp diff --git a/Intro_Tutorial/lessons/06_raja_umpire_uvm/six.cpp b/Intro_Tutorial/lessons/06_raja_umpire_uvm/06_raja_umpire_uvm.cpp similarity index 100% rename from Intro_Tutorial/lessons/06_raja_umpire_uvm/six.cpp rename to Intro_Tutorial/lessons/06_raja_umpire_uvm/06_raja_umpire_uvm.cpp diff --git a/Intro_Tutorial/lessons/06_raja_umpire_uvm/CMakeLists.txt b/Intro_Tutorial/lessons/06_raja_umpire_uvm/CMakeLists.txt index 3d5a782..a59a4a0 100644 --- a/Intro_Tutorial/lessons/06_raja_umpire_uvm/CMakeLists.txt +++ b/Intro_Tutorial/lessons/06_raja_umpire_uvm/CMakeLists.txt @@ -1,7 +1,7 @@ if (ENABLE_CUDA) blt_add_executable( - NAME six - SOURCES six.cpp + NAME 06_raja_umpire_uvm + SOURCES 06_raja_umpire_uvm.cpp DEPENDS_ON RAJA umpire cuda) endif() diff --git a/Intro_Tutorial/lessons/06_raja_umpire_uvm/solution/six_solution.cpp b/Intro_Tutorial/lessons/06_raja_umpire_uvm/solution/06_raja_umpire_uvm_solution.cpp similarity index 100% rename from Intro_Tutorial/lessons/06_raja_umpire_uvm/solution/six_solution.cpp rename to Intro_Tutorial/lessons/06_raja_umpire_uvm/solution/06_raja_umpire_uvm_solution.cpp diff --git a/Intro_Tutorial/lessons/08_raja_umpire_quick_pool/eight.cpp b/Intro_Tutorial/lessons/08_raja_umpire_quick_pool/eight.cpp index 8e05c41..1f11a32 100644 --- a/Intro_Tutorial/lessons/08_raja_umpire_quick_pool/eight.cpp +++ b/Intro_Tutorial/lessons/08_raja_umpire_quick_pool/eight.cpp @@ -2,15 +2,11 @@ #include "RAJA/RAJA.hpp" #include "umpire/Umpire.hpp" - -//Uncomment to compile -//#define COMPILE +#include "umpire/strategy/QuickPool.hpp" int main() { -#if defined(COMPILE) - - constexpr int N{1000}; + constexpr int N{10000}; constexpr std::size_t CUDA_BLOCK_SIZE{256}; double* a{nullptr}; double* b{nullptr}; @@ -23,6 +19,7 @@ int main() auto host_allocator = rm.getAllocator("HOST"); // TODO: create an allocator called "pool" using the QuickPool strategy + auto pool = rm.makeAllocator("POOL", allocator); a = static_cast(pool.allocate(N*sizeof(double))); b = static_cast(pool.allocate(N*sizeof(double))); @@ -55,7 +52,5 @@ int main() host_allocator.deallocate(a_h); host_allocator.deallocate(b_h); -#endif - return 0; }