Skip to content

Commit f18bb25

Browse files
committed
250731.022124.PDT [skip ci] test how matlab r2024 behaves with oneapi 2023
1 parent 5e78820 commit f18bb25

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/test_matlab_windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
os: [windows-latest]
24-
matlab: [R2023a, latest] # The earliest and latest supported versions of MATLAB
24+
matlab: [R2023a, R2024a, R2024b, latest] # The earliest and latest supported versions of MATLAB
2525

2626
steps:
2727

@@ -73,7 +73,7 @@ jobs:
7373
if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then
7474
ONEAPI_VERSION=2023
7575
elif [[ "${{ matrix.matlab }}" = "R2024"* ]] ; then
76-
ONEAPI_VERSION=2024
76+
ONEAPI_VERSION=2023
7777
fi
7878
fi
7979
echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV

matlab/setup_tools/try_mex_setup.m

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,16 @@
4949
oneapi_root = 'C:\Program Files (x86)\Intel\oneAPI\';
5050
system_string = 'windows';
5151
end
52-
% Intel oneAPI does not support macOS any more starting from oneAPI 2024.
53-
% For oneAPI 2024 on Windows, the compiler directory is "compiler/latest", and the compiler
52+
% 1. Intel oneAPI does not support macOS any more starting from oneAPI 2024.
53+
% 2. For oneAPI 2024 on Windows, the compiler directory is "compiler/latest", and the compiler
5454
% (ifort or ifx) is located in "compiler/latest/bin/"; In previous versions, the paths were
5555
% "compiler/latest/<system_string>" and "compiler/latest/<system_string>/bin/intel64".
5656
% The first version of MATLAB that supports oneAPI 2024 on Windows is R2024a. Earlier versions
5757
% cannot locate the compiler due to the change of the directory structure, even if ONEAPI_ROOT
5858
% is set correctly.
59+
% 3. Starting from oneAPI 2025, ifort is removed and replaced by ifx. MATLAB R2024a/b looks for
60+
% ifort during mex setup and hence would fail with oneAPI 2025, even though it actually uses
61+
% ifx to compile Fortran code.
5962
compiler_dir = fullfile(oneapi_root, 'compiler', 'latest', system_string);
6063
if ~exist(compiler_dir, 'dir')
6164
compiler_dir = fullfile(oneapi_root, 'compiler', 'latest');

0 commit comments

Comments
 (0)