Skip to content

Commit 127a8f4

Browse files
islasislas
authored
Move netcdfpar build to postamble (#2181)
TYPE: bug fix KEYWORDS: netcdfpar, configure, make SOURCE: internal DESCRIPTION OF CHANGES: Problem: Control of whether the external/io_netcdfpar folder is controlled via the presence of `NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD` which is replaced by a substitution in arch/Config.pl. However, currently this relies on all stanzas to include this value verbatim, otherwise that stanza will be unable to skip building the netCDF parallel IO code. Solution: Since this is required regardless of stanza selected this should be isolated from the arch/configure.defaults and relocated to a common location for all stanzas to automatically use. Following current substitution variable layout, this is placed in arch/postamble. TESTS CONDUCTED: 1. Tested to ensure CMake and make builds of common stanzas are unaffected. RELEASE NOTE: Fix uncontrollable building of external/io_netcdfpar folder for all stanzas
1 parent 4a89769 commit 127a8f4

2 files changed

Lines changed: 46 additions & 44 deletions

File tree

‎arch/configure.defaults‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RANLIB = ls
4242
RLFLAGS =
4343
#ranlib
4444
CC_TOOLS = cc
45-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
45+
4646

4747
###########################################################
4848
#ARCH Linux i486 i586 i686 armv7l aarch64, gfortran compiler with gcc #serial smpar dmpar dm+sm
@@ -87,7 +87,7 @@ M4 = m4 -B 14000
8787
RANLIB = ranlib
8888
RLFLAGS =
8989
CC_TOOLS = $(SCC)
90-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
90+
9191

9292
###########################################################
9393
#ARCH Linux i486 i586 i686, g95 compiler with gcc #serial dmpar
@@ -131,7 +131,7 @@ M4 = m4 -B 14000
131131
RANLIB = ranlib
132132
RLFLAGS =
133133
CC_TOOLS = $(SCC)
134-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
134+
135135

136136
###########################################################
137137
#ARCH Linux x86_64 ppc64le i486 i586 i686, PGI compiler with gcc # serial smpar dmpar dm+sm
@@ -175,7 +175,7 @@ M4 = m4 -B 14000
175175
RANLIB = ranlib
176176
RLFLAGS =
177177
CC_TOOLS = $(SCC)
178-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
178+
179179

180180
###########################################################
181181
#ARCH Linux x86_64 ppc64le, PGI compiler with pgcc, SGI MPT # serial smpar dmpar dm+sm
@@ -219,7 +219,7 @@ M4 = m4 -B 14000
219219
RANLIB = ranlib
220220
RLFLAGS =
221221
CC_TOOLS = $(SCC)
222-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
222+
223223

224224
###########################################################
225225
#ARCH Linux x86_64 ppc64le, PGI accelerator compiler with gcc # serial smpar dmpar dm+sm
@@ -262,7 +262,7 @@ M4 = m4 -B 14000
262262
RANLIB = ranlib
263263
RLFLAGS =
264264
CC_TOOLS = $(SCC)
265-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
265+
266266

267267
###########################################################
268268
#ARCH Linux x86_64 ppc64le i486 i586 i686, ifort compiler with icc #serial smpar dmpar dm+sm
@@ -340,7 +340,7 @@ M4 = m4
340340
RANLIB = ranlib
341341
RLFLAGS =
342342
CC_TOOLS = $(SCC)
343-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
343+
344344

345345
###########################################################
346346
#ARCH Linux x86_64 ppc64le i486 i586 i686, Xeon Phi (MIC architecture) ifort compiler with icc # dm+sm
@@ -388,7 +388,7 @@ M4 = m4
388388
RANLIB = ranlib
389389
RLFLAGS =
390390
CC_TOOLS = gcc
391-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
391+
392392

393393
###########################################################
394394
#ARCH Linux x86_64 ppc64le i486 i586 i686, Xeon (SNB with AVX mods) ifort compiler with icc # serial smpar dmpar dm+sm
@@ -436,7 +436,7 @@ M4 = m4
436436
RANLIB = ranlib
437437
RLFLAGS =
438438
CC_TOOLS = gcc
439-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
439+
440440

441441
###########################################################
442442
#ARCH Linux x86_64 ppc64le i486 i586 i686, ifort compiler with icc, SGI MPT #serial smpar dmpar dm+sm
@@ -508,7 +508,7 @@ M4 = m4
508508
RANLIB = ranlib
509509
RLFLAGS =
510510
CC_TOOLS = $(SCC)
511-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
511+
512512

513513
###########################################################
514514
#ARCH Linux x86_64 ppc64le i486 i586 i686, ifort compiler with icc, IBM POE #serial smpar dmpar dm+sm
@@ -558,7 +558,7 @@ M4 = m4
558558
RANLIB = ranlib
559559
RLFLAGS =
560560
CC_TOOLS = $(SCC)
561-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
561+
562562

563563
###########################################################
564564
#ARCH ia64 Linux ifort compiler with icc 9.x,10.x #serial smpar dmpar dm+sm
@@ -640,7 +640,7 @@ M4 = m4
640640
RANLIB = ranlib
641641
RLFLAGS =
642642
CC_TOOLS = $(SCC)
643-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
643+
644644

645645
###########################################################
646646
#ARCH Linux SGI Altix, ifort compiler with icc 9.x,10.x #serial smpar dmpar dm+sm
@@ -724,7 +724,7 @@ M4 = m4
724724
RANLIB = ranlib
725725
RLFLAGS =
726726
CC_TOOLS = $(SCC)
727-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
727+
728728

729729
###########################################################
730730
#ARCH Linux i486 i586 i686 x86_64 ppc64le, PathScale compiler with pathcc #serial dmpar
@@ -768,7 +768,7 @@ M4 = m4 -B 14000
768768
RANLIB = ranlib
769769
RLFLAGS =
770770
CC_TOOLS = $(SCC)
771-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
771+
772772

773773
###########################################################
774774
#ARCH Linux x86_64 ppc64le, gfortran compiler with gcc #serial smpar dmpar dm+sm
@@ -815,7 +815,7 @@ M4 = m4 -G
815815
RANLIB = ranlib
816816
RLFLAGS =
817817
CC_TOOLS = $(SCC)
818-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
818+
819819

820820
###########################################################
821821
#ARCH Darwin x86_64 arm64, (MACOS) PGI compiler with pgcc #serial smpar dmpar dm+sm
@@ -859,7 +859,7 @@ M4 = m4 -B 14000
859859
RANLIB = ranlib
860860
RLFLAGS = -c
861861
CC_TOOLS = cc
862-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
862+
863863

864864
###########################################################
865865
#ARCH Darwin x86_64 arm64, (MACOS) intel compiler with icc #serial smpar dmpar dm+sm
@@ -906,7 +906,7 @@ M4 = m4 -B 14000
906906
RANLIB = ranlib
907907
RLFLAGS = -c
908908
CC_TOOLS = cc
909-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
909+
910910

911911
###########################################################
912912
#ARCH Darwin x86_64 arm64, (MACOS) intel compiler with clang EDIT FOR OPENMPI #serial smpar dmpar dm+sm
@@ -952,7 +952,7 @@ M4 = m4 -B 14000
952952
RANLIB = ranlib
953953
RLFLAGS = -c
954954
CC_TOOLS = cc
955-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
955+
956956

957957
###########################################################
958958
#ARCH Darwin x86_64 arm64, (MACOS) g95 with gcc #serial dmpar
@@ -997,7 +997,7 @@ M4 = m4 -B 14000
997997
RANLIB = ranlib -c
998998
RLFLAGS = -c
999999
CC_TOOLS = $(SCC)
1000-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1000+
10011001

10021002
###########################################################
10031003
#ARCH Darwin x86_64 arm64, (MACOS) gfortran with gcc #serial smpar dmpar dm+sm
@@ -1042,7 +1042,7 @@ M4 = m4 -B 14000
10421042
RANLIB = ranlib
10431043
RLFLAGS = -c
10441044
CC_TOOLS = $(SCC)
1045-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1045+
10461046

10471047
###########################################################
10481048
#ARCH Darwin x86_64 arm64, (MACOS) gfortran with clang #serial smpar dmpar dm+sm
@@ -1087,7 +1087,7 @@ M4 = m4 -B 14000
10871087
RANLIB = ranlib
10881088
RLFLAGS = -c
10891089
CC_TOOLS = clang
1090-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1090+
10911091

10921092
###########################################################
10931093
#ARCH Darwin x86_64 arm64, (MACOS) xlf #serial dmpar
@@ -1133,7 +1133,7 @@ M4 = m4 -B 14000
11331133
RANLIB = ranlib
11341134
RLFLAGS = -c
11351135
CC_TOOLS = $(SCC)
1136-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1136+
11371137

11381138
###########################################################
11391139
#ARCH AIX xlf compiler with xlc #serial smpar dmpar dm+sm
@@ -1182,7 +1182,7 @@ M4 = m4 -B 20000
11821182
RANLIB = ranlib
11831183
RLFLAGS =
11841184
CC_TOOLS = cc
1185-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1185+
11861186

11871187
###########################################################
11881188
#ARCH Linux x86_64 ppc64le i486 i586 i686, xlf compiler with xlc # serial smpar dmpar dm+sm
@@ -1234,7 +1234,7 @@ M4 = m4 -B 14000
12341234
RANLIB = ranlib
12351235
RLFLAGS =
12361236
CC_TOOLS = cc
1237-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1237+
12381238

12391239
###########################################################
12401240
#ARCH Cray XC CLE/Linux x86_64, PGI compiler with gcc # serial dmpar smpar dm+sm
@@ -1297,7 +1297,7 @@ M4 = m4 -B 14000
12971297
RANLIB = ranlib
12981298
RLFLAGS =
12991299
CC_TOOLS = $(SCC)
1300-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1300+
13011301

13021302
###########################################################
13031303
#ARCH Cray XE and XC CLE/Linux x86_64, Cray CCE compiler # serial dmpar smpar dm+sm
@@ -1348,7 +1348,7 @@ M4 = m4
13481348
RANLIB = ranlib
13491349
RLFLAGS =
13501350
CC_TOOLS = gcc
1351-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1351+
13521352

13531353
###########################################################
13541354
#ARCH Cray XC CLE/Linux x86_64, Xeon ifort compiler # serial dmpar smpar dm+sm
@@ -1398,7 +1398,7 @@ M4 = m4
13981398
RANLIB = ranlib
13991399
RLFLAGS =
14001400
CC_TOOLS = gcc
1401-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1401+
14021402

14031403

14041404
###########################################################
@@ -1451,7 +1451,7 @@ M4 = m4 -B 14000
14511451
RANLIB = ranlib
14521452
RLFLAGS =
14531453
CC_TOOLS = cc
1454-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1454+
14551455

14561456
###########################################################
14571457
#ARCH Linux ppc64 BG /P xlf compiler with xlc # smpar dmpar dm+sm
@@ -1500,7 +1500,7 @@ M4 = m4 -B 14000
15001500
RANLIB = ranlib
15011501
RLFLAGS =
15021502
CC_TOOLS = cc
1503-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1503+
15041504

15051505
###########################################################
15061506
#ARCH Linux ppc64 IBM Blade Server xlf compiler with xlc # dmpar
@@ -1546,7 +1546,7 @@ M4 = m4 -B 14000
15461546
RANLIB = ranlib
15471547
RLFLAGS =
15481548
CC_TOOLS = xlc -q64
1549-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1549+
15501550

15511551
###########################################################
15521552
#ARCH Linux x86_64 ppc64le i486 i586 i686, PGI compiler with pgcc # serial smpar dmpar dm+sm
@@ -1590,7 +1590,7 @@ M4 = m4 -B 14000
15901590
RANLIB = ranlib
15911591
RLFLAGS =
15921592
CC_TOOLS = $(SCC)
1593-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1593+
15941594

15951595
###########################################################
15961596
#ARCH CYGWIN_NT i686, PGI compiler on Windows # serial smpar dmpar dm+sm
@@ -1634,7 +1634,7 @@ M4 = NA
16341634
RANLIB = ranlib
16351635
RLFLAGS =
16361636
CC_TOOLS = $(SCC)
1637-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1637+
16381638

16391639
LIB_EXTERNAL = \
16401640
../external/io_netcdf/libwrfio_nf.a CONFIGURE_NETCDF_PATH/lib/libnetcdf.lib \
@@ -1692,7 +1692,7 @@ M4 = m4 -B 14000
16921692
RANLIB = ranlib
16931693
RLFLAGS =
16941694
CC_TOOLS = $(SCC)
1695-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1695+
16961696

16971697
###########################################################
16981698
#ARCH Darwin x86_64 arm64, (MACOS) PGI compiler with pgcc -f90= #serial smpar dmpar dm+sm
@@ -1736,7 +1736,7 @@ M4 = m4 -B 14000
17361736
RANLIB = ranlib
17371737
RLFLAGS = -c
17381738
CC_TOOLS = cc
1739-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1739+
17401740

17411741
###########################################################
17421742
#ARCH Darwin x86_64 arm64, (MACOS) intel compiler with icc #serial smpar dmpar dm+sm
@@ -1783,7 +1783,7 @@ M4 = m4 -B 14000
17831783
RANLIB = ranlib
17841784
RLFLAGS = -c
17851785
CC_TOOLS = cc
1786-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1786+
17871787

17881788
###########################################################
17891789
#ARCH Darwin x86_64 arm64, (MACOS) gfortran with gcc openmpi #serial smpar dmpar dm+sm
@@ -1828,7 +1828,7 @@ M4 = m4 -B 14000
18281828
RANLIB = ranlib
18291829
RLFLAGS = -c
18301830
CC_TOOLS = $(SCC)
1831-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1831+
18321832

18331833
###########################################################
18341834
#ARCH Linux x86_64 ppc64le i486 i586 i686, PGI compiler with pgcc -f90= # serial smpar dmpar dm+sm
@@ -1872,7 +1872,7 @@ M4 = m4 -B 14000
18721872
RANLIB = ranlib
18731873
RLFLAGS =
18741874
CC_TOOLS = $(SCC)
1875-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1875+
18761876

18771877
###########################################################
18781878
#ARCH Linux HSW/BDW x86_64 ppc64le i486 i586 i686, ifort compiler with icc #serial smpar dmpar dm+sm
@@ -1917,7 +1917,7 @@ M4 = m4
19171917
RANLIB = ranlib
19181918
RLFLAGS =
19191919
CC_TOOLS = $(SCC)
1920-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1920+
19211921

19221922
###########################################################
19231923
#ARCH Linux KNL x86_64 ppc64le i486 i586 i686, ifort compiler with icc #serial smpar dmpar dm+sm
@@ -1962,7 +1962,7 @@ M4 = m4
19621962
RANLIB = ranlib
19631963
RLFLAGS =
19641964
CC_TOOLS = $(SCC)
1965-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
1965+
19661966

19671967
###########################################################
19681968
#ARCH CYGWIN_NT i686 x86_64 Cygwin, gfortran compiler with gcc #serial smpar dmpar dm+sm
@@ -2007,7 +2007,7 @@ M4 = m4 -G
20072007
RANLIB = ranlib
20082008
RLFLAGS =
20092009
CC_TOOLS = $(SCC)
2010-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
2010+
20112011

20122012
LIB_EXTERNAL = \
20132013
$(WRF_SRC_ROOT_DIR)/external/io_netcdf/libwrfio_nf.a CONFIGURE_NETCDF_PATH/lib/libnetcdf.dll.a \
@@ -2067,7 +2067,7 @@ M4 = m4 -G
20672067
RANLIB = ranlib
20682068
RLFLAGS =
20692069
CC_TOOLS = $(SCC)
2070-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
2070+
20712071

20722072
###########################################################
20732073
#ARCH AMD Linux x86_64, AOCC flang compiler with AOCC clang #serial smpar dmpar dm+sm
@@ -2120,7 +2120,7 @@ M4 = m4
21202120
RANLIB = llvm-ranlib
21212121
RLFLAGS =
21222122
CC_TOOLS = $(SCC)
2123-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
2123+
21242124

21252125
#insert new stanza here
21262126

@@ -2168,7 +2168,7 @@ M4 = m4
21682168
RANLIB = ranlib
21692169
RLFLAGS =
21702170
CC_TOOLS = $(SCC)
2171-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
2171+
21722172

21732173
###########################################################
21742174
#ARCH Linux aarch64, armclang compiler OpenMPI # serial smpar dmpar dm+sm
@@ -2337,7 +2337,7 @@ M4 = m4
23372337
RANLIB = ranlib
23382338
RLFLAGS =
23392339
CC_TOOLS = /usr/bin/gcc -Wall
2340-
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD
2340+
23412341

23422342
#insert new stanza before the Fujitsu block, keep Fujitsu at the end of the list
23432343
###########################################################

0 commit comments

Comments
 (0)