-
Notifications
You must be signed in to change notification settings - Fork 703
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ppc64le build fixes + ibm-clang #2116
Open
jstrodtb
wants to merge
1
commit into
wrf-model:develop
Choose a base branch
from
jstrodtb:ibm-build
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -771,7 +771,54 @@ CC_TOOLS = $(SCC) | |
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD | ||
|
||
########################################################### | ||
#ARCH Linux x86_64 ppc64le, gfortran compiler with gcc #serial smpar dmpar dm+sm | ||
#ARCH Linux ppc64le, gfortran compiler with gcc #serial smpar dmpar dm+sm | ||
# | ||
DESCRIPTION = GNU ($SFC/$SCC) | ||
DMPARALLEL = # 1 | ||
OMPCPP = # -D_OPENMP | ||
OMP = # -fopenmp | ||
OMPCC = # -fopenmp | ||
SFC = gfortran | ||
SCC = gcc | ||
CCOMP = gcc | ||
DM_FC = mpif90 -f90=$(SFC) | ||
DM_CC = mpicc -cc=$(SCC) | ||
FC = CONFIGURE_FC | ||
CC = CONFIGURE_CC | ||
LD = $(FC) | ||
RWORDSIZE = CONFIGURE_RWORDSIZE | ||
PROMOTION = #-fdefault-real-8 | ||
ARCH_LOCAL = -DNONSTANDARD_SYSTEM_SUBR CONFIGURE_D_CTSM | ||
# to validate WRF correctness on aarch64 against x86_64; compile with x86 this alternate ARCH_LOCAL option; able to achieve identical output model on ubuntu 18.04 with gcc 10.2 (on graviton and intel processors) | ||
# ARCH_LOCAL = -DNONSTANDARD_SYSTEM_SUBR CONFIGURE_D_CTSM -DAARCH64_X86_CORRECTNESS_FIX | ||
CFLAGS_LOCAL = -w -O3 -c # -DRSL0_ONLY | ||
LDFLAGS_LOCAL = | ||
CPLUSPLUSLIB = | ||
ESMF_LDFLAG = $(CPLUSPLUSLIB) | ||
FCOPTIM = -O2 -ftree-vectorize -funroll-loops | ||
FCREDUCEDOPT = $(FCOPTIM) | ||
FCNOOPT = -O0 | ||
FCDEBUG = # -g $(FCNOOPT) # -ggdb -fbacktrace -fcheck=bounds,do,mem,pointer -ffpe-trap=invalid,zero,overflow | ||
FORMAT_FIXED = -ffixed-form | ||
FORMAT_FREE = -ffree-form -ffree-line-length-none | ||
FCSUFFIX = | ||
FCCOMPAT = | ||
BYTESWAPIO = -fconvert=big-endian -frecord-marker=4 | ||
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(FCCOMPAT) | ||
FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) | ||
MODULE_SRCH_FLAG = | ||
TRADFLAG = CONFIGURE_TRADFLAG | ||
CPP = /lib/cpp -Uvector CONFIGURE_CPPFLAGS | ||
AR = ar | ||
ARFLAGS = ru | ||
M4 = m4 -G | ||
RANLIB = ranlib | ||
RLFLAGS = | ||
CC_TOOLS = $(SCC) | ||
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD | ||
|
||
########################################################### | ||
#ARCH Linux x86_64 , gfortran compiler with gcc #serial smpar dmpar dm+sm | ||
# | ||
DESCRIPTION = GNU ($SFC/$SCC) | ||
DMPARALLEL = # 1 | ||
|
@@ -1044,6 +1091,54 @@ RLFLAGS = -c | |
CC_TOOLS = $(SCC) | ||
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD | ||
|
||
########################################################### | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This new stanza should also be moved lower to the appropriate location |
||
#ARCH Linux ppc64le, (Linux) gfortran with clang #serial smpar dmpar dm+sm | ||
# | ||
DESCRIPTION = IBM ($SFC/bm-clang) | ||
DMPARALLEL = # 1 | ||
OMPCPP = # -D_OPENMP | ||
OMP = # -fopenmp | ||
OMPCC = # -fopenmp | ||
SFC = gfortran | ||
SCC = ibm-clang | ||
CCOMP = ibm-clang | ||
DM_FC = mpif90 -f90=$(SFC) | ||
DM_CC = mpicc -cc=$(SFC) | ||
FC = CONFIGURE_FC | ||
CC = CONFIGURE_CC | ||
LD = $(FC) | ||
RWORDSIZE = CONFIGURE_RWORDSIZE | ||
PROMOTION = #-fdefault-real-8 | ||
ARCH_LOCAL = -DNONSTANDARD_SYSTEM_SUBR -DNATIVE_MASSV | ||
CFLAGS_LOCAL = -w -Ofast -c # -DRSL0_ONLY | ||
LDFLAGS_LOCAL = | ||
CPLUSPLUSLIB = | ||
ESMF_LDFLAG = $(CPLUSPLUSLIB) | ||
FCOPTIM = -O2 -ftree-vectorize -funroll-loops | ||
FCREDUCEDOPT = $(FCOPTIM) | ||
FCNOOPT = -O0 | ||
FCDEBUG = # -g $(FCNOOPT) # -fbacktrace -ggdb -fcheck=bounds,do,mem,pointer -ffpe-trap=invalid,zero,overflow | ||
FORMAT_FIXED = -ffixed-form | ||
FORMAT_FREE = -ffree-form -ffree-line-length-none | ||
FCSUFFIX = | ||
FCCOMPAT = | ||
BYTESWAPIO = -fconvert=big-endian -frecord-marker=4 | ||
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(FCCOMPAT) | ||
FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) | ||
MODULE_SRCH_FLAG = | ||
TRADFLAG = CONFIGURE_TRADFLAG | ||
CPP = cpp -Uvector CONFIGURE_CPPFLAGS -xassembler-with-cpp | ||
AR = ar | ||
ARFLAGS = ru | ||
M4 = m4 -B 14000 | ||
RANLIB = ranlib | ||
RLFLAGS = -c | ||
CC_TOOLS = $(SCC) | ||
NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD | ||
|
||
|
||
|
||
|
||
########################################################### | ||
#ARCH Darwin x86_64 arm64, (MACOS) gfortran with clang #serial smpar dmpar dm+sm | ||
# | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a comment in
configure.defaults
(#insert new stanza here
) showing where new stanzas should be made. While this may not be entirely new and more of a split up of the x86_64 and ppc64le architectures, certain tests assume the position of stanzas with an emphasis on the specific location of x86_64.This new ppc64le stanza should be moved lower to the appropriate location.