From 063f52c7955ca9fd852f18aa265035945c2e85ef Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 9 Aug 2024 13:36:49 -0400 Subject: [PATCH 1/7] Test adding ifx to CI --- .circleci/config.yml | 16 ++++++++-------- CHANGELOG.md | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a1c854571f0..843ef782b78f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ bcs_version: &bcs_version v11.5.0 tag_build_arg_name: &tag_build_arg_name maplversion orbs: - ci: geos-esm/circleci-tools@2 + ci: geos-esm/circleci-tools@dev:7a293ebb2b990390aa4559ce69af7682bfca2cc1 workflows: build-and-test-MAPL: @@ -33,7 +33,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] cmake_generator: ['Unix Makefiles','Ninja'] baselibs_version: *baselibs_version repo: MAPL @@ -49,7 +49,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] baselibs_version: *baselibs_version repo: MAPL mepodevelop: false @@ -67,7 +67,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] tutorial_name: - hello_world - parent_no_children @@ -89,7 +89,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] baselibs_version: *baselibs_version repo: GEOSgcm checkout_fixture: true @@ -104,7 +104,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -118,7 +118,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -136,7 +136,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran,ifort] + compiler: [gfortran, ifort, ifx] baselibs_version: *baselibs_version repo: GEOSldas mepodevelop: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b007a0a7842..f8cd96e61de8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Improve mask sampler by adding an MPI step and a LS_chunk (intermediate step) - Update Baselibs in CI to 7.25.0 - NOTE: The docker image also updates to Intel 2024.2 and Intel MPI 2021.13 +- Update to circleci-tools orb v4 + - This adds a new `ifx` CI test - Update `components.yaml` - ESMA_env v4.30.0 - Update to Baselibs 7.25.0 From 1d42fdb8c72a9806a1e38b905b94500496e12e91 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 9 Aug 2024 13:39:27 -0400 Subject: [PATCH 2/7] Fix up CI --- .circleci/config.yml | 21 +++++++++++++++++++-- .github/workflows/workflow.yml | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 843ef782b78f..364232f596fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -171,7 +171,7 @@ workflows: filters: tags: only: /^v.*$/ - name: publish-intel-docker-image + name: publish-ifort-docker-image context: - docker-hub-creds - ghcr-creds @@ -180,7 +180,24 @@ workflows: container_name: mapl mpi_name: intelmpi mpi_version: "2021.13" - compiler_name: intel + compiler_name: ifort + compiler_version: "2021.13" + image_name: geos-env + tag_build_arg_name: *tag_build_arg_name + - ci/publish_docker: + filters: + tags: + only: /^v.*$/ + name: publish-ifx-docker-image + context: + - docker-hub-creds + - ghcr-creds + os_version: *os_version + baselibs_version: *baselibs_version + container_name: mapl + mpi_name: intelmpi + mpi_version: "2021.13" + compiler_name: ifx compiler_version: "2024.2" image_name: geos-env tag_build_arg_name: *tag_build_arg_name diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 76ed2d251565..d6c9d61fbf4d 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -86,7 +86,7 @@ jobs: name: Build and Test MAPL Intel runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env:v7.25.0-intelmpi_2021.13-intel_2024.2 + image: gmao/ubuntu20-geos-env:v7.25.0-intelmpi_2021.13-ifort_2021.13 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests From 7a32c16de3ddefddfa3924bceb9f191f7705df70 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 9 Aug 2024 14:59:14 -0400 Subject: [PATCH 3/7] Clean up changelog --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8cd96e61de8..48cd72b808ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,10 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added Fortran interface to UDUNITS2 - NOTE: This now means MAPL depends on UDUNITS2 (and transitively, expat) - Improve mask sampler by adding an MPI step and a LS_chunk (intermediate step) -- Update Baselibs in CI to 7.25.0 - - NOTE: The docker image also updates to Intel 2024.2 and Intel MPI 2021.13 -- Update to circleci-tools orb v4 - - This adds a new `ifx` CI test +- CI Updates + - Update Baselibs in CI to 7.25.0 + - Update to circleci-tools orb v4 + - This adds an `ifx` test along with the `ifort` test - Update `components.yaml` - ESMA_env v4.30.0 - Update to Baselibs 7.25.0 From 07ce760f49fd31869df6e50bbe3d2cc4d5da2e99 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 12 Aug 2024 08:13:48 -0400 Subject: [PATCH 4/7] Update bcs in CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 364232f596fe..0a0dfe7c4933 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu20 baselibs_version: &baselibs_version v7.25.0 -bcs_version: &bcs_version v11.5.0 +bcs_version: &bcs_version v11.6.0 tag_build_arg_name: &tag_build_arg_name maplversion orbs: From 72e4e7b3da1ad45722e728cb2a579c2622a4369b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 12 Aug 2024 08:52:28 -0400 Subject: [PATCH 5/7] Turn off ifx. Too many errors --- .circleci/config.yml | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a0dfe7c4933..a108257bc091 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] cmake_generator: ['Unix Makefiles','Ninja'] baselibs_version: *baselibs_version repo: MAPL @@ -49,7 +49,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] baselibs_version: *baselibs_version repo: MAPL mepodevelop: false @@ -67,7 +67,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] tutorial_name: - hello_world - parent_no_children @@ -89,7 +89,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] baselibs_version: *baselibs_version repo: GEOSgcm checkout_fixture: true @@ -104,7 +104,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -118,7 +118,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -136,7 +136,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] baselibs_version: *baselibs_version repo: GEOSldas mepodevelop: false @@ -184,23 +184,23 @@ workflows: compiler_version: "2021.13" image_name: geos-env tag_build_arg_name: *tag_build_arg_name - - ci/publish_docker: - filters: - tags: - only: /^v.*$/ - name: publish-ifx-docker-image - context: - - docker-hub-creds - - ghcr-creds - os_version: *os_version - baselibs_version: *baselibs_version - container_name: mapl - mpi_name: intelmpi - mpi_version: "2021.13" - compiler_name: ifx - compiler_version: "2024.2" - image_name: geos-env - tag_build_arg_name: *tag_build_arg_name + #- ci/publish_docker: + #filters: + #tags: + #only: /^v.*$/ + #name: publish-ifx-docker-image + #context: + #- docker-hub-creds + #- ghcr-creds + #os_version: *os_version + #baselibs_version: *baselibs_version + #container_name: mapl + #mpi_name: intelmpi + #mpi_version: "2021.13" + #compiler_name: ifx + #compiler_version: "2024.2" + #image_name: geos-env + #tag_build_arg_name: *tag_build_arg_name - ci/publish_docker: filters: tags: From eae35b6c8a582dd47eaf4c5e67654db7a6ebfd63 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 23 Aug 2024 13:47:52 -0400 Subject: [PATCH 6/7] Update to v4 orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a108257bc091..0de92fb286bb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ bcs_version: &bcs_version v11.6.0 tag_build_arg_name: &tag_build_arg_name maplversion orbs: - ci: geos-esm/circleci-tools@dev:7a293ebb2b990390aa4559ce69af7682bfca2cc1 + ci: geos-esm/circleci-tools@4 workflows: build-and-test-MAPL: From 3ab3950f5c61c66813b2be89b22877031ebd1b08 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 23 Aug 2024 13:49:14 -0400 Subject: [PATCH 7/7] Clarify changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38ecf293a14b..9a376b7ece9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - CI Updates - Update Baselibs in CI to 7.25.0 - Update to circleci-tools orb v4 - - This adds an `ifx` test along with the `ifort` test + - This adds the ability to do an `ifx` test along with the `ifort` test (though `ifx` is not yet enabled) - Update `components.yaml` - ESMA_env v4.30.0 - Update to Baselibs 7.25.0