From da59fdaadc77c5113c0cead6eda6a3496db97d51 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Fri, 14 May 2021 08:10:30 -0400 Subject: [PATCH 1/2] dox fixup --- src/TiledArray/conversions/btas.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TiledArray/conversions/btas.h b/src/TiledArray/conversions/btas.h index e093ad7289..329c0b292b 100644 --- a/src/TiledArray/conversions/btas.h +++ b/src/TiledArray/conversions/btas.h @@ -74,7 +74,7 @@ inline void btas_subtensor_to_tensor( } // clang-format off -/// Copy a block of a btas::Tensor into a TiledArray::Tensor +/// Copy a TiledArray::Tensor into a block of a btas::Tensor /// TiledArray::Tensor \c src will be copied into a block of btas::Tensor /// \c dst. The block dimensions will be determined by the dimensions of the range From 89bbe4bdf47629d10b02c75820176ae619c89196 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Fri, 14 May 2021 08:11:25 -0400 Subject: [PATCH 2/2] TA::detail::make_ta_range moved to the header which defines the argument range --- src/TiledArray/external/btas.h | 6 ------ src/TiledArray/range.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/TiledArray/external/btas.h b/src/TiledArray/external/btas.h index 294298d50d..7503f9d911 100644 --- a/src/TiledArray/external/btas.h +++ b/src/TiledArray/external/btas.h @@ -53,12 +53,6 @@ struct range_traits { namespace TiledArray { namespace detail { -// these convert any range into TiledArray::Range - -inline const TiledArray::Range& make_ta_range(const TiledArray::Range& range) { - return range; -} - /// makes TiledArray::Range from a btas::RangeNd /// \param[in] range a btas::RangeNd object diff --git a/src/TiledArray/range.h b/src/TiledArray/range.h index eb8ac5cd53..3f4e809d37 100644 --- a/src/TiledArray/range.h +++ b/src/TiledArray/range.h @@ -1311,5 +1311,16 @@ inline bool is_congruent(const Range& r1, const Range& r2) { /// \return true since TiledArray::Range is contiguous by definition inline bool is_contiguous(const Range& range) { return true; } +namespace detail { + +// TiledArray::detail::make_ta_range(rng) converts to its TA equivalent + +/// "converts" TiledArray::Range into TiledArray::Range +inline const TiledArray::Range& make_ta_range(const TiledArray::Range& range) { + return range; +} + +} // namespace detail + } // namespace TiledArray #endif // TILEDARRAY_RANGE_H__INCLUDED