Skip to content
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 @@ -42,7 +42,7 @@ Both methods are supported. However, for most users we _strongly_ recommend to b
- Boost.Range: header-only, *only used for unit testing*
- [BTAS](http://github.com/ValeevGroup/BTAS), tag db884b020b5c13c312c07df9d5c03cea2d65afb2 . 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 fae8081179b9d074968b08e064a32e3ca07ab0f1 .
- [MADNESS](https://github.com/m-a-d-n-e-s-s/madness), tag 997e8b458c4234fb6c8c2781a5df59cb14b7e700 .
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,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 fae8081179b9d074968b08e064a32e3ca07ab0f1)
set(TA_TRACKED_MADNESS_PREVIOUS_TAG 9357dccd0cf91c0857d05ceb5f10b833fcd63308)
set(TA_TRACKED_MADNESS_TAG 997e8b458c4234fb6c8c2781a5df59cb14b7e700)
set(TA_TRACKED_MADNESS_PREVIOUS_TAG fae8081179b9d074968b08e064a32e3ca07ab0f1)
set(TA_TRACKED_MADNESS_VERSION 0.10.1)
set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)

Expand Down
2 changes: 1 addition & 1 deletion src/TiledArray/conversions/to_new_tile_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ struct cast_then_op<DstTile, SrcTile, Op,
template <typename Tile, typename ConvTile = Tile, typename Policy, typename Op>
inline decltype(auto) to_new_tile_type(DistArray<Tile, Policy> const& old_array,
Op&& op) {
using OutTileType = typename std::result_of<Op(ConvTile)>::type;
using OutTileType = std::invoke_result_t<Op, ConvTile>;

static_assert(!std::is_same<Tile, OutTileType>::value,
"Can't call new tile type if tile type does not change.");
Expand Down
16 changes: 8 additions & 8 deletions src/TiledArray/math/vector_op.h
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ struct SizeTRange {
#endif

template <typename Op, typename Result, typename... Args,
typename std::enable_if<std::is_void<typename std::result_of<
Op(Result&, Args...)>::type>::value>::type* = nullptr>
std::enable_if_t<std::is_void_v<
std::invoke_result_t<Op, Result&, Args...>>>* = nullptr>
void inplace_vector_op_serial(Op&& op, const std::size_t n,
Result* const result, const Args* const... args) {
std::size_t i = 0ul;
Expand Down Expand Up @@ -386,8 +386,8 @@ class ApplyInplaceVectorOp {
#endif

template <typename Op, typename Result, typename... Args,
typename std::enable_if<std::is_void<typename std::result_of<
Op(Result&, Args...)>::type>::value>::type* = nullptr>
std::enable_if_t<std::is_void_v<
std::invoke_result_t<Op, Result&, Args...>>>* = nullptr>
void inplace_vector_op(Op&& op, const std::size_t n, Result* const result,
const Args* const... args) {
#ifdef HAVE_INTEL_TBB
Expand All @@ -413,8 +413,8 @@ void inplace_vector_op(Op&& op, const std::size_t n, Result* const result,
}

template <typename Op, typename Result, typename... Args,
typename std::enable_if<!std::is_void<typename std::result_of<
Op(Args...)>::type>::value>::type* = nullptr>
std::enable_if_t<
!std::is_void_v<std::invoke_result_t<Op, Args...>>>* = nullptr>
void vector_op_serial(Op&& op, const std::size_t n, Result* const result,
const Args* const... args) {
auto wrapper_op = [&op](Result& res, param_type<Args>... a) {
Expand Down Expand Up @@ -467,8 +467,8 @@ class ApplyVectorOp {
#endif

template <typename Op, typename Result, typename... Args,
typename std::enable_if<!std::is_void<typename std::result_of<
Op(Args...)>::type>::value>::type* = nullptr>
std::enable_if_t<
!std::is_void_v<std::invoke_result_t<Op, Args...>>>* = nullptr>
void vector_op(Op&& op, const std::size_t n, Result* const result,
const Args* const... args) {
#ifdef HAVE_INTEL_TBB
Expand Down
4 changes: 2 additions & 2 deletions src/TiledArray/type_traits.h
Original file line number Diff line number Diff line change
Expand Up @@ -1299,8 +1299,8 @@ template <typename Enabler, typename F, typename... Args>
struct is_invocable_void_helper : std::false_type {};
template <typename F, typename... Args>
struct is_invocable_void_helper<
std::enable_if_t<std::is_void<std::result_of_t<F(Args...)>>::value, void>,
F, Args...> : std::true_type {};
std::enable_if_t<std::is_void_v<std::invoke_result_t<F, Args...>>, void>, F,
Args...> : std::true_type {};
template <typename F, typename... Args>
struct is_invocable_void : is_invocable_void_helper<void, F, Args...> {};

Expand Down