From f81fb4cc51db0df4ad0cd69002dae7fa6c01d009 Mon Sep 17 00:00:00 2001 From: loganoz Date: Thu, 21 Nov 2024 12:28:19 +0100 Subject: [PATCH] Additional changes in all CI for ifx --- .github/workflows/CI_parallel.yml | 16 ++++++++-------- .github/workflows/CI_sequential 1.yml | 16 ++++++++-------- .github/workflows/CI_sequential 3.yml | 24 ++++++++++++------------ .github/workflows/CI_sequential 4.yml | 16 ++++++++-------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/CI_parallel.yml b/.github/workflows/CI_parallel.yml index 7971bb707..438428f5d 100644 --- a/.github/workflows/CI_parallel.yml +++ b/.github/workflows/CI_parallel.yml @@ -26,14 +26,14 @@ jobs: strategy: fail-fast: false matrix: - compiler: ['gfortran','ifort'] + compiler: ['gfortran','ifx'] mode: ['RELEASE','DEBUG'] comm: ['PARALLEL'] enable_threads: ['NO'] env: METIS_HOME: /home/runner/work/horses3d/horses3d/metis-5.1.0/build/Linux-x86_64 - INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1 + INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2025.0 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -46,10 +46,10 @@ jobs: run: | sudo apt-get install openmpi-bin libopenmpi-dev - # IF COMPILER = IFORT -> INSTALL IFORT # - # UNCOMMENT TO USE CACHED IFORT + # IF COMPILER = ifx -> INSTALL ifx # + # UNCOMMENT TO USE CACHED ifx #- name: cache-intel-compilers - # if: (matrix.compiler == 'ifort') + # if: (matrix.compiler == 'ifx') # id: cache-intel-compilers # uses: actions/cache@v3 # with: @@ -57,7 +57,7 @@ jobs: # key: intel-${{ runner.os }}-compilers-b - name: Intel Apt repository - # UNCOMMENT TO USE CACHED IFORT + # UNCOMMENT TO USE CACHED ifx # if: (steps.cache-intel-compilers.outputs.cache-hit != 'true') run: | wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB @@ -66,7 +66,7 @@ jobs: sudo apt-get update - name: Install Intel oneAPI - # UNCOMMENT TO USE CACHED IFORT + # UNCOMMENT TO USE CACHED ifx # if: (steps.cache-intel-compilers.outputs.cache-hit != 'true') run: sudo apt-get install intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mpi intel-oneapi-mpi-devel intel-oneapi-mkl-devel ninja-build @@ -80,7 +80,7 @@ jobs: - name: Install METIS (intel) # if: (steps.cache-metis.outputs.cache-hit != 'true') # wget "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz" (OLD LINK TO METIS) - if: (matrix.compiler == 'ifort') + if: (matrix.compiler == 'ifx') run: | source /opt/intel/oneapi/setvars.sh || true wget "https://src.fedoraproject.org/lookaside/pkgs/metis/metis-5.1.0.tar.gz/5465e67079419a69e0116de24fce58fe/metis-5.1.0.tar.gz" diff --git a/.github/workflows/CI_sequential 1.yml b/.github/workflows/CI_sequential 1.yml index 97966e23a..39ed12b08 100644 --- a/.github/workflows/CI_sequential 1.yml +++ b/.github/workflows/CI_sequential 1.yml @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - compiler: ['gfortran','ifort'] + compiler: ['gfortran','ifx'] mode: ['RELEASE', 'DEBUG'] comm: ['SEQUENTIAL'] enable_threads: ['YES'] @@ -35,10 +35,10 @@ jobs: exclude: - compiler: gfortran mkl: 'YES' - - compiler: ifort + - compiler: ifx mkl: 'NO' env: - INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1 + INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2025.0 # Steps represent a sequence of tasks that will be executed as part of the job @@ -53,10 +53,10 @@ jobs: # sudo apt install libhdf5-dev # dpkg -L libhdf5-dev - # IF COMPILER = IFORT -> INSTALL IFORT # - # UNCOMMENT TO USE CACHED IFORT + # IF COMPILER = ifx -> INSTALL ifx # + # UNCOMMENT TO USE CACHED ifx #- name: cache-intel-compilers - # if: (matrix.compiler == 'ifort') + # if: (matrix.compiler == 'ifx') # id: cache-intel-compilers # uses: actions/cache@v3 # with: @@ -65,7 +65,7 @@ jobs: - name: Intel Apt repository - # UNCOMMENT TO USE CACHED IFORT + # UNCOMMENT TO USE CACHED ifx # if: (steps.cache-intel-compilers.outputs.cache-hit != 'true') run: | wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB @@ -74,7 +74,7 @@ jobs: sudo apt-get update - name: Install Intel oneAPI - # UNCOMMENT TO USE CACHED IFORT + # UNCOMMENT TO USE CACHED ifx # if: (steps.cache-intel-compilers.outputs.cache-hit != 'true') run: sudo apt-get install intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mpi intel-oneapi-mpi-devel intel-oneapi-mkl-devel ninja-build # Runs a single command using the runners shell diff --git a/.github/workflows/CI_sequential 3.yml b/.github/workflows/CI_sequential 3.yml index 6e92cfc15..aba9f66db 100644 --- a/.github/workflows/CI_sequential 3.yml +++ b/.github/workflows/CI_sequential 3.yml @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - compiler: ['gfortran','ifort'] + compiler: ['gfortran','ifx'] mode: ['RELEASE', 'DEBUG'] comm: ['SEQUENTIAL'] enable_threads: ['YES'] @@ -35,10 +35,10 @@ jobs: exclude: - compiler: gfortran mkl: 'YES' - - compiler: ifort + - compiler: ifx mkl: 'NO' env: - INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1 + INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2025.0 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -52,10 +52,10 @@ jobs: # sudo apt install libhdf5-dev # dpkg -L libhdf5-dev - # IF COMPILER = IFORT -> INSTALL IFORT # - # UNCOMMENT TO USE CACHED IFORT + # IF COMPILER = ifx -> INSTALL ifx # + # UNCOMMENT TO USE CACHED ifx #- name: cache-intel-compilers - # if: (matrix.compiler == 'ifort') + # if: (matrix.compiler == 'ifx') # id: cache-intel-compilers # uses: actions/cache@v3 # with: @@ -64,7 +64,7 @@ jobs: - name: Intel Apt repository - # UNCOMMENT TO USE CACHED IFORT + # UNCOMMENT TO USE CACHED ifx # if: (steps.cache-intel-compilers.outputs.cache-hit != 'true') run: | wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB @@ -73,7 +73,7 @@ jobs: sudo apt-get update - name: Install Intel oneAPI - # UNCOMMENT TO USE CACHED IFORT + # UNCOMMENT TO USE CACHED ifx # if: (steps.cache-intel-compilers.outputs.cache-hit != 'true') run: sudo apt-get install intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mpi intel-oneapi-mpi-devel intel-oneapi-mkl-devel ninja-build # Runs a single command using the runners shell @@ -183,14 +183,14 @@ jobs: run: | source /opt/intel/oneapi/setvars.sh || true make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_MKL=${{matrix.mkl}} - if: ('!cancelled()' && matrix.compiler == 'ifort') + if: ('!cancelled()' && matrix.compiler == 'ifx') - name: Run MultiphaseConvergence working-directory: ./Solver/test/Multiphase/Convergence run: | source /opt/intel/oneapi/setvars.sh || true ./horses3d.mu Convergence.control - if: ('!cancelled()' && matrix.compiler == 'ifort') + if: ('!cancelled()' && matrix.compiler == 'ifx') # # 2) RisingBubble @@ -202,14 +202,14 @@ jobs: run: | source /opt/intel/oneapi/setvars.sh || true make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_MKL=${{matrix.mkl}} - if: ('!cancelled()' && matrix.compiler == 'ifort') + if: ('!cancelled()' && matrix.compiler == 'ifx') - name: Run MultiphaseRisingBubble working-directory: ./Solver/test/Multiphase/RisingBubble run: | source /opt/intel/oneapi/setvars.sh || true ./horses3d.mu RisingBubble.control - if: ('!cancelled()' && matrix.compiler == 'ifort') + if: ('!cancelled()' && matrix.compiler == 'ifx') # # 3) Pipe diff --git a/.github/workflows/CI_sequential 4.yml b/.github/workflows/CI_sequential 4.yml index eac5b99ae..c0f44f839 100644 --- a/.github/workflows/CI_sequential 4.yml +++ b/.github/workflows/CI_sequential 4.yml @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - compiler: ['gfortran','ifort'] + compiler: ['gfortran','ifx'] mode: ['RELEASE', 'DEBUG'] comm: ['SEQUENTIAL'] enable_threads: ['YES'] @@ -35,10 +35,10 @@ jobs: exclude: - compiler: gfortran mkl: 'YES' - - compiler: ifort + - compiler: ifx mkl: 'NO' env: - INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1 + INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2025.0 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -52,10 +52,10 @@ jobs: # sudo apt install libhdf5-dev # dpkg -L libhdf5-dev - # IF COMPILER = IFORT -> INSTALL IFORT # - # UNCOMMENT TO USE CACHED IFORT + # IF COMPILER = ifx -> INSTALL ifx # + # UNCOMMENT TO USE CACHED ifx #- name: cache-intel-compilers - # if: (matrix.compiler == 'ifort') + # if: (matrix.compiler == 'ifx') # id: cache-intel-compilers # uses: actions/cache@v3 # with: @@ -64,7 +64,7 @@ jobs: - name: Intel Apt repository - # UNCOMMENT TO USE CACHED IFORT + # UNCOMMENT TO USE CACHED ifx # if: (steps.cache-intel-compilers.outputs.cache-hit != 'true') run: | wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB @@ -73,7 +73,7 @@ jobs: sudo apt-get update - name: Install Intel oneAPI - # UNCOMMENT TO USE CACHED IFORT + # UNCOMMENT TO USE CACHED ifx # if: (steps.cache-intel-compilers.outputs.cache-hit != 'true') run: sudo apt-get install intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mpi intel-oneapi-mpi-devel intel-oneapi-mkl-devel ninja-build # Runs a single command using the runners shell