projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2761752
)
ctest -DUNRES_MPIRUN=1 for tryton
author
Cezary Czaplewski
<czarek@chem.univ.gda.pl>
Thu, 28 Apr 2016 09:28:43 +0000
(11:28 +0200)
committer
Cezary Czaplewski
<czarek@chem.univ.gda.pl>
Thu, 28 Apr 2016 09:28:43 +0000
(11:28 +0200)
source/cluster/wham/src-M/CMakeLists.txt
patch
|
blob
|
history
source/cluster/wham/src/CMakeLists.txt
patch
|
blob
|
history
source/unres/src_CSA/CMakeLists.txt
patch
|
blob
|
history
source/unres/src_MD-M/CMakeLists.txt
patch
|
blob
|
history
source/unres/src_MD/CMakeLists.txt
patch
|
blob
|
history
source/wham/src-M/CMakeLists.txt
patch
|
blob
|
history
source/wham/src/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/source/cluster/wham/src-M/CMakeLists.txt
b/source/cluster/wham/src-M/CMakeLists.txt
index
51a1ad6
..
5dd1379
100644
(file)
--- a/
source/cluster/wham/src-M/CMakeLists.txt
+++ b/
source/cluster/wham/src-M/CMakeLists.txt
@@
-186,6
+186,9
@@
install(TARGETS UNRES_CLUSTER_WHAM_M_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/clu
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
+ elseif(UNRES_MPIRUN)
+ set (np "-np")
+ set (mpiexec "mpirun")
else()
set (np "-np")
set (mpiexec "mpiexec")
else()
set (np "-np")
set (mpiexec "mpiexec")
diff --git
a/source/cluster/wham/src/CMakeLists.txt
b/source/cluster/wham/src/CMakeLists.txt
index
5ae222e
..
758582d
100644
(file)
--- a/
source/cluster/wham/src/CMakeLists.txt
+++ b/
source/cluster/wham/src/CMakeLists.txt
@@
-187,6
+187,9
@@
install(TARGETS UNRES_CLUSTER_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/clust
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
+ elseif(UNRES_MPIRUN)
+ set (np "-np")
+ set (mpiexec "mpirun")
else()
set (np "-np")
set (mpiexec "mpiexec")
else()
set (np "-np")
set (mpiexec "mpiexec")
diff --git
a/source/unres/src_CSA/CMakeLists.txt
b/source/unres/src_CSA/CMakeLists.txt
index
ae33e99
..
c0a3592
100644
(file)
--- a/
source/unres/src_CSA/CMakeLists.txt
+++ b/
source/unres/src_CSA/CMakeLists.txt
@@
-398,6
+398,9
@@
endif(UNRES_CSA_FF STREQUAL "E0LL2Y")
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
+ elseif(UNRES_MPIRUN)
+ set (np "-np")
+ set (mpiexec "mpirun")
else()
set (np "-np")
set (mpiexec "mpiexec")
else()
set (np "-np")
set (mpiexec "mpiexec")
diff --git
a/source/unres/src_MD-M/CMakeLists.txt
b/source/unres/src_MD-M/CMakeLists.txt
index
052b4aa
..
9c3491b
100644
(file)
--- a/
source/unres/src_MD-M/CMakeLists.txt
+++ b/
source/unres/src_MD-M/CMakeLists.txt
@@
-516,6
+516,9
@@
$UNRES_BIN
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
+ elseif(UNRES_MPIRUN)
+ set (np "-np")
+ set (mpiexec "mpirun")
else()
set (np "-np")
set (mpiexec "mpiexec")
else()
set (np "-np")
set (mpiexec "mpiexec")
diff --git
a/source/unres/src_MD/CMakeLists.txt
b/source/unres/src_MD/CMakeLists.txt
index
d9a4314
..
499cfcb
100644
(file)
--- a/
source/unres/src_MD/CMakeLists.txt
+++ b/
source/unres/src_MD/CMakeLists.txt
@@
-493,6
+493,9
@@
FILE( COPY ${CMAKE_CURRENT_BINARY_DIR}/scripts/test_prota_E0LL2Y.sh
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
+ elseif(UNRES_MPIRUN)
+ set (np "-np")
+ set (mpiexec "mpirun")
else()
set (np "-np")
set (mpiexec "mpiexec")
else()
set (np "-np")
set (mpiexec "mpiexec")
diff --git
a/source/wham/src-M/CMakeLists.txt
b/source/wham/src-M/CMakeLists.txt
index
7f6c295
..
a2dbc43
100644
(file)
--- a/
source/wham/src-M/CMakeLists.txt
+++ b/
source/wham/src-M/CMakeLists.txt
@@
-255,6
+255,9
@@
install(TARGETS UNRES_WHAM_M_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/wham)
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
+ elseif(UNRES_MPIRUN)
+ set (np "-np")
+ set (mpiexec "mpirun")
else()
set (np "-np")
set (mpiexec "mpiexec")
else()
set (np "-np")
set (mpiexec "mpiexec")
diff --git
a/source/wham/src/CMakeLists.txt
b/source/wham/src/CMakeLists.txt
index
8cc305a
..
f17a4b4
100644
(file)
--- a/
source/wham/src/CMakeLists.txt
+++ b/
source/wham/src/CMakeLists.txt
@@
-255,6
+255,9
@@
install(TARGETS UNRES_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/wham)
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
if (UNRES_SRUN)
set (np "-n")
set (mpiexec "srun")
+ elseif(UNRES_MPIRUN)
+ set (np "-np")
+ set (mpiexec "mpirun")
else()
set (np "-np")
set (mpiexec "mpiexec")
else()
set (np "-np")
set (mpiexec "mpiexec")