From 95e47ff9f2c61e20f38244d3f1dce891a9e121df Mon Sep 17 00:00:00 2001
From: Angus Lepper <angus.lepper@ed.ac.uk>
Date: Wed, 10 Feb 2016 11:15:15 +0000
Subject: [PATCH] ENGINE_POLICY_SETAFFINITY for MPI binaries
* Also restore getopt -o option lost in some merge
---
examples/Makefile.am | 4 ++--
examples/main.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 54fab6edb5..6abaf5a542 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -54,10 +54,10 @@ swift_fixdt_LDADD = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS)
# Sources for swift_mpi, do we need an affinity policy for MPI?
swift_mpi_SOURCES = main.c
-swift_mpi_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) $(MPI_FLAGS) -DENGINE_POLICY="engine_policy_keep"
+swift_mpi_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) $(MPI_FLAGS) -DENGINE_POLICY="engine_policy_keep $(ENGINE_POLICY_SETAFFINITY)"
swift_mpi_LDADD = ../src/.libs/libswiftsim_mpi.a $(HDF5_LDFLAGS) $(HDF5_LIBS) $(MPI_LIBS)
swift_fixdt_mpi_SOURCES = main.c
-swift_fixdt_mpi_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) $(MPI_FLAGS) -DENGINE_POLICY="engine_policy_fixdt | engine_policy_keep"
+swift_fixdt_mpi_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) $(MPI_FLAGS) -DENGINE_POLICY="engine_policy_fixdt | engine_policy_keep $(ENGINE_POLICY_SETAFFINITY)"
swift_fixdt_mpi_LDADD = ../src/.libs/libswiftsim_mpi.a $(HDF5_LDFLAGS) $(HDF5_LIBS) $(MPI_LIBS)
diff --git a/examples/main.c b/examples/main.c
index 1920448b45..4b9c8cf727 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -137,7 +137,7 @@ int main(int argc, char *argv[]) {
bzero(&s, sizeof(struct space));
/* Parse the options */
- while ((c = getopt(argc, argv, "a:c:d:e:f:g:m:q:s:t:w:y:z:")) != -1)
+ while ((c = getopt(argc, argv, "a:c:d:e:f:g:m:oq:s:t:w:y:z:")) != -1)
switch (c) {
case 'a':
if (sscanf(optarg, "%lf", &scaling) != 1)
--
GitLab