diff options
| author | AMD Toolchain Support <73240730+amd-toolchain-support@users.noreply.github.com> | 2021-01-11 16:43:59 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 12:13:59 +0100 |
| commit | de3504ca2965e8cdba4e615d6bcb590f274aebef (patch) | |
| tree | f55e847e07bc5d39c6e3cce4dccb2ab826242a5b | |
| parent | ec0226ec6efcca4b823e39e7215f63f9c27fe1de (diff) | |
| download | spack-de3504ca2965e8cdba4e615d6bcb590f274aebef.tar.gz spack-de3504ca2965e8cdba4e615d6bcb590f274aebef.tar.bz2 spack-de3504ca2965e8cdba4e615d6bcb590f274aebef.tar.xz spack-de3504ca2965e8cdba4e615d6bcb590f274aebef.zip | |
wrf: add AOCC support for v4.2 (#20772)
4 files changed, 90 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index 196c5efc97..36c7c2496d 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -130,6 +130,8 @@ class Wrf(Package): patch("patches/4.2/Makefile.patch", when="@4.2") patch("patches/4.2/tirpc_detect.patch", when="@4.2") patch("patches/4.2/add_aarch64.patch", when="@4.2") + patch("patches/4.2/configure4.2_aocc.patch", when="@4.2 %aocc@:3.0") + patch("patches/4.2/derf_fix.patch", when="@4.2 %aocc@:3.0") depends_on("pkgconfig", type=("build")) depends_on("libtirpc") @@ -258,6 +260,28 @@ class Wrf(Package): ) ofh.write(line) + if self.spec.satisfies("@4.2 %aocc"): + # In version 4.2 the file to be patched is called + # configure.defaults, while in earlier versions + # it's configure_new.defaults + rename( + "./arch/configure.defaults", + "./arch/configure.defaults.bak", + ) + with open("./arch/configure.defaults.bak", "rt") as ifh: + with open("./arch/configure.defaults", "wt") as ofh: + for line in ifh: + if line.startswith("DM_"): + line = line.replace( + "mpif90 -DMPI2_SUPPORT", + self.spec['mpi'].mpifc + " -DMPI2_SUPPORT" + ) + line = line.replace( + "mpicc -DMPI2_SUPPORT", + self.spec['mpi'].mpicc + " -DMPI2_SUPPORT" + ) + ofh.write(line) + def configure(self, spec, prefix): # Remove broken default options... diff --git a/var/spack/repos/builtin/packages/wrf/patches/3.9/configure_aocc.patch b/var/spack/repos/builtin/packages/wrf/patches/3.9/configure_aocc.patch index 13b41a46b2..cbdcf702dd 100644 --- a/var/spack/repos/builtin/packages/wrf/patches/3.9/configure_aocc.patch +++ b/var/spack/repos/builtin/packages/wrf/patches/3.9/configure_aocc.patch @@ -23,7 +23,7 @@ +RWORDSIZE = $(NATIVE_RWORDSIZE) +PROMOTION = +ARCH_LOCAL = -DNONSTANDARD_SYSTEM_SUBR -DWRF_USE_CLM -+LIBMVEC = -mllvm --vector-library=LIBMVEC ++LIBMVEC = -mllvm -vector-library=LIBMVEC +AMDARCHOPT = -march=native +AOCCOPT = -O3 -m64 -Ofast -ffast-math $(AMDARCHOPT) +CFLAGS_LOCAL = -w $(AOCCOPT) diff --git a/var/spack/repos/builtin/packages/wrf/patches/4.2/configure4.2_aocc.patch b/var/spack/repos/builtin/packages/wrf/patches/4.2/configure4.2_aocc.patch new file mode 100644 index 0000000000..12417bf698 --- /dev/null +++ b/var/spack/repos/builtin/packages/wrf/patches/4.2/configure4.2_aocc.patch @@ -0,0 +1,54 @@ +--- WRF-4.2/arch/configure.defaults 2020-04-23 22:38:37.000000000 +0530 ++++ WRF-4.2/arch/configure_42_aocc22.defaults 2020-12-28 08:22:49.253214150 +0530 +@@ -1975,6 +1975,51 @@ + $(WRF_SRC_ROOT_DIR)/frame/pack_utils.o + + #insert new stanza here ++############################################################# ++#ARCH AMD EPYC Linux x86_64 AOCC Compilers #dm+sm ++# ++DESCRIPTION = AMD AOCC ($SFC/$SCC): EPYC ++DMPARALLEL = 1 ++OMPCPP = -D_OPENMP ++OMP = -fopenmp ++OMPCC = -fopenmp -Mpreprocess ++SFC = flang ++SCC = clang ++CCOMP = clang ++DM_FC = mpif90 -DMPI2_SUPPORT ++DM_CC = mpicc -DMPI2_SUPPORT ++FC = time $(DM_FC) ++CC = $(DM_CC) -DFSEEKO64_OK ++LD = $(FC) ++RWORDSIZE = $(NATIVE_RWORDSIZE) ++PROMOTION = ++ARCH_LOCAL = -DNONSTANDARD_SYSTEM_SUBR -DWRF_USE_CLM ++LIBMVEC = -mllvm -vector-library=LIBMVEC ++AMDARCHOPT = -march=native ++AOCCOPT = -O3 -m64 -Ofast -ffast-math -g $(AMDARCHOPT) ++CFLAGS_LOCAL = -w $(AOCCOPT) ++LDFLAGS_LOCAL = -lm -ltirpc -lamdlibm -ljemalloc -lmvec $(AOCCOPT) ++CPLUSPLUSLIB = ++ESMF_LDFLAG = $(CPLUSPLUSLIB) ++FCOPTIM = $(AOCCOPT) -fopenmp ++FCREDUCEDOPT = -O2 -Ofast -ffast-math ++FCNOOPT = -O0 -ffast-math ++FCDEBUG = #-g ++FORMAT_FIXED = -Mfixed ++FORMAT_FREE = -Mfreeform ++FCSUFFIX = ++BYTESWAPIO = -Mbyteswapio ++FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) -ffast-math ++FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) ++MODULE_SRCH_FLAG = ++TRADFLAG = -traditional ++CPP = /lib/cpp -P ++AR = llvm-ar ++ARFLAGS = ru ++M4 = m4 ++RANLIB = llvm-ranlib ++RLFLAGS = ++CC_TOOLS = $(SCC) + + ########################################################### + #ARCH Fujitsu FX10/FX100 Linux x86_64 SPARC64IXfx/SPARC64Xlfx, mpifrtpx and mpifccpx compilers #serial smpar dmpar dm+sm diff --git a/var/spack/repos/builtin/packages/wrf/patches/4.2/derf_fix.patch b/var/spack/repos/builtin/packages/wrf/patches/4.2/derf_fix.patch new file mode 100644 index 0000000000..227c467352 --- /dev/null +++ b/var/spack/repos/builtin/packages/wrf/patches/4.2/derf_fix.patch @@ -0,0 +1,11 @@ +--- WRF-4.2/phys/module_mp_SBM_polar_radar.F 2020-04-23 22:38:37.000000000 +0530 ++++ WRF-4.2/phys/module_mp_SBM_polar_radar_aocc.F 2020-12-29 11:45:52.329495585 +0530 +@@ -1534,7 +1534,7 @@ + (1.0d0-(1.0d0-fract_volume_water)*ratc)) + ! new change 18.01.09 (start) + if(fract_volume_water.gt.1.0d-10) then +- t=derf((1.0d0-fract_volume_water)/fract_volume_water-0.2d0) ++ t=erf((1.0d0-fract_volume_water)/fract_volume_water-0.2d0) + else + t=1.0d0 + endif |