Merge branch 'task/kab163/resource-aware-pool' of https://github.com/…

…LLNL/Umpire into task/kab163/resource-aware-pool
LLNL · Oct 3, 2024 · 30c90da · 30c90da
2 parents edf478a + 380d29e
commit 30c90da
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/examples/rap_example.cpp b/examples/rap_example.cpp
@@ -37,12 +37,17 @@ constexpr int BLOCK_SIZE = 16;
 using clock_value_t = long long;
 
 #if defined(UMPIRE_ENABLE_CUDA)
-  __device__ clock_value_t my_clock() {return clock64();}
+__device__ clock_value_t my_clock()
+{
+  return clock64();
+}
 #elif defined(UMPIRE_ENABLE_HIP)
-  __device__ clock_value_t my_clock() {return hipGetClock();}
+__device__ clock_value_t my_clock()
+{
+  return hipGetClock();
+}
 #endif
 
-
 __device__ void sleep(clock_value_t sleep_cycles)
 {
   clock_value_t start = my_clock();

diff --git a/tests/unit/resource/shared_memory_resource_tests.cpp b/tests/unit/resource/shared_memory_resource_tests.cpp
@@ -176,8 +176,8 @@ TEST_F(SharedMemoryTest, UnitTests)
   {
     if (m_rank == 0) {
       for (int loop{0}; loop < 100; loop++) {
-        ASSERT_NO_THROW(
-            allocator.deallocate(allocator.allocate(std::string("AllocLargest"), shmem_state->largest_allocation_size)););
+        ASSERT_NO_THROW(allocator.deallocate(
+            allocator.allocate(std::string("AllocLargest"), shmem_state->largest_allocation_size)););
       }
     }
   }