Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Evaleev/fix/umpire allocators lifetime #372

Merged
merged 5 commits into from
Oct 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Both methods are supported. However, for most users we _strongly_ recommend to b
- Boost.Container: header-only
- Boost.Test: header-only or (optionally) as a compiled library, *only used for unit testing*
- Boost.Range: header-only, *only used for unit testing*
- [BTAS](http://github.com/ValeevGroup/BTAS), tag f7c9385348ea87202a887504e2be8bc477efdc3f . If usable BTAS installation is not found, TiledArray will download and compile
- [BTAS](http://github.com/ValeevGroup/BTAS), tag fba66ad9881ab29ea8df49ac6a6006cab3fb3ce5 . If usable BTAS installation is not found, TiledArray will download and compile
BTAS from source. *This is the recommended way to compile BTAS for all users*.
- [MADNESS](https://github.com/m-a-d-n-e-s-s/madness), tag 66b199a08bf5f33b1565811fc202a051ec1b0fbb .
Only the MADworld runtime and BLAS/LAPACK C API component of MADNESS is used by TiledArray.
Expand Down
4 changes: 2 additions & 2 deletions external/versions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ set(TA_TRACKED_MADNESS_PREVIOUS_TAG c0df7338779d06df7eaff31644d508940a7cfd90)
set(TA_TRACKED_MADNESS_VERSION 0.10.1)
set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)

set(TA_TRACKED_BTAS_TAG f7c9385348ea87202a887504e2be8bc477efdc3f)
set(TA_TRACKED_BTAS_PREVIOUS_TAG f1d9eaeaf8f88f54defec991d34c7790c6c45bb2)
set(TA_TRACKED_BTAS_TAG fba66ad9881ab29ea8df49ac6a6006cab3fb3ce5)
set(TA_TRACKED_BTAS_PREVIOUS_TAG f7c9385348ea87202a887504e2be8bc477efdc3f)

set(TA_TRACKED_LIBRETT_TAG 68abe31a9ec6fd2fd9ffbcd874daa80457f947da)
set(TA_TRACKED_LIBRETT_PREVIOUS_TAG 7e27ac766a9038df6aa05613784a54a036c4b796)
Expand Down
4 changes: 2 additions & 2 deletions src/TiledArray/tiledarray.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ void TiledArray::finalize() {

// reset number of threads
TiledArray::set_num_threads(TiledArray::max_threads);
TiledArray::get_default_world().gop.fence(); // this should ensure no pending
// tasks using cuda allocators
#ifdef TILEDARRAY_HAS_CUDA
TiledArray::cuda_finalize();
#endif
TiledArray::get_default_world()
.gop.fence(); // TODO remove when madness::finalize() fences
if (initialized_madworld()) {
madness::finalize();
}
Expand Down
4 changes: 2 additions & 2 deletions tests/ta_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ GlobalFixture::GlobalFixture() {
}

// uncomment to create or create+launch debugger
// TiledArray::create_debugger("gdb_xterm", "ta_test);
// TiledArray::create_debugger("lldb_xterm", "ta_test);
// TiledArray::create_debugger("gdb_xterm", "ta_test");
// TiledArray::create_debugger("lldb_xterm", "ta_test");
// TiledArray::launch_gdb_xterm("ta_test");
// TiledArray::launch_lldb_xterm("ta_test");
}
Expand Down