Skip to content

Commit 599587c

Browse files
committed
DO NOT MERGE!!!!
Point (temporarily) to a madness with fixes for CI
1 parent ef22a32 commit 599587c

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

bin/build-linux.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ export TA_PYTHON=ON
1414

1515
${TRAVIS_BUILD_DIR}/bin/build-mpich-linux.sh
1616
${TRAVIS_BUILD_DIR}/bin/build-scalapack-mpich-linux.sh
17-
if [ -n "${MADNESS_OVER_PARSEC}" ]; then
18-
${TRAVIS_BUILD_DIR}/bin/build-parsec-linux.sh
19-
fi
2017
${TRAVIS_BUILD_DIR}/bin/build-madness-linux.sh
2118
${TRAVIS_BUILD_DIR}/bin/build-boost-linux.sh
2219
${TRAVIS_BUILD_DIR}/bin/build-eigen3-linux.sh

bin/build-madness-linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ "$BUILD_TYPE" = "Debug" ]; then
5151
cd madness
5252

5353
if [ -n "${MADNESS_OVER_PARSEC}" ]; then
54-
MADNESS_BACKEND_OPTION="-DMADNESS_TASK_BACKEND=PaRSEC -DPaRSEC_ROOT_DIR=${INSTALL_PREFIX}/parsec"
54+
MADNESS_BACKEND_OPTION="-DMADNESS_TASK_BACKEND=PaRSEC"
5555
fi
5656

5757
# check out the tracked tag of MADNESS

cmake/modules/FindOrFetchMADWorld.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ if (NOT TARGET MADworld)
3838
include(FetchContent)
3939
FetchContent_Declare(
4040
MADNESS
41-
GIT_REPOSITORY https://github.com/m-a-d-n-e-s-s/madness.git
41+
# GIT_REPOSITORY https://github.com/m-a-d-n-e-s-s/madness.git
42+
GIT_REPOSITORY https://github.com/TESSEorg/madness.git
4243
GIT_TAG ${TA_TRACKED_MADNESS_TAG}
4344
)
4445
FetchContent_MakeAvailable(MADNESS)

external/versions.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ set(TA_INSTALL_EIGEN_PREVIOUS_VERSION 3.3.7)
1919
set(TA_INSTALL_EIGEN_URL_HASH b9e98a200d2455f06db9c661c5610496)
2020
set(TA_INSTALL_EIGEN_PREVIOUS_URL_HASH b9e98a200d2455f06db9c661c5610496)
2121

22-
set(TA_TRACKED_MADNESS_TAG 0c0b41e8490f53c62508fd0c8d918fb642488fc2)
22+
#set(TA_TRACKED_MADNESS_TAG 0c0b41e8490f53c62508fd0c8d918fb642488fc2)
23+
set(TA_TRACKED_MADNESS_TAG 9c67bff73ee3943d8f22fd6f167ac7dd847a5c25)
2324
set(TA_TRACKED_MADNESS_PREVIOUS_TAG fb82aa568619b8ea11868e4015092dff12190f19)
2425
set(TA_TRACKED_MADNESS_VERSION 0.10.1)
2526
set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)

0 commit comments

Comments
 (0)