diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4263c6e871be60cfdfe1a64474bfc4f6040c645d..2dc554c00b7f8c9011f043f6a3ffe76717dd2247 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,26 +27,59 @@ show-env-vars: ### TEST JOBS ### ################# -eve.chs-conda01: +.common-test-job: stage: test - script: source eve.chs-conda01 + script: + - source $CI_JOB_NAME + - echo FC = $FC + - echo F77 = $F77 + - echo CC = $CC + - echo CXX = $CXX + - echo "NetCDF-C:" $(nc-config --version) + - echo "NetCDF-F:" $(nf-config --version) + - make --version + - cmake --version + - python --version + - pip list + +eve.chs-conda01: + extends: .common-test-job eve.chs-conda02: - stage: test - script: source eve.chs-conda02 + extends: .common-test-job + +eve.chs-conda03: + extends: .common-test-job + +eve.chs-conda04: + extends: .common-test-job eve.gfortran102: - stage: test - script: source eve.gfortran102 + extends: .common-test-job + +eve.gfortran102MPI: + extends: .common-test-job eve.gfortran122: - stage: test - script: source eve.gfortran122 + extends: .common-test-job + +eve.gfortran122MPI: + extends: .common-test-job eve.intel2020b: - stage: test - script: source eve.intel2020b + extends: .common-test-job -eve.intel2023b: - stage: test - script: source eve.intel2023b-llvm +eve.intel2020bMPI: + extends: .common-test-job + +eve.intel2023b-classic: + extends: .common-test-job + +eve.intel2023bMPI-classic: + extends: .common-test-job + +eve.intel2023b-llvm: + extends: .common-test-job + +eve.intel2023bMPI-llvm: + extends: .common-test-job diff --git a/README.md b/README.md index 0f91f19594bbce43d6168630bf1dae36e21d22bd..599803633f773440c72d23dee6cb38381cc226a4 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,12 @@ All these scripts will load: - pFUnit - Fortran unit testing framework ### Usage -- Conda environment with gfortran: +- Conda environment with GNU Compilers, Python and all dependencies for Documentation, Unit-Testing and Coverage: ```bash - source eve.chs-conda01 # or - source eve.chs-conda02 + source eve.chs-conda01 # Python 3.10, GNU 9.4 + source eve.chs-conda02 # Python 3.11, GNU 12.3 + source eve.chs-conda03 # Python 3.12, GNU 13.3 + source eve.chs-conda04 # Python 3.13, GNU 14.2 ``` - GNU 10.2 compiler (`foss/2020b` Toolchain): ```bash diff --git a/eve.chs-conda01 b/eve.chs-conda01 index a841714dce27aa9807db97a6a00bfb761ee5504c..8072fd2ada7f02c6d12ccc011977c1eaef72a152 100644 --- a/eve.chs-conda01 +++ b/eve.chs-conda01 @@ -1,7 +1,3 @@ module purge module use /global/apps/modulefiles module load chs-fortran-conda/0.1.0 -export FC=gfortran -export F77=gfortran -export CC=gcc -export CXX=g++ diff --git a/eve.chs-conda02 b/eve.chs-conda02 index dc1a67a41adc1a1402b88c3ce278724fde910c2f..4c7495b8663e696cc9cdf0368018fa7b053da108 100644 --- a/eve.chs-conda02 +++ b/eve.chs-conda02 @@ -1,7 +1,3 @@ module purge module use /global/apps/modulefiles module load chs-fortran-conda/0.2.0 -export FC=gfortran -export F77=gfortran -export CC=gcc -export CXX=g++ diff --git a/eve.chs-conda03 b/eve.chs-conda03 new file mode 100644 index 0000000000000000000000000000000000000000..bcb958c403a9e8627fc7e279d09d208ea40ceb8d --- /dev/null +++ b/eve.chs-conda03 @@ -0,0 +1,3 @@ +module purge +module use /global/apps/modulefiles +module load chs-fortran-conda/0.3.0 diff --git a/eve.chs-conda04 b/eve.chs-conda04 new file mode 100644 index 0000000000000000000000000000000000000000..b6ed1acfc3da866644d1107d9af2505e10939a57 --- /dev/null +++ b/eve.chs-conda04 @@ -0,0 +1,3 @@ +module purge +module use /global/apps/modulefiles +module load chs-fortran-conda/0.4.0