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.

Sign up for GitHub

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

C++20 build fixes #455

Merged
merged 2 commits into from
Jun 24, 2024
Merged

C++20 build fixes #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5cbd04
bump MADNESS tag to pull in https://github.com/m-a-d-n-e-s-s/madness/…
evaleev Jun 21, 2024
e3485f4
std::shared_ptr::unique() removed in C++20
evaleev Jun 21, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Both methods are supported. However, for most users we _strongly_ recommend to b
- [Range-V3](https://github.com/ericniebler/range-v3.git) -- a Ranges library that served as the basis for Ranges component of C++20 and later.
- [BTAS](http://github.com/ValeevGroup/BTAS), tag 4e8f5233aa7881dccdfcc37ce07128833926d3c2 . 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 3d0ae2fad1b97e347ca6dd98b9f1b9e74e629f52 .
- [MADNESS](https://github.com/m-a-d-n-e-s-s/madness), tag 96ac90e8f193ccfaf16f346b4652927d2d362e75 .
Only the MADworld runtime and BLAS/LAPACK C API component of MADNESS is used by TiledArray.
If usable MADNESS installation is not found, TiledArray will download and compile
MADNESS from source. *This is the recommended way to compile MADNESS for all users*.
Expand Down
4 changes: 2 additions & 2 deletions external/versions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ set(TA_INSTALL_EIGEN_PREVIOUS_VERSION 3.3.7)
set(TA_INSTALL_EIGEN_URL_HASH SHA256=b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626)
set(TA_INSTALL_EIGEN_PREVIOUS_URL_HASH MD5=b9e98a200d2455f06db9c661c5610496)

set(TA_TRACKED_MADNESS_TAG 3d0ae2fad1b97e347ca6dd98b9f1b9e74e629f52)
set(TA_TRACKED_MADNESS_PREVIOUS_TAG 8788aea9758bfe6479cc23d39e6c77b7528009db)
set(TA_TRACKED_MADNESS_TAG 96ac90e8f193ccfaf16f346b4652927d2d362e75)
set(TA_TRACKED_MADNESS_PREVIOUS_TAG 3d0ae2fad1b97e347ca6dd98b9f1b9e74e629f52)
set(TA_TRACKED_MADNESS_VERSION 0.10.1)
set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)

Expand Down
4 changes: 2 additions & 2 deletions src/TiledArray/dist_array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ class DistArray : public madness::archive::ParallelSerializableObject {
/// Checks if this is a unique handle to the implementation object

/// \return true if this is a unique handle to the implementation object
bool is_unique() const { return pimpl_.unique(); }
bool is_unique() const { return pimpl_.use_count() == 1; }

/// Wait for lazy tile cleanup

Expand Down Expand Up @@ -1952,7 +1952,7 @@ DistArray<T, P> replicated(const DistArray<T, P>& a) {

// Put the replicator pointer in the deferred cleanup object so it will
// be deleted at the end of the next fence.
TA_ASSERT(replicator.unique()); // Required for deferred_cleanup
TA_ASSERT(replicator.use_count() == 1); // Required for deferred_cleanup
madness::detail::deferred_cleanup(world, replicator);

return result;
Expand Down
Loading