From 7a518dac75c9d85849f5faea065627e853d88b00 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Mon, 27 Sep 2021 08:59:28 -0400 Subject: [PATCH 1/2] bump umpire to v6.0.0 --- INSTALL.md | 2 +- external/versions.cmake | 4 ++-- src/TiledArray/external/cuda.h | 4 ++-- src/TiledArray/external/umpire.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 0de83b3761..e63ecc2bc1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -65,7 +65,7 @@ Compiling BTAS requires the following prerequisites: Optional prerequisites: - [CUDA compiler and runtime](https://developer.nvidia.com/cuda-zone) -- for execution on CUDA-enabled accelerators. CUDA 11 or later is required. Support for CUDA also requires the following additional prerequisites, both of which will be built and installed automatically if missing: - [cuTT](github.com/ValeevGroup/cutt) -- CUDA transpose library; note that our fork of the [original cuTT repo](github.com/ap-hynninen/cutt) is required to provide thread-safety (tag 0e8685bf82910bc7435835f846e88f1b39f47f09). - - [Umpire](github.com/LLNL/Umpire) -- portable memory manager for heterogeneous platforms (tag 5201a47a35e3844160dcbecd0916f8c96aa7dd07). + - [Umpire](github.com/LLNL/Umpire) -- portable memory manager for heterogeneous platforms (tag v6.0.0). - [Doxygen](http://www.doxygen.nl/) -- for building documentation (version 1.8.12 or later). - [ScaLAPACK](http://www.netlib.org/scalapack/) -- a distributed-memory linear algebra package. If detected, the following C++ components will also be sought and downloaded, if missing: - [blacspp](https://github.com/wavefunction91/blacspp.git) -- a modern C++ (C++17) wrapper for BLACS (tag 88076f1706be083ead882f6ce0bfc6884a72fc03) diff --git a/external/versions.cmake b/external/versions.cmake index 3d3b478e5e..ac8430d2cf 100644 --- a/external/versions.cmake +++ b/external/versions.cmake @@ -30,8 +30,8 @@ set(TA_TRACKED_BTAS_PREVIOUS_TAG 0dc805fd7f2dea5e56eff94ab1c44b2b2397edd7) set(TA_TRACKED_CUTT_TAG 0e8685bf82910bc7435835f846e88f1b39f47f09) set(TA_TRACKED_CUTT_PREVIOUS_TAG 592198b93c93b7ca79e7900b9a9f2e79f9dafec3) -set(TA_TRACKED_UMPIRE_TAG 5201a47a35e3844160dcbecd0916f8c96aa7dd07) -set(TA_TRACKED_UMPIRE_PREVIOUS_TAG f04abd1dd038c84262915a493d8f78576bb80fd0) +set(TA_TRACKED_UMPIRE_TAG v6.0.0) +set(TA_TRACKED_UMPIRE_PREVIOUS_TAG 5201a47a35e3844160dcbecd0916f8c96aa7dd07) #set(TA_TRACKED_BLACSPP_TAG 20cfd414c5b719be1c958f4a2d57abef06df83b6 ) #set(TA_TRACKED_BLACSPP_PREVIOUS_TAG da4ada57e578cf944325a7152164306742551596 ) diff --git a/src/TiledArray/external/cuda.h b/src/TiledArray/external/cuda.h index 78a210f784..a47363098f 100644 --- a/src/TiledArray/external/cuda.h +++ b/src/TiledArray/external/cuda.h @@ -384,9 +384,9 @@ class cudaEnv { // the world used to initialize this World* world_; - /// a Thread Safe, Dynamic memory pool for CUDA Unified Memory + /// a thread-safe dynamically-sized memory pool for CUDA Unified Memory umpire::Allocator um_dynamic_pool_; - /// a Thread Safe, Size-Limited Dynamic memory pool for CUDA Memory + /// a thread-safe size-limited dynamically-sized memory pool for CUDA Memory umpire::Allocator device_dynamic_pool_; int num_cuda_devices_; diff --git a/src/TiledArray/external/umpire.h b/src/TiledArray/external/umpire.h index a55a34b615..2aefa3c6d4 100644 --- a/src/TiledArray/external/umpire.h +++ b/src/TiledArray/external/umpire.h @@ -30,7 +30,7 @@ // for memory management #include -#include +#include #include #include From fef29f747f4972d8866529d3809839e20067132e Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Mon, 27 Sep 2021 09:04:20 -0400 Subject: [PATCH 2/2] bump umpire to most recent master to include misc fixes needed for libstdc++ --- INSTALL.md | 2 +- external/versions.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index e63ecc2bc1..cba4621855 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -65,7 +65,7 @@ Compiling BTAS requires the following prerequisites: Optional prerequisites: - [CUDA compiler and runtime](https://developer.nvidia.com/cuda-zone) -- for execution on CUDA-enabled accelerators. CUDA 11 or later is required. Support for CUDA also requires the following additional prerequisites, both of which will be built and installed automatically if missing: - [cuTT](github.com/ValeevGroup/cutt) -- CUDA transpose library; note that our fork of the [original cuTT repo](github.com/ap-hynninen/cutt) is required to provide thread-safety (tag 0e8685bf82910bc7435835f846e88f1b39f47f09). - - [Umpire](github.com/LLNL/Umpire) -- portable memory manager for heterogeneous platforms (tag v6.0.0). + - [Umpire](github.com/LLNL/Umpire) -- portable memory manager for heterogeneous platforms (tag f9640e0fa4245691cdd434e4f719ac5f7d455f82). - [Doxygen](http://www.doxygen.nl/) -- for building documentation (version 1.8.12 or later). - [ScaLAPACK](http://www.netlib.org/scalapack/) -- a distributed-memory linear algebra package. If detected, the following C++ components will also be sought and downloaded, if missing: - [blacspp](https://github.com/wavefunction91/blacspp.git) -- a modern C++ (C++17) wrapper for BLACS (tag 88076f1706be083ead882f6ce0bfc6884a72fc03) diff --git a/external/versions.cmake b/external/versions.cmake index ac8430d2cf..6689b0a2b1 100644 --- a/external/versions.cmake +++ b/external/versions.cmake @@ -30,8 +30,8 @@ set(TA_TRACKED_BTAS_PREVIOUS_TAG 0dc805fd7f2dea5e56eff94ab1c44b2b2397edd7) set(TA_TRACKED_CUTT_TAG 0e8685bf82910bc7435835f846e88f1b39f47f09) set(TA_TRACKED_CUTT_PREVIOUS_TAG 592198b93c93b7ca79e7900b9a9f2e79f9dafec3) -set(TA_TRACKED_UMPIRE_TAG v6.0.0) -set(TA_TRACKED_UMPIRE_PREVIOUS_TAG 5201a47a35e3844160dcbecd0916f8c96aa7dd07) +set(TA_TRACKED_UMPIRE_TAG f9640e0fa4245691cdd434e4f719ac5f7d455f82) +set(TA_TRACKED_UMPIRE_PREVIOUS_TAG v6.0.0) #set(TA_TRACKED_BLACSPP_TAG 20cfd414c5b719be1c958f4a2d57abef06df83b6 ) #set(TA_TRACKED_BLACSPP_PREVIOUS_TAG da4ada57e578cf944325a7152164306742551596 )