blob: 1a1164e342be1a067ede311144d064fe670beb38 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
|
From 55356ab9c03cd25efeb5176761f2f5b3744b4371 Mon Sep 17 00:00:00 2001
From: Kurt Kanzenbach <kurt@kmk-computers.de>
Date: Fri, 24 Jan 2020 17:59:48 +0100
Subject: [PATCH] cmake: Disable mpiruns
The mpiruns will violate the sandboxing. Therefore, disable them including
scotch.
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
---
CMakeLists.txt | 14 +-
CMakeModules/FindSCOTCH.cmake | 238 +++++++++++++++++-----------------
2 files changed, 121 insertions(+), 131 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed5cc607c3ed..fec488002958 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,19 +238,9 @@ if (MACHINE_ARCH MATCHES "x86_64")
set(AMD64_LINUX true)
endif()
-# test if mpirun/mpiexec supports the --oversubscribe flag:
+# use the --oversubscribe flag:
if(MPI_FOUND)
- execute_process(
- COMMAND ${MPIEXEC} --oversubscribe ${MPIEXEC_NUMPROC_FLAG} 4 echo ok
- RESULT_VARIABLE MPIEXEC_OVERSUBSCRIBE_RETURN_CODE
- OUTPUT_QUIET
- ERROR_QUIET)
-
- if (MPIEXEC_OVERSUBSCRIBE_RETURN_CODE EQUAL 0)
- set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe")
- else()
- set(MPIEXEC_OVERSUBSCRIBE_FLAG "")
- endif()
+ set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe")
endif()
#============= 3. CONFIGURABLE BUILD OPTIONS =========================
diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake
index 5c717977dbba..146c2bf8bb60 100644
--- a/CMakeModules/FindSCOTCH.cmake
+++ b/CMakeModules/FindSCOTCH.cmake
@@ -233,125 +233,125 @@ int main() {
")
message(STATUS "Performing test SCOTCH_TEST_RUNS")
- try_run(
- SCOTCH_TEST_LIB_EXITCODE
- SCOTCH_TEST_LIB_COMPILED
- ${CMAKE_CURRENT_BINARY_DIR}
- ${SCOTCH_TEST_LIB_CPP}
- CMAKE_FLAGS
- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
- COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
- RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
- )
-
- if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
- message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
- set(SCOTCH_TEST_RUNS TRUE)
- else()
- message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
- if (SCOTCH_DEBUG)
- # Output some variables
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
- endif()
- endif()
-
- # If program does not run, try adding zlib library and test again
- if(NOT SCOTCH_TEST_RUNS)
- if (NOT ZLIB_FOUND)
- find_package(ZLIB)
- endif()
-
- if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
-
- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
- try_run(
- SCOTCH_ZLIB_TEST_LIB_EXITCODE
- SCOTCH_ZLIB_TEST_LIB_COMPILED
- ${CMAKE_CURRENT_BINARY_DIR}
- ${SCOTCH_TEST_LIB_CPP}
- CMAKE_FLAGS
- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
- COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
- RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
- )
-
- # Add zlib flags if required and set test run to 'true'
- if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
- set(SCOTCH_TEST_RUNS TRUE)
- else()
- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
- if (SCOTCH_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
- endif()
- endif()
-
- endif()
- endif()
-
- if(NOT SCOTCH_TEST_RUNS)
- if (NOT BZIP2_FOUND)
- find_package(BZip2)
- endif()
-
- if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR})
- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
-
- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS")
- try_run(
- SCOTCH_BZIP2_TEST_LIB_EXITCODE
- SCOTCH_BZIP2_TEST_LIB_COMPILED
- ${CMAKE_CURRENT_BINARY_DIR}
- ${SCOTCH_TEST_LIB_CPP}
- CMAKE_FLAGS
- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
- COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT
- RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT
- )
-
- # Add zlib flags if required and set test run to 'true'
- if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0)
- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success")
- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES})
- set(SCOTCH_TEST_RUNS TRUE)
- else()
- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed")
- if (SCOTCH_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
- endif()
- endif()
- endif()
- endif()
+ # try_run(
+ # SCOTCH_TEST_LIB_EXITCODE
+ # SCOTCH_TEST_LIB_COMPILED
+ # ${CMAKE_CURRENT_BINARY_DIR}
+ # ${SCOTCH_TEST_LIB_CPP}
+ # CMAKE_FLAGS
+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+ # COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
+ # RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
+ # )
+
+ # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
+ # set(SCOTCH_TEST_RUNS TRUE)
+ # else()
+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
+ # if (SCOTCH_DEBUG)
+ # # Output some variables
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
+ # endif()
+ # endif()
+
+ # # If program does not run, try adding zlib library and test again
+ # if(NOT SCOTCH_TEST_RUNS)
+ # if (NOT ZLIB_FOUND)
+ # find_package(ZLIB)
+ # endif()
+
+ # if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
+
+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
+ # try_run(
+ # SCOTCH_ZLIB_TEST_LIB_EXITCODE
+ # SCOTCH_ZLIB_TEST_LIB_COMPILED
+ # ${CMAKE_CURRENT_BINARY_DIR}
+ # ${SCOTCH_TEST_LIB_CPP}
+ # CMAKE_FLAGS
+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+ # COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
+ # RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
+ # )
+
+ # # Add zlib flags if required and set test run to 'true'
+ # if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
+ # set(SCOTCH_TEST_RUNS TRUE)
+ # else()
+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
+ # if (SCOTCH_DEBUG)
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
+ # endif()
+ # endif()
+
+ # endif()
+ # endif()
+
+ # if(NOT SCOTCH_TEST_RUNS)
+ # if (NOT BZIP2_FOUND)
+ # find_package(BZip2)
+ # endif()
+
+ # if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR})
+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
+
+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS")
+ # try_run(
+ # SCOTCH_BZIP2_TEST_LIB_EXITCODE
+ # SCOTCH_BZIP2_TEST_LIB_COMPILED
+ # ${CMAKE_CURRENT_BINARY_DIR}
+ # ${SCOTCH_TEST_LIB_CPP}
+ # CMAKE_FLAGS
+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+ # COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT
+ # RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT
+ # )
+
+ # # Add zlib flags if required and set test run to 'true'
+ # if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0)
+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success")
+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES})
+ # set(SCOTCH_TEST_RUNS TRUE)
+ # else()
+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed")
+ # if (SCOTCH_DEBUG)
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}")
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}")
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
+ # endif()
+ # endif()
+ # endif()
+ # endif()
endif()
endif()
--
2.24.1
|
GitWeb