From 76236103699cd076733d5460c81b424fc33f2389 Mon Sep 17 00:00:00 2001 From: Oliver Zier <ozier@web.de> Date: Wed, 7 Oct 2020 13:15:20 +0200 Subject: [PATCH] Remove NUM_THREADS in Makefiles --- buildsystem/Makefile.comp.cobra | 8 +------- buildsystem/Makefile.comp.cobraopenmpi | 6 ------ buildsystem/Makefile.comp.freya | 8 +------- buildsystem/Makefile.comp.freyaopenmpi | 6 ------ buildsystem/Makefile.comp.gcc | 6 ------ buildsystem/Makefile.comp.gcc-paranoia | 8 +------- buildsystem/Makefile.comp.ravenopenmpi | 8 +------- buildsystem/Makefile.comp.supermuc-ng | 8 +------- buildsystem/Makefile.comp.supermuc-ng-gcc | 8 +------- buildsystem/Makefile.comp.supermuc-ng-openmpi | 5 ----- src/pm/pm_periodic.cc | 3 --- 11 files changed, 6 insertions(+), 68 deletions(-) diff --git a/buildsystem/Makefile.comp.cobra b/buildsystem/Makefile.comp.cobra index 15a0110..cae1525 100644 --- a/buildsystem/Makefile.comp.cobra +++ b/buildsystem/Makefile.comp.cobra @@ -7,10 +7,4 @@ CPV = $(CPP) else CFLAGS_VECTOR = CPV = $(CPP) -endif - -ifeq (NUM_THREADS,$(findstring NUM_THREADS,$(CONFIGVARS))) -OPTIMIZE += -fopenmp -else -OPTIMIZE += -Wno-unknown-pragmas -endif +endif \ No newline at end of file diff --git a/buildsystem/Makefile.comp.cobraopenmpi b/buildsystem/Makefile.comp.cobraopenmpi index 2a9430a..cb88a67 100644 --- a/buildsystem/Makefile.comp.cobraopenmpi +++ b/buildsystem/Makefile.comp.cobraopenmpi @@ -7,9 +7,3 @@ else CFLAGS_VECTOR = CPV = $(CPP) endif - -ifeq (NUM_THREADS,$(findstring NUM_THREADS,$(CONFIGVARS))) -OPTIMIZE += -qopenmp -else -OPTIMIZE += -Wno-unknown-pragmas -endif diff --git a/buildsystem/Makefile.comp.freya b/buildsystem/Makefile.comp.freya index 15a0110..cae1525 100644 --- a/buildsystem/Makefile.comp.freya +++ b/buildsystem/Makefile.comp.freya @@ -7,10 +7,4 @@ CPV = $(CPP) else CFLAGS_VECTOR = CPV = $(CPP) -endif - -ifeq (NUM_THREADS,$(findstring NUM_THREADS,$(CONFIGVARS))) -OPTIMIZE += -fopenmp -else -OPTIMIZE += -Wno-unknown-pragmas -endif +endif \ No newline at end of file diff --git a/buildsystem/Makefile.comp.freyaopenmpi b/buildsystem/Makefile.comp.freyaopenmpi index c4c0105..ae8b58b 100644 --- a/buildsystem/Makefile.comp.freyaopenmpi +++ b/buildsystem/Makefile.comp.freyaopenmpi @@ -8,9 +8,3 @@ else CFLAGS_VECTOR = CPV = $(CPP) endif - -ifeq (NUM_THREADS,$(findstring NUM_THREADS,$(CONFIGVARS))) -OPTIMIZE += -fopenmp -else -OPTIMIZE += -Wno-unknown-pragmas -endif diff --git a/buildsystem/Makefile.comp.gcc b/buildsystem/Makefile.comp.gcc index 48e196c..f94bb2f 100644 --- a/buildsystem/Makefile.comp.gcc +++ b/buildsystem/Makefile.comp.gcc @@ -8,9 +8,3 @@ else CFLAGS_VECTOR = CPV = $(CPP) endif - -ifeq (NUM_THREADS,$(findstring NUM_THREADS,$(CONFIGVARS))) -OPTIMIZE += -fopenmp -else -OPTIMIZE += -Wno-unknown-pragmas -endif diff --git a/buildsystem/Makefile.comp.gcc-paranoia b/buildsystem/Makefile.comp.gcc-paranoia index 62a8b5c..8801fe7 100644 --- a/buildsystem/Makefile.comp.gcc-paranoia +++ b/buildsystem/Makefile.comp.gcc-paranoia @@ -11,10 +11,4 @@ CPV = $(CPP) else CFLAGS_VECTOR = CPV = $(CPP) -endif - -ifeq (NUM_THREADS,$(findstring NUM_THREADS,$(CONFIGVARS))) -OPTIMIZE += -fopenmp -else -OPTIMIZE += -Wno-unknown-pragmas -endif +endif \ No newline at end of file diff --git a/buildsystem/Makefile.comp.ravenopenmpi b/buildsystem/Makefile.comp.ravenopenmpi index f9892ce..9d27363 100644 --- a/buildsystem/Makefile.comp.ravenopenmpi +++ b/buildsystem/Makefile.comp.ravenopenmpi @@ -6,10 +6,4 @@ CPV = $(CPP) else CFLAGS_VECTOR = CPV = $(CPP) -endif - -ifeq (NUM_THREADS,$(findstring NUM_THREADS,$(CONFIGVARS))) -OPTIMIZE += -qopenmp -else -OPTIMIZE += -Wno-unknown-pragmas -endif +endif \ No newline at end of file diff --git a/buildsystem/Makefile.comp.supermuc-ng b/buildsystem/Makefile.comp.supermuc-ng index 275a817..9fc27ba 100644 --- a/buildsystem/Makefile.comp.supermuc-ng +++ b/buildsystem/Makefile.comp.supermuc-ng @@ -8,10 +8,4 @@ CPV = $(CPP) else CFLAGS_VECTOR = CPV = $(CPP) -endif - -ifeq (NUM_THREADS,$(findstring NUM_THREADS,$(CONFIGVARS))) -OPTIMIZE += -fopenmp -else -OPTIMIZE += -Wno-unknown-pragmas -endif +endif \ No newline at end of file diff --git a/buildsystem/Makefile.comp.supermuc-ng-gcc b/buildsystem/Makefile.comp.supermuc-ng-gcc index d3d9312..22360b8 100644 --- a/buildsystem/Makefile.comp.supermuc-ng-gcc +++ b/buildsystem/Makefile.comp.supermuc-ng-gcc @@ -8,10 +8,4 @@ CPV = $(CPP) else CFLAGS_VECTOR = CPV = $(CPP) -endif - -ifeq (NUM_THREADS,$(findstring NUM_THREADS,$(CONFIGVARS))) -OPTIMIZE += -fopenmp -else -OPTIMIZE += -Wno-unknown-pragmas -endif +endif \ No newline at end of file diff --git a/buildsystem/Makefile.comp.supermuc-ng-openmpi b/buildsystem/Makefile.comp.supermuc-ng-openmpi index d3d9312..7a0ad5c 100644 --- a/buildsystem/Makefile.comp.supermuc-ng-openmpi +++ b/buildsystem/Makefile.comp.supermuc-ng-openmpi @@ -10,8 +10,3 @@ CFLAGS_VECTOR = CPV = $(CPP) endif -ifeq (NUM_THREADS,$(findstring NUM_THREADS,$(CONFIGVARS))) -OPTIMIZE += -fopenmp -else -OPTIMIZE += -Wno-unknown-pragmas -endif diff --git a/src/pm/pm_periodic.cc b/src/pm/pm_periodic.cc index 753015f..1eee5b5 100644 --- a/src/pm/pm_periodic.cc +++ b/src/pm/pm_periodic.cc @@ -61,9 +61,6 @@ * The non-periodic dimension is selected via the GRAVITY_TALLBOX flag. Also in this case, arbitrarily stretched boxes can * be used, and one can use PM_ZOOM_OPTIMIZED and/or FFT_COLUMN_BASED if desired. * - * Much of the code is multi-threaded, so there should be some speed-up if OpenMP is used with NUM_THREADS > 1, but the - * benefit may be limited because the data transfer steps (which weigh in quite heavily) are not accelerated by this. - * * If eight times the particle load per processor exceeds 2^31 ~ 2 billion, one should activate NUMPART_PER_TASK_LARGE. * The code will check this condition and terminate if this is violated, so there should hopefully be no severe risk * to accidentally forget this. -- GitLab