diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 74692eb749..23f1509ca1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,4 +40,3 @@ repos: files: \.(c|cc|cxx|cpp|h|hpp|hxx)$ entry: clang-format -i args: [--style=file] - additional_dependencies: [clang-format] diff --git a/INSTALL.md b/INSTALL.md index 42b473da4e..a2f288f66d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -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 8752fb97fc68d1982c48283aba4b03c744389ba8 . If usable BTAS installation is not found, TiledArray will download and compile +- [BTAS](http://github.com/ValeevGroup/BTAS), tag bbb11894802d7e2f89182a2e7fce9aed1078f851 . 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 b22ee85059e6ccc9a6e803ba0550652ece8d9df1 . Only the MADworld runtime and BLAS/LAPACK C API component of MADNESS is used by TiledArray. diff --git a/external/versions.cmake b/external/versions.cmake index 8ad6d8eb6b..cb0d892014 100644 --- a/external/versions.cmake +++ b/external/versions.cmake @@ -22,8 +22,8 @@ set(TA_TRACKED_MADNESS_PREVIOUS_TAG 925552feaf326cca8e83de7bd042074ad3cfd3f1) set(TA_TRACKED_MADNESS_VERSION 0.10.1) set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1) -set(TA_TRACKED_BTAS_TAG 8752fb97fc68d1982c48283aba4b03c744389ba8) -set(TA_TRACKED_BTAS_PREVIOUS_TAG 1ee43ef413c12166e3ce3db2ac69160c7622f497) +set(TA_TRACKED_BTAS_TAG bbb11894802d7e2f89182a2e7fce9aed1078f851) +set(TA_TRACKED_BTAS_PREVIOUS_TAG 8752fb97fc68d1982c48283aba4b03c744389ba8) set(TA_TRACKED_CUTT_TAG 0e8685bf82910bc7435835f846e88f1b39f47f09) set(TA_TRACKED_CUTT_PREVIOUS_TAG 592198b93c93b7ca79e7900b9a9f2e79f9dafec3) diff --git a/src/TiledArray/external/btas.h b/src/TiledArray/external/btas.h index 8f1b99c9e9..294298d50d 100644 --- a/src/TiledArray/external/btas.h +++ b/src/TiledArray/external/btas.h @@ -851,91 +851,4 @@ struct Cast, }; } // namespace TiledArray -namespace madness { -namespace archive { - -template -struct ArchiveLoadImpl> { - static inline void load(const Archive& ar, btas::varray& x) { - typename btas::varray::size_type n{}; - ar& n; - x.resize(n); - for (typename btas::varray::value_type& xi : x) ar& xi; - } -}; - -template -struct ArchiveStoreImpl> { - static inline void store(const Archive& ar, const btas::varray& x) { - ar& x.size(); - for (const typename btas::varray::value_type& xi : x) ar& xi; - } -}; - -template -struct ArchiveLoadImpl> { - static inline void load(const Archive& ar, - btas::BoxOrdinal<_Order, _Index>& o) { - typename btas::BoxOrdinal<_Order, _Index>::stride_type stride{}; - typename btas::BoxOrdinal<_Order, _Index>::value_type offset{}; - bool cont{}; - ar& stride& offset& cont; - o = btas::BoxOrdinal<_Order, _Index>(std::move(stride), std::move(offset), - std::move(cont)); - } -}; - -template -struct ArchiveStoreImpl> { - static inline void store(const Archive& ar, - const btas::BoxOrdinal<_Order, _Index>& o) { - ar& o.stride() & o.offset() & o.contiguous(); - } -}; - -template -struct ArchiveLoadImpl> { - static inline void load(const Archive& ar, - btas::RangeNd<_Order, _Index, _Ordinal>& r) { - typedef typename btas::BaseRangeNd< - btas::RangeNd<_Order, _Index, _Ordinal>>::index_type index_type; - index_type lobound{}, upbound{}; - _Ordinal ordinal{}; - ar& lobound& upbound& ordinal; - r = btas::RangeNd<_Order, _Index, _Ordinal>( - std::move(lobound), std::move(upbound), std::move(ordinal)); - } -}; - -template -struct ArchiveStoreImpl> { - static inline void store(const Archive& ar, - const btas::RangeNd<_Order, _Index, _Ordinal>& r) { - ar& r.lobound() & r.upbound() & r.ordinal(); - } -}; - -template -struct ArchiveLoadImpl> { - static inline void load(const Archive& ar, - btas::Tensor<_T, _Range, _Store>& t) { - _Range range{}; - _Store store{}; - ar& range& store; - t = btas::Tensor<_T, _Range, _Store>(std::move(range), std::move(store)); - } -}; - -template -struct ArchiveStoreImpl> { - static inline void store(const Archive& ar, - const btas::Tensor<_T, _Range, _Store>& t) { - ar& t.range() & t.storage(); - } -}; -} // namespace archive -} // namespace madness - #endif /* TILEDARRAY_EXTERNAL_BTAS_H__INCLUDED */ diff --git a/src/TiledArray/util/vector.h b/src/TiledArray/util/vector.h index 5d578ceb82..e98688b20f 100644 --- a/src/TiledArray/util/vector.h +++ b/src/TiledArray/util/vector.h @@ -26,9 +26,9 @@ #ifndef TILEDARRAY_UTIL_VECTOR_H #define TILEDARRAY_UTIL_VECTOR_H -#include "TiledArray/config.h" #include #include +#include "TiledArray/config.h" #include #include @@ -84,32 +84,6 @@ constexpr auto iv(Int i0, Ints... rest) { } // namespace container } // namespace TiledArray -namespace madness { -namespace archive { - -template -struct ArchiveLoadImpl> { - static inline void load(const Archive& ar, - boost::container::small_vector& x) { - std::size_t n{}; - ar& n; - x.resize(n); - for (auto& xi : x) ar& xi; - } -}; - -template -struct ArchiveStoreImpl> { - static inline void store(const Archive& ar, - const boost::container::small_vector& x) { - ar& x.size(); - for (const auto& xi : x) ar& xi; - } -}; - -} // namespace archive -} // namespace madness - namespace TiledArray { /// Vector output stream operator