Skip to content

Commit b664b18

Browse files
authored
Merge pull request #518 from ValeevGroup/evaleev/ci/pass-cmake-ipo-flag-to-librett-and-umpire
if defined, pass `CMAKE_INTERPROCEDURAL_OPTIMIZATION` to librett/umpire
2 parents f14250c + fca3591 commit b664b18

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

external/librett.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ else()
9797
set(LIBRETT_CMAKE_ARGS "${LIBRETT_CMAKE_ARGS}"
9898
"-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
9999
endif(CMAKE_TOOLCHAIN_FILE)
100+
if (DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
101+
set(LIBRETT_CMAKE_ARGS "${LIBRETT_CMAKE_ARGS}"
102+
"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}")
103+
endif(DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
104+
if (DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION_${CMAKE_BUILD_TYPE})
105+
set(LIBRETT_CMAKE_ARGS "${LIBRETT_CMAKE_ARGS}"
106+
"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION_${CMAKE_BUILD_TYPE}=${CMAKE_INTERPROCEDURAL_OPTIMIZATION_${CMAKE_BUILD_TYPE}}")
107+
endif(DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION_${CMAKE_BUILD_TYPE})
100108

101109
foreach(lang C CXX CUDA)
102110
if (DEFINED CMAKE_${lang}_COMPILER_LAUNCHER)

external/umpire.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,14 @@ else()
151151
"-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
152152
)
153153
endif(CMAKE_TOOLCHAIN_FILE)
154+
if (DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
155+
set(UMPIRE_CMAKE_ARGS "${UMPIRE_CMAKE_ARGS}"
156+
"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}")
157+
endif(DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
158+
if (DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION_${CMAKE_BUILD_TYPE})
159+
set(UMPIRE_CMAKE_ARGS "${UMPIRE_CMAKE_ARGS}"
160+
"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION_${CMAKE_BUILD_TYPE}=${CMAKE_INTERPROCEDURAL_OPTIMIZATION_${CMAKE_BUILD_TYPE}}")
161+
endif(DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION_${CMAKE_BUILD_TYPE})
154162

155163
foreach(lang C CXX CUDA)
156164
if (DEFINED CMAKE_${lang}_COMPILER_LAUNCHER)

src/TiledArray/einsum/tiledarray.h

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#include "TiledArray/tiled_range.h"
1111
#include "TiledArray/tiled_range1.h"
1212

13+
#include <madness/world/thread.h>
14+
1315
namespace TiledArray {
1416
enum struct DeNest { True, False };
1517
}

0 commit comments

Comments
 (0)