Add ifx executor (#87)

* Add ifx executor

* Update changelog for release

CHANGELOG.md

@@ -6,10 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.0.0] - 2024-08-23
+
+Note: This is a major version bump due to the change from `intel` to `ifort` and `ifx` executors.
+So older v3 based CI will need to change their `.circleci/config.yml` to use the new executors.
+
 ### Added
 
+- Added new `ifx` executor as we transition from `ifort` to `ifx`
+
 ### Changed
 
+- Changed the `ifort` executor to use newly named Docker images
+
 ### Removed
 
 ## [3.4.0] - 2024-07-23

src/examples/build_geosgcm_with_commands.yml

@@ -12,7 +12,7 @@ usage:
             name: build-GEOSgcm-on-<< matrix.compiler >>
             matrix:
               parameters:
-                compiler: [gfortran, ifort]
+                compiler: [gfortran, ifort, ifx]
             context:
               - docker-hub-creds
   jobs:

src/examples/build_geosgcm_with_job.yml

@@ -12,7 +12,7 @@ usage:
             name: build-GEOSgcm-on-<< matrix.compiler >>
             matrix:
               parameters:
-                compiler: [gfortran, ifort]
+                compiler: [gfortran, ifort, ifx]
             repo: GEOSgcm
             checkout_fixture: true
             context:

src/executors/README.md

@@ -5,6 +5,7 @@ CircleCI jobs. We currently define two executors:
 
 1. gfortran
 2. ifort
+3. ifx
 
 These are named to match the Fortran compiler.
 

src/executors/ifort.yml

@@ -12,7 +12,7 @@ parameters:
     type: string
 
 docker:
-  - image: gmao/ubuntu20-geos-env:<< parameters.baselibs_version >>-intelmpi_2021.13-intel_2024.2
+  - image: gmao/ubuntu20-geos-env:<< parameters.baselibs_version >>-intelmpi_2021.13-ifort_2021.13
     auth:
       username: $DOCKERHUB_USER
       password: $DOCKERHUB_AUTH_TOKEN

src/executors/ifort_bcs.yml

@@ -16,7 +16,7 @@ parameters:
     type: string
 
 docker:
-  - image: gmao/ubuntu20-geos-env-bcs:<< parameters.baselibs_version >>-intelmpi_2021.13-intel_2024.2-bcs_<< parameters.bcs_version >>
+  - image: gmao/ubuntu20-geos-env-bcs:<< parameters.baselibs_version >>-intelmpi_2021.13-ifort_2021.13-bcs_<< parameters.bcs_version >>
     auth:
       username: $DOCKERHUB_USER
       password: $DOCKERHUB_AUTH_TOKEN

src/executors/ifx.yml

@@ -0,0 +1,20 @@
+description: >
+  GEOS-ESM ifx docker executor
+
+parameters:
+  resource_class:
+    description: "Resource class to use"
+    default: large
+    type: string
+  baselibs_version:
+    description: "Version of Baselibs to use"
+    default: v8.5.0
+    type: string
+
+docker:
+  - image: gmao/ubuntu20-geos-env:<< parameters.baselibs_version >>-intelmpi_2021.13-ifx_2024.2
+    auth:
+      username: $DOCKERHUB_USER
+      password: $DOCKERHUB_AUTH_TOKEN
+
+resource_class: << parameters.resource_class >>

src/executors/ifx_bcs.yml

@@ -0,0 +1,24 @@
+description: >
+  GEOS-ESM ifx docker executor with boundary conditions
+
+parameters:
+  resource_class:
+    description: "Resource class to use"
+    default: large
+    type: string
+  baselibs_version:
+    description: "Version of Baselibs to use"
+    default: v8.5.0
+    type: string
+  bcs_version:
+    description: "Version of boundary conditions to use"
+    default: v11.6.0
+    type: string
+
+docker:
+  - image: gmao/ubuntu20-geos-env-bcs:<< parameters.baselibs_version >>-intelmpi_2021.13-ifx_2024.2-bcs_<< parameters.bcs_version >>
+    auth:
+      username: $DOCKERHUB_USER
+      password: $DOCKERHUB_AUTH_TOKEN
+
+resource_class: << parameters.resource_class >>

src/jobs/build.yml

@@ -10,7 +10,7 @@ parameters:
     type: enum
     default: ifort
     description: "Compiler to use"
-    enum: ["ifort", "gfortran"]
+    enum: ["ifort", "gfortran", "ifx"]
   resource_class:
     type: enum
     default: large

src/jobs/publish_docker.yml

@@ -43,9 +43,9 @@ parameters:
     description: "Base Docker Image Name"
   compiler_name:
     type: enum
-    default: intel
+    default: ifort
     description: "Compiler Name on image"
-    enum: ["intel", "gcc"]
+    enum: ["ifort", "gcc", "ifx"]
   compiler_version:
     type: string
     default: ""

src/jobs/run_fv3.yml

@@ -10,7 +10,7 @@ parameters:
     type: enum
     default: ifort
     description: "Compiler to use"
-    enum: ["ifort", "gfortran"]
+    enum: ["ifort", "gfortran", "ifx"]
   resource_class:
     type: enum
     default: large

src/jobs/run_gcm.yml

@@ -10,7 +10,7 @@ parameters:
     type: enum
     default: ifort
     description: "Compiler to use"
-    enum: ["ifort", "gfortran"]
+    enum: ["ifort", "gfortran", "ifx"]
   resource_class:
     type: enum
     default: xlarge

src/jobs/run_mapl_tutorial.yml

@@ -10,7 +10,7 @@ parameters:
     type: enum
     default: ifort
     description: "Compiler to use"
-    enum: ["ifort", "gfortran"]
+    enum: ["ifort", "gfortran", "ifx"]
   resource_class:
     type: enum
     default: medium