-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/#328/geos-v10.17.6/gocart2g/new-extdata
- Loading branch information
Showing
7 changed files
with
86 additions
and
110 deletions.
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 |
|---|---|---|
| @@ -1,49 +1,7 @@ | ||
| version: 2.1 | ||
|
|
||
| executors: | ||
| gfortran-large: | ||
| docker: | ||
| - image: gmao/ubuntu20-geos-env-bcs:v6.2.8-openmpi_4.0.6-gcc_11.2.0-bcs_v10.19.4 | ||
| auth: | ||
| username: $DOCKERHUB_USER | ||
| password: $DOCKERHUB_AUTH_TOKEN | ||
| environment: | ||
| OMPI_ALLOW_RUN_AS_ROOT: 1 | ||
| OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 | ||
| OMPI_MCA_btl_vader_single_copy_mechanism: none | ||
| resource_class: large | ||
| #MEDIUM# resource_class: medium | ||
|
|
||
| gfortran-xlarge: | ||
| docker: | ||
| - image: gmao/ubuntu20-geos-env-bcs:v6.2.8-openmpi_4.0.6-gcc_11.2.0-bcs_v10.19.4 | ||
| auth: | ||
| username: $DOCKERHUB_USER | ||
| password: $DOCKERHUB_AUTH_TOKEN | ||
| environment: | ||
| OMPI_ALLOW_RUN_AS_ROOT: 1 | ||
| OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 | ||
| OMPI_MCA_btl_vader_single_copy_mechanism: none | ||
| resource_class: xlarge | ||
| #MEDIUM# resource_class: medium | ||
|
|
||
| ifort-large: | ||
| docker: | ||
| - image: gmao/ubuntu20-geos-env-bcs:v6.2.8-intelmpi_2021.3.0-intel_2021.3.0-bcs_v10.19.4 | ||
| auth: | ||
| username: $DOCKERHUB_USER | ||
| password: $DOCKERHUB_AUTH_TOKEN | ||
| resource_class: large | ||
| #MEDIUM# resource_class: medium | ||
|
|
||
| ifort-xlarge: | ||
| docker: | ||
| - image: gmao/ubuntu20-geos-env-bcs:v6.2.8-intelmpi_2021.3.0-intel_2021.3.0-bcs_v10.19.4 | ||
| auth: | ||
| username: $DOCKERHUB_USER | ||
| password: $DOCKERHUB_AUTH_TOKEN | ||
| resource_class: xlarge | ||
| #MEDIUM# resource_class: medium | ||
| orbs: | ||
| circleci-tools: geos-esm/[email protected] | ||
|
|
||
| workflows: | ||
| build-test: | ||
|
|
@@ -72,55 +30,21 @@ jobs: | |
| parameters: | ||
| compiler: | ||
| type: string | ||
| executor: << parameters.compiler >>-large | ||
| executor: | ||
| name: circleci-tools/<< parameters.compiler >> | ||
| resource_class: large | ||
| working_directory: /root/project | ||
| steps: | ||
| - checkout: | ||
| path: GEOSgcm | ||
| - run: | ||
| name: "Versions etc" | ||
| command: mpirun --version && << parameters.compiler>> --version && echo $BASEDIR && pwd && ls | ||
| - run: | ||
| name: "Mepo clone external repos" | ||
| command: | | ||
| cd ${CIRCLE_WORKING_DIRECTORY}/GEOSgcm | ||
| mepo clone | ||
| mepo status | ||
| - run: | ||
| name: "Mepo checkout-if-exists" | ||
| command: | | ||
| cd ${CIRCLE_WORKING_DIRECTORY}/GEOSgcm | ||
| echo "${CIRCLE_BRANCH}" | ||
| if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ] | ||
| then | ||
| mepo checkout-if-exists ${CIRCLE_BRANCH} | ||
| fi | ||
| mepo status | ||
| - run: | ||
| name: "CMake" | ||
| command: | | ||
| mkdir -p /logfiles | ||
| cd ${CIRCLE_WORKING_DIRECTORY}/GEOSgcm | ||
| mkdir -p ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSgcm | ||
| cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSgcm | ||
| cmake ${CIRCLE_WORKING_DIRECTORY}/GEOSgcm -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=<< parameters.compiler >> -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${CIRCLE_WORKING_DIRECTORY}/workspace/install-GEOSgcm -DUSE_F2PY=OFF |& tee /logfiles/cmake.log | ||
| - run: | ||
| name: "Build and install" | ||
| command: | | ||
| cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSgcm | ||
| make -j"$(nproc)" install |& tee /logfiles/make.log | ||
| #MEDIUM# make -j4 install |& tee /logfiles/make.log | ||
| - run: | ||
| name: "Retry build and install after failure" | ||
| command: | | ||
| cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSgcm | ||
| make -j"$(nproc)" install |& tee /logfiles/make-retry.log | ||
| #MEDIUM# make -j4 install |& tee /logfiles/make-retry.log | ||
| when: on_fail | ||
| - run: | ||
| name: "Compress artifacts" | ||
| command: | | ||
| gzip -9 /logfiles/* | ||
| - circleci-tools/versions: | ||
| compiler: << parameters.compiler >> | ||
| - circleci-tools/mepoclone | ||
| - circleci-tools/checkout_if_exists | ||
| - circleci-tools/cmake: | ||
| compiler: << parameters.compiler >> | ||
| - circleci-tools/buildinstall | ||
| - circleci-tools/compress_artifacts | ||
| - store_artifacts: | ||
| path: /logfiles | ||
| # We need to persist the install for the next step | ||
|
|
||
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
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
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /* | ||
| !/rrtmgp/data |