From dc0f90c98a619542883289f8f68f89655463192f Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Tue, 14 Mar 2023 15:21:27 +0100
Subject: [PATCH] Philippe 14/03/2023: withdraw FFT sources of OBJ_O0 (to allow
compilation of OpenACC directives)
---
src/Rules.LXnvhpc.mk | 4 +---
src/Rules.LXnvhpc2005.mk | 2 +-
src/Rules.LXnvhpc2202.mk | 2 +-
src/Rules.LXpgi.mk | 4 ++--
src/Rules.LXpgi2004.mk | 2 +-
5 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/Rules.LXnvhpc.mk b/src/Rules.LXnvhpc.mk
index d6052e0a9..7f18c08c6 100644
--- a/src/Rules.LXnvhpc.mk
+++ b/src/Rules.LXnvhpc.mk
@@ -279,13 +279,11 @@ OBJS_O1 += spll_modd_isba_n.o spll_mode_construct_ll.o \
$(OBJS_O1) : OPT = $(OPT_BASE) $(OPT_PERF1)
OBJS_O0= spll_mode_mppdb.o \
- spll_fft55.o spll_fft.o spll_flat_invz.o \
spll_mode_repro_sum.o \
spll_modd_les_n.o \
spll_default_desfm_n.o
#default_desfmn: workaround a nvhpc 21.9 bug (run stall in default_desfmn)
-
-
+# spll_fft55.o spll_fft.o spll_flat_invz.o \
# spll_fast_terms.o
# spll_modd_ch_solver_n.o \
# spll_modd_dummy_gr_field_n.o spll_modd_dyn_n.o
diff --git a/src/Rules.LXnvhpc2005.mk b/src/Rules.LXnvhpc2005.mk
index 40da56367..e8e199e86 100644
--- a/src/Rules.LXnvhpc2005.mk
+++ b/src/Rules.LXnvhpc2005.mk
@@ -258,10 +258,10 @@ OBJS_O1 += spll_modd_isba_n.o spll_mode_construct_ll.o \
$(OBJS_O1) : OPT = $(OPT_BASE) $(OPT_PERF1)
OBJS_O0= spll_mode_mppdb.o \
- spll_fft55.o spll_fft.o spll_flat_invz.o \
spll_mode_repro_sum.o \
spll_modd_les_n.o
+# spll_fft55.o spll_fft.o spll_flat_invz.o \
# spll_fast_terms.o
# spll_modd_ch_solver_n.o \
# spll_modd_dummy_gr_field_n.o spll_modd_dyn_n.o
diff --git a/src/Rules.LXnvhpc2202.mk b/src/Rules.LXnvhpc2202.mk
index 341f0d278..838866084 100644
--- a/src/Rules.LXnvhpc2202.mk
+++ b/src/Rules.LXnvhpc2202.mk
@@ -289,10 +289,10 @@ OBJS_O1 += spll_modd_isba_n.o modd_isba_n.mod spll_mode_construct_ll.o mode_cons
$(OBJS_O1) : OPT = $(OPT_BASE) $(OPT_PERF1)
OBJS_O0= spll_mode_mppdb.o mode_mppdb.mod \
- spll_fft55.o spll_fft.o spll_flat_invz.o \
spll_modd_les_n.o modd_les_n.mod \
spll_default_desfm_n.o \
spll_modd_pack_gr_field_n.o modd_pack_gr_field_n.mod
+# spll_fft55.o spll_fft.o spll_flat_invz.o \
$(OBJS_O0) : OPT = -g $(OPT_BASE) $(OPT_PERF0)
#default_desfmn: workaround a nvhpc 21.9 bug (run stall in default_desfmn)
diff --git a/src/Rules.LXpgi.mk b/src/Rules.LXpgi.mk
index 92a545b50..a01198eda 100644
--- a/src/Rules.LXpgi.mk
+++ b/src/Rules.LXpgi.mk
@@ -215,8 +215,8 @@ OBJS_O1= spll_modd_isba_n.o spll_mode_construct_ll.o \
$(OBJS_O1) : OPT = $(OPT_BASE) $(OPT_PERF1)
OBJS_O0= spll_mode_mppdb.o \
- spll_fft55.o spll_fft.o spll_flat_invz.o \
- spll_mode_repro_sum.o \
+ spll_mode_repro_sum.o
+# spll_fft55.o spll_fft.o spll_flat_invz.o \
# spll_fast_terms.o
# spll_mode_sum_ll.o
$(OBJS_O0) : OPT = $(OPT_BASE) $(OPT_PERF0)
diff --git a/src/Rules.LXpgi2004.mk b/src/Rules.LXpgi2004.mk
index d3c5f1039..63451e430 100644
--- a/src/Rules.LXpgi2004.mk
+++ b/src/Rules.LXpgi2004.mk
@@ -255,10 +255,10 @@ OBJS_O1 += spll_modd_isba_n.o spll_mode_construct_ll.o \
$(OBJS_O1) : OPT = $(OPT_BASE) $(OPT_PERF1)
OBJS_O0= spll_mode_mppdb.o \
- spll_fft55.o spll_fft.o spll_flat_invz.o \
spll_mode_repro_sum.o \
spll_modd_les_n.o
+# spll_fft55.o spll_fft.o spll_flat_invz.o \
# spll_fast_terms.o
# spll_modd_ch_solver_n.o \
# spll_modd_dummy_gr_field_n.o spll_modd_dyn_n.o
--
GitLab