Skip to content

Commit df1a8a6

Browse files
authored
Merge pull request #500 from ValeevGroup/evaleev/fix/einsum-prefence-entry-to-blocking-region
[hotfix] einsum: prefence entry to blocking region
2 parents 1c37b18 + d9b912e commit df1a8a6

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

INSTALL.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Both methods are supported. However, for most users we _strongly_ recommend to b
4343
- [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.
4444
- [BTAS](http://github.com/ValeevGroup/BTAS), tag 1cfcb12647c768ccd83b098c64cda723e1275e49 . If usable BTAS installation is not found, TiledArray will download and compile
4545
BTAS from source. *This is the recommended way to compile BTAS for all users*.
46-
- [MADNESS](https://github.com/m-a-d-n-e-s-s/madness), tag a479e821da724880c1e7110a49d2e52f0959a072 .
46+
- [MADNESS](https://github.com/m-a-d-n-e-s-s/madness), tag 51c70885f368fcbdaac3db462b5e8d28eed4dbf7 .
4747
Only the MADworld runtime and BLAS/LAPACK C API component of MADNESS is used by TiledArray.
4848
If usable MADNESS installation is not found, TiledArray will download and compile
4949
MADNESS from source. *This is the recommended way to compile MADNESS for all users*.

external/versions.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ set(TA_INSTALL_EIGEN_PREVIOUS_VERSION 3.3.7)
1111
set(TA_INSTALL_EIGEN_URL_HASH SHA256=b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626)
1212
set(TA_INSTALL_EIGEN_PREVIOUS_URL_HASH MD5=b9e98a200d2455f06db9c661c5610496)
1313

14-
set(TA_TRACKED_MADNESS_TAG a479e821da724880c1e7110a49d2e52f0959a072)
15-
set(TA_TRACKED_MADNESS_PREVIOUS_TAG 8da56b1fc0b3d6eabe155923fb844f3430fc7d05)
14+
set(TA_TRACKED_MADNESS_TAG 51c70885f368fcbdaac3db462b5e8d28eed4dbf7)
15+
set(TA_TRACKED_MADNESS_PREVIOUS_TAG 3208474a1dec9a08b8ca7185ca5c168795385372)
1616
set(TA_TRACKED_MADNESS_VERSION 0.10.1)
1717
set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)
1818

src/TiledArray/einsum/tiledarray.h

+6
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,12 @@ template <DeNest DeNestFlag = DeNest::False, typename ArrayA_, typename ArrayB_,
410410
auto einsum(expressions::TsrExpr<ArrayA_> A, expressions::TsrExpr<ArrayB_> B,
411411
std::tuple<Einsum::Index<std::string>, Indices...> cs,
412412
World &world) {
413+
// hotfix: process all preceding tasks before entering this code with many
414+
// blocking calls
415+
// TODO figure out why having free threads left after blocking MPI split
416+
// still not enough to ensure progress
417+
world.gop.fence();
418+
413419
using ArrayA = std::remove_cv_t<ArrayA_>;
414420
using ArrayB = std::remove_cv_t<ArrayB_>;
415421

0 commit comments

Comments
 (0)