Merge pull request #190 from LLNL/task/update-umpire-raja

Update Umpire, RAJA, and BLT
LLNL · Aug 19, 2021 · 13dae2e · 13dae2e
2 parents 46aae8f + 7092f2a
commit 13dae2e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 24 deletions.
diff --git a/.gitlab/quartz-jobs.yml b/.gitlab/quartz-jobs.yml
@@ -19,27 +19,16 @@ gcc_8_1_0:
     SPEC: "%[email protected]"
   extends: .build_and_test_on_quartz
 
-icpc_17_0_2:
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz
-
-icpc_18_0_2:
-  variables:
-    SPEC: " tests=none %[email protected]"
-  extends: .build_and_test_on_quartz
+# icpc_18_0_2:
+#   variables:
+#     SPEC: " tests=none %[email protected]"
+#   extends: .build_and_test_on_quartz
 
 icpc_19_1_0:
   variables:
     SPEC: "%[email protected]"
   extends: .build_and_test_on_quartz
 
-pgi_20_1:
-  variables:
-    SPEC: " %[email protected]"
-    PGI_LOCALRC: /collab/usr/global/tools/pgi/etc/localrc-gcc-4.9.3
-  extends: .build_and_test_on_quartz
-
 # EXTRAS
 
 gcc_4_9_3:

diff --git a/blt b/blt
diff --git a/examples/chai-umpire-allocators.cpp b/examples/chai-umpire-allocators.cpp
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //////////////////////////////////////////////////////////////////////////////
 #include "umpire/ResourceManager.hpp"
-#include "umpire/strategy/DynamicPool.hpp"
+#include "umpire/strategy/QuickPool.hpp"
 
 #include "chai/ManagedArray.hpp"
 #include "../src/util/forall.hpp"
@@ -18,12 +18,12 @@ int main(int CHAI_UNUSED_ARG(argc), char** CHAI_UNUSED_ARG(argv))
   auto& rm = umpire::ResourceManager::getInstance();
 
   auto cpu_pool =
-      rm.makeAllocator<umpire::strategy::DynamicPool>("cpu_pool",
+      rm.makeAllocator<umpire::strategy::QuickPool>("cpu_pool",
                                                       rm.getAllocator("HOST"));
 
 #if defined(CHAI_ENABLE_CUDA) || defined(CHAI_ENABLE_HIP)
   auto gpu_pool =
-      rm.makeAllocator<umpire::strategy::DynamicPool>("gpu_pool",
+      rm.makeAllocator<umpire::strategy::QuickPool>("gpu_pool",
                                                       rm.getAllocator("DEVICE"));
 #endif
 

diff --git a/src/chai/ManagedArrayView.hpp b/src/chai/ManagedArrayView.hpp
@@ -23,10 +23,10 @@ using ManagedArrayView =
 
 
 template <typename ValueType, typename LayoutType, typename... IndexTypes>
-using TypedManagedArrayView = RAJA::TypedViewBase<ValueType,
+using TypedManagedArrayView = RAJA::internal::TypedViewBase<ValueType,
                                             chai::ManagedArray<ValueType>,
                                             LayoutType,
-                                            IndexTypes...>;
+                                            camp::list<IndexTypes...> >;
 
 template <typename ValueType, typename LayoutType, RAJA::Index_type P2Pidx = 0>
 using ManagedArrayMultiView =

diff --git a/src/tpl/raja b/src/tpl/raja
diff --git a/src/tpl/umpire b/src/tpl/umpire
diff --git a/tests/integration/raja-chai-tests.cpp b/tests/integration/raja-chai-tests.cpp
@@ -94,7 +94,7 @@ CUDA_TEST(ChaiTest, Views)
     v2(i) *= 2.0f;
   });
 
-  float* raw_v2 = v2.data.data();
+  float* raw_v2 = v2_array.data();
   for (int i = 0; i < 10; i++) {
     ASSERT_FLOAT_EQ(raw_v2[i], i * 1.0f * 2.0f * 2.0f);
     ;
+6 −21		.gitlab-ci.yml
+9 −7		.gitlab/build_lassen.yml
+13 −11		.gitlab/build_quartz.yml
+14 −2		RELEASE-NOTES.md
+1 −1		SetupBLT.cmake
+2 −2		cmake/BLTMacros.cmake
+7 −1		cmake/BLTOptions.cmake
+2 −1		cmake/SetupCodeChecks.cmake
+1 −1		cmake/SetupCompilerOptions.cmake
+93 −8		cmake/thirdparty/SetupHIP.cmake
+7 −1		cmake/thirdparty/SetupMPI.cmake
+1 −1		docs/_static/style.css
+9 −8		docs/tutorial/third_party_libraries.rst
+55 −0		host-configs/llnl/toss_4_x86_64_ib_cray/[email protected]_clang_hip.cmake