From 630964626c1162f53aa5be38d2dc9dac1de47b88 Mon Sep 17 00:00:00 2001 From: Lauren Chilutti Date: Wed, 23 Oct 2024 15:41:28 -0400 Subject: [PATCH 1/2] updates to am5_compile yamls to work on amd with intel oneapi 2024.2 ifx/icx compiler --- am5-compile/am5.yaml | 2 +- am5-compile/compile.yaml | 6 +++--- am5-compile/platforms.yaml | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/am5-compile/am5.yaml b/am5-compile/am5.yaml index 60c1b2c..deba537 100644 --- a/am5-compile/am5.yaml +++ b/am5-compile/am5.yaml @@ -34,7 +34,7 @@ fre_properties: # compile information - &release "f1a1r1" - - &INTEL "intel-classic" + - &INTEL "oneapi" - &FMSincludes "-IFMS/fms2_io/include -IFMS/include -IFMS/mpp/include" - &momIncludes "-Imom6/MOM6-examples/src/MOM6/pkg/CVMix-src/include -Imom6/MOM6-examples/src/MOM6/src/framework" diff --git a/am5-compile/compile.yaml b/am5-compile/compile.yaml index 39133e2..4f385e0 100644 --- a/am5-compile/compile.yaml +++ b/am5-compile/compile.yaml @@ -6,7 +6,7 @@ compile: - component: "FMS" repo: "https://github.com/NOAA-GFDL/FMS.git" branch: "2024.01" - cppdefs: "-DHAVE_GETTID -DINTERNAL_FILE_NML -Duse_libMPI -Duse_netCDF" + cppdefs: "-DINTERNAL_FILE_NML -Duse_libMPI -Duse_netCDF" otherFlags: *FMSincludes - component: "GRTCODE" repo: "https://github.com/NOAA-GFDL/GRTCODE.git" @@ -69,7 +69,7 @@ compile: branch: "2023.04" paths: ["atmos_drivers/coupled"] cppdefs: "-DINTERNAL_FILE_NML -DSPMD -DCLIMATE_NUDGE" - otherFlags: "$(FMSincludes)" + otherFlags: *FMSincludes - component: "land_lad2" requires: ["FMS"] repo: "https://gitlab.gfdl.noaa.gov/FMS/land_lad2.git" @@ -112,4 +112,4 @@ compile: repo: "https://github.com/NOAA-GFDL/FMScoupler.git" branch: "2023.04" paths: ["FMScoupler/full", "FMScoupler/shared"] - otherFlags: !join [*FMSincludes, " ", *momIncludes] \ No newline at end of file + otherFlags: !join [*FMSincludes, " ", *momIncludes] diff --git a/am5-compile/platforms.yaml b/am5-compile/platforms.yaml index 60d1aad..586b675 100644 --- a/am5-compile/platforms.yaml +++ b/am5-compile/platforms.yaml @@ -1,4 +1,11 @@ platforms: + - name: amd.inteloneapi + compiler: intel + modules: [ !join [*INTEL, "/2024.2"],compiler/2024.2,mpi,netcdf/4.9.2,hdf5/1.14.4-3,libyaml/0.2.5] + fc: mpiifx + cc: mpiicx + mkTemplate: !join ["/home/Lauren.Chilutti/mkmf/templates/ncrc5-intel-", *INTEL, ".mk"] + modelRoot: ${HOME}/fremake_canopy/test - name: ncrc5.intel compiler: intel modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] From ab5163091117559424443cb1cc4679dffb4c905a Mon Sep 17 00:00:00 2001 From: Lauren Chilutti Date: Wed, 13 Nov 2024 12:11:56 -0500 Subject: [PATCH 2/2] updating amd configuration to platforms.yaml --- AM5/am5-compile/am5.yaml | 2 +- AM5/am5-compile/compile.yaml | 2 +- AM5/am5-compile/platforms.yaml | 15 +++++++++++++++ SHiELD/SHiELD-compile/platforms.yaml | 10 +++++----- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/AM5/am5-compile/am5.yaml b/AM5/am5-compile/am5.yaml index 2cac72f..838276e 100644 --- a/AM5/am5-compile/am5.yaml +++ b/AM5/am5-compile/am5.yaml @@ -34,7 +34,7 @@ fre_properties: # compile information - &release "f1a1r1" - - &INTEL "oneapi" + - &INTEL "intel-classic" - &FMSincludes "-IFMS/fms2_io/include -IFMS/include -IFMS/mpp/include" - &momIncludes "-Imom6/MOM6-examples/src/MOM6/pkg/CVMix-src/include -Imom6/MOM6-examples/src/MOM6/src/framework" - &MOM6_EXAMPLES_GIT_TAG "753f135" diff --git a/AM5/am5-compile/compile.yaml b/AM5/am5-compile/compile.yaml index ebc8673..52e8cdf 100644 --- a/AM5/am5-compile/compile.yaml +++ b/AM5/am5-compile/compile.yaml @@ -6,7 +6,7 @@ compile: - component: "FMS" repo: "https://github.com/NOAA-GFDL/FMS.git" branch: "2024.02" - cppdefs: "-DHAVE_GETTID -DINTERNAL_FILE_NML -Duse_libMPI -Duse_netCDF" + cppdefs: "-DINTERNAL_FILE_NML -Duse_libMPI -Duse_netCDF" otherFlags: *FMSincludes - component: "GRTCODE" repo: "https://github.com/NOAA-GFDL/GRTCODE.git" diff --git a/AM5/am5-compile/platforms.yaml b/AM5/am5-compile/platforms.yaml index 5ea39ba..834200f 100644 --- a/AM5/am5-compile/platforms.yaml +++ b/AM5/am5-compile/platforms.yaml @@ -1,4 +1,19 @@ platforms: + - name: amd.inteloneapi + compiler: intel + modules: [ oneapi/2024.2,compiler/2024.2.0,mpi,netcdf/4.9.2,hdf5/1.14.5,libyaml/0.2.5] + fc: mpiifx + cc: mpiicx + mkTemplate: /home/Lauren.Chilutti/mkmf/templates/amd-intel-oneapi.mk + modelRoot: ${HOME}/fremake_canopy/test + - name: ncrc5.intel + compiler: intel + modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] + modules: [ !join [*INTEL, "/2022.2.1"],"fre/bronx-20",cray-hdf5/1.12.2.3, cray-netcdf/4.9.0.3] + fc: ftn + cc: cc + mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-20/site/ncrc5/", *INTEL, ".mk"] + modelRoot: ${HOME}/fremake_canopy/test - name: ncrc5.intel23 compiler: intel modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] diff --git a/SHiELD/SHiELD-compile/platforms.yaml b/SHiELD/SHiELD-compile/platforms.yaml index 586b675..834200f 100644 --- a/SHiELD/SHiELD-compile/platforms.yaml +++ b/SHiELD/SHiELD-compile/platforms.yaml @@ -1,10 +1,10 @@ platforms: - name: amd.inteloneapi compiler: intel - modules: [ !join [*INTEL, "/2024.2"],compiler/2024.2,mpi,netcdf/4.9.2,hdf5/1.14.4-3,libyaml/0.2.5] + modules: [ oneapi/2024.2,compiler/2024.2.0,mpi,netcdf/4.9.2,hdf5/1.14.5,libyaml/0.2.5] fc: mpiifx - cc: mpiicx - mkTemplate: !join ["/home/Lauren.Chilutti/mkmf/templates/ncrc5-intel-", *INTEL, ".mk"] + cc: mpiicx + mkTemplate: /home/Lauren.Chilutti/mkmf/templates/amd-intel-oneapi.mk modelRoot: ${HOME}/fremake_canopy/test - name: ncrc5.intel compiler: intel @@ -17,10 +17,10 @@ platforms: - name: ncrc5.intel23 compiler: intel modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] - modules: [!join [*INTEL, "/2023.1.0"],"fre/bronx-20",cray-hdf5/1.12.2.3, cray-netcdf/4.9.0.3] + modules: [!join [*INTEL, "/2023.2.0"], cray-hdf5/1.12.2.11, cray-netcdf/4.9.0.9] fc: ftn cc: cc - mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-20/site/ncrc5/", *INTEL, ".mk"] + mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-22/site/ncrc5/", *INTEL, ".mk"] modelRoot: ${HOME}/fremake_canopy/test - name: hpcme.2023 compiler: intel