diff --git a/cmake/modules/FindOrFetchMADWorld.cmake b/cmake/modules/FindOrFetchMADWorld.cmake index 5961a4f05d..2dfe28705c 100644 --- a/cmake/modules/FindOrFetchMADWorld.cmake +++ b/cmake/modules/FindOrFetchMADWorld.cmake @@ -41,13 +41,15 @@ if (NOT TARGET MADworld) # look for C and MPI here to make troubleshooting easier and be able to override defaults for MADNESS enable_language(C) - find_package(MPI REQUIRED COMPONENTS C CXX) + find_package(MPI REQUIRED COMPONENTS C) + set(FETCHCONTENT_QUIET FALSE) include(FetchContent) FetchContent_Declare( MADNESS - GIT_REPOSITORY https://github.com/m-a-d-n-e-s-s/madness.git + GIT_REPOSITORY https://github.com/m-a-d-n-e-s-s/madness.git GIT_TAG ${TA_TRACKED_MADNESS_TAG} + GIT_PROGRESS TRUE ) FetchContent_MakeAvailable(MADNESS) FetchContent_GetProperties(MADNESS diff --git a/python/src/TiledArray/python/module.h b/python/src/TiledArray/python/module.h index ae41b8fe9a..89cd2eaeb5 100644 --- a/python/src/TiledArray/python/module.h +++ b/python/src/TiledArray/python/module.h @@ -40,11 +40,8 @@ static World &initialize() { // this loads MPI before TA tries to do it int initialized = 0; MPI_Initialized(&initialized); - MPI_Comm ta_comm; - if (!initialized) { - ta_comm = MPI_COMM_WORLD; - } else { + if (initialized) { int thread_level; MPI_Query_thread(&thread_level); if (thread_level != MPI_THREAD_MULTIPLE) @@ -58,10 +55,10 @@ static World &initialize() { char *_argv[0]; char **argv = _argv; if (!madness::initialized()) { - madness::initialize(argc, argv, ta_comm); + madness::initialize(argc, argv); initialized_madness = true; } - TiledArray::World &world = TiledArray::initialize(argc, argv, ta_comm); + TiledArray::World &world = TiledArray::initialize(argc, argv, MPI_COMM_WORLD); TiledArray::set_default_world(world); if (world.rank() == 0) { std::cout << "initialized TA in a world with " << world.size() << " ranks"