240427.135918.HKT introduce ONEAPI_VERSION to the matlab tests

opt4ai · Apr 27, 2024 · 9211549 · 9211549
1 parent 7457586
commit 9211549
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 30 deletions.
diff --git a/.github/workflows/compile_mex.yml b/.github/workflows/compile_mex.yml
@@ -91,14 +91,25 @@ jobs:
           fi
           bash .github/scripts/link_gfortran "$GFVER"
 
+      - name: Decide the version of oneAPI to use
+        shell: bash
+        run: |
+          ONEAPI_VERSION=
+          if [[ "${{ matrix.os }}" = "windows-*" ]] ; then
+              if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then
+                  ONEAPI_VERSION=2023
+              fi
+          fi
+          echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV
+          echo "ONEAPI_VERSION:" $ONEAPI_VERSION
+
       - name: Install Intel oneAPI on macOS
         if: startsWith(matrix.os, 'macos')
-        run: bash .github/scripts/install_oneapi_macos.sh
+        run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION
 
       - name: Install Intel oneAPI on Windows
         if: startsWith(matrix.os, 'windows')
-        #run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat"'  # As of MATLAB R2023a, oneAPI 2024 does not work. Try again later.
-        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat 2023"'
+        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"'
 
       - name: Set up MATLAB
         uses: matlab-actions/setup-matlab@v2.1.2

diff --git a/.github/workflows/parallel_test_matlab.yml b/.github/workflows/parallel_test_matlab.yml
@@ -71,14 +71,25 @@ jobs:
         if: startsWith(matrix.os, 'ubuntu')
         run: bash .github/scripts/link_gfortran ${{ env.GFORTRAN_VERSION }}
 
+      - name: Decide the version of oneAPI to use
+        shell: bash
+        run: |
+          ONEAPI_VERSION=
+          if [[ "${{ matrix.os }}" = "windows-*" ]] ; then
+              if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then
+                  ONEAPI_VERSION=2023
+              fi
+          fi
+          echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV
+          echo "ONEAPI_VERSION:" $ONEAPI_VERSION
+
       - name: Install Intel oneAPI on macOS
         if: startsWith(matrix.os, 'macos')
-        run: bash .github/scripts/install_oneapi_macos.sh
+        run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION
 
       - name: Install Intel oneAPI on Windows
         if: startsWith(matrix.os, 'windows')
-        #run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat"'  # As of MATLAB R2023a, oneAPI 2024 does not work. Try again later.
-        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat 2023"'
+        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"'
 
       - name: Set up MATLAB with optimization toolbox
         uses: matlab-actions/setup-matlab@v2.1.2

diff --git a/.github/workflows/recursive_test_matlab.yml b/.github/workflows/recursive_test_matlab.yml
@@ -138,14 +138,25 @@ jobs:
           fi
           bash .github/scripts/link_gfortran "$GFVER"
 
+      - name: Decide the version of oneAPI to use
+        shell: bash
+        run: |
+          ONEAPI_VERSION=
+          if [[ "${{ matrix.os }}" = "windows-*" ]] ; then
+              if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then
+                  ONEAPI_VERSION=2023
+              fi
+          fi
+          echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV
+          echo "ONEAPI_VERSION:" $ONEAPI_VERSION
+
       - name: Install Intel oneAPI on macOS
         if: startsWith(matrix.os, 'macos')
-        run: bash .github/scripts/install_oneapi_macos.sh
+        run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION
 
       - name: Install Intel oneAPI on Windows
         if: startsWith(matrix.os, 'windows')
-        #run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat"'  # As of MATLAB R2023a, oneAPI 2024 does not work. Try again later.
-        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat 2023"'
+        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"'
 
       - name: Set up MATLAB with optimization toolbox
         uses: matlab-actions/setup-matlab@v2.1.2

diff --git a/.github/workflows/stress_test_matlab.yml b/.github/workflows/stress_test_matlab.yml
@@ -136,14 +136,25 @@ jobs:
           fi
           bash .github/scripts/link_gfortran "$GFVER"
 
+      - name: Decide the version of oneAPI to use
+        shell: bash
+        run: |
+          ONEAPI_VERSION=
+          if [[ "${{ matrix.os }}" = "windows-*" ]] ; then
+              if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then
+                  ONEAPI_VERSION=2023
+              fi
+          fi
+          echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV
+          echo "ONEAPI_VERSION:" $ONEAPI_VERSION
+
       - name: Install Intel oneAPI on macOS
         if: startsWith(matrix.os, 'macos')
-        run: bash .github/scripts/install_oneapi_macos.sh
+        run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION
 
       - name: Install Intel oneAPI on Windows
         if: startsWith(matrix.os, 'windows')
-        #run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat"'  # As of MATLAB R2023a, oneAPI 2024 does not work. Try again later.
-        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat 2023"'
+        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"'
 
       - name: Set up MATLAB with optimization toolbox
         uses: matlab-actions/setup-matlab@v2.1.2

diff --git a/.github/workflows/test_matlab.yml b/.github/workflows/test_matlab.yml
@@ -134,22 +134,22 @@ jobs:
       - name: Decide the version of oneAPI to use
         shell: bash
         run: |
-          ONEAPI_VER=
+          ONEAPI_VERSION=
           if [[ "${{ matrix.os }}" = "windows-*" ]] ; then
               if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then
-                  ONEAPI_VER=2024
+                  ONEAPI_VERSION=2023
               fi
           fi
-          echo "ONEAPI_VER=$ONEAPI_VER" >> $GITHUB_ENV
-          echo "ONEAPI_VER:" $ONEAPI_VER
+          echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV
+          echo "ONEAPI_VERSION:" $ONEAPI_VERSION
 
       - name: Install Intel oneAPI on macOS
         if: startsWith(matrix.os, 'macos')
-        run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VER
+        run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION
 
       - name: Install Intel oneAPI on Windows
         if: startsWith(matrix.os, 'windows')
-        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VER%"'
+        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"'
 
       - name: Set up MATLAB
         uses: matlab-actions/setup-matlab@v2.1.2

diff --git a/.github/workflows/test_matlab_linux.yml b/.github/workflows/test_matlab_linux.yml
@@ -76,14 +76,25 @@ jobs:
           fi
           bash .github/scripts/link_gfortran "$GFVER"
 
+      - name: Decide the version of oneAPI to use
+        shell: bash
+        run: |
+          ONEAPI_VERSION=
+          if [[ "${{ matrix.os }}" = "windows-*" ]] ; then
+              if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then
+                  ONEAPI_VERSION=2023
+              fi
+          fi
+          echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV
+          echo "ONEAPI_VERSION:" $ONEAPI_VERSION
+
       - name: Install Intel oneAPI on macOS
         if: startsWith(matrix.os, 'macos')
-        run: bash .github/scripts/install_oneapi_macos.sh
+        run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION
 
       - name: Install Intel oneAPI on Windows
         if: startsWith(matrix.os, 'windows')
-        #run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat"'  # As of MATLAB R2023a, oneAPI 2024 does not work. Try again later.
-        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat 2023"'
+        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"'
 
       - name: Set up MATLAB
         uses: matlab-actions/setup-matlab@v2.1.2

diff --git a/.github/workflows/test_matlab_mac_intel.yml b/.github/workflows/test_matlab_mac_intel.yml
@@ -76,14 +76,25 @@ jobs:
           fi
           bash .github/scripts/link_gfortran "$GFVER"
 
+      - name: Decide the version of oneAPI to use
+        shell: bash
+        run: |
+          ONEAPI_VERSION=
+          if [[ "${{ matrix.os }}" = "windows-*" ]] ; then
+              if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then
+                  ONEAPI_VERSION=2023
+              fi
+          fi
+          echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV
+          echo "ONEAPI_VERSION:" $ONEAPI_VERSION
+
       - name: Install Intel oneAPI on macOS
         if: startsWith(matrix.os, 'macos')
-        run: bash .github/scripts/install_oneapi_macos.sh
+        run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION
 
       - name: Install Intel oneAPI on Windows
         if: startsWith(matrix.os, 'windows')
-        #run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat"'  # As of MATLAB R2023a, oneAPI 2024 does not work. Try again later.
-        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat 2023"'
+        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"'
 
       - name: Set up MATLAB
         uses: matlab-actions/setup-matlab@v2.1.2

diff --git a/.github/workflows/test_matlab_windows.yml b/.github/workflows/test_matlab_windows.yml
@@ -79,22 +79,22 @@ jobs:
       - name: Decide the version of oneAPI to use
         shell: bash
         run: |
-          ONEAPI_VER=
+          ONEAPI_VERSION=
           if [[ "${{ matrix.os }}" = "windows-*" ]] ; then
               if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then
-                  ONEAPI_VER=2024
+                  ONEAPI_VERSION=2023
               fi
           fi
-          echo "ONEAPI_VER=$ONEAPI_VER" >> $GITHUB_ENV
-          echo "ONEAPI_VER:" $ONEAPI_VER
+          echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV
+          echo "ONEAPI_VERSION:" $ONEAPI_VERSION
 
       - name: Install Intel oneAPI on macOS
         if: startsWith(matrix.os, 'macos')
-        run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VER
+        run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION
 
       - name: Install Intel oneAPI on Windows
         if: startsWith(matrix.os, 'windows')
-        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VER%"'
+        run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"'
 
       - name: Set up MATLAB
         uses: matlab-actions/setup-matlab@v2.1.2