Skip to content

Commit 55f3cbc

Browse files
committed
250731.012744.PDT correct verbose in setup.m
1 parent ad57db1 commit 55f3cbc

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/test_matlab.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ jobs:
126126
if: startsWith(matrix.os, 'ubuntu')
127127
run: |
128128
GFVER=${{ env.GFORTRAN_VERSION }}
129-
if [[ "${{ matrix.os }}" = "ubuntu-20.04" ]] ; then
130-
GFVER=11
129+
if [[ "${{ matrix.os }}" = "ubuntu-22.04" ]] ; then
130+
GFVER=13
131131
fi
132132
if [[ "${{ matrix.matlab }}" = "R2020b" || "${{ matrix.matlab }}" = "R2021a" || "${{ matrix.matlab }}" = "R2021b" ]] ; then
133133
GFVER=9
@@ -146,10 +146,13 @@ jobs:
146146
- name: Decide the version of oneAPI to use
147147
shell: bash
148148
run: |
149+
# Initialize the variable ONEAPI_VERSION to an empty string, which means the default version
149150
ONEAPI_VERSION=
150151
if [[ "${{ matrix.os }}" = "windows-"* ]] ; then
151152
if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then
152153
ONEAPI_VERSION=2023
154+
else if [[ "${{ matrix.matlab }}" = "R2024"* ]] ; then
155+
ONEAPI_VERSION=2024
153156
fi
154157
fi
155158
echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV

setup.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function setup(varargin)
107107

108108
% Remove the compiled MEX files (and the files generated along side) if requested.
109109
if strcmp(action, 'clean')
110-
clean_mex(mexdir, 'verbose');
110+
clean_mex(mexdir, true); % verbose = true
111111
clean_generated_files(fortd_interform, gateways_interform, tools, mexdir);
112112
rmpath(tools);
113113
return
@@ -159,6 +159,7 @@ function setup(varargin)
159159
% Check whether MEX is properly configured.
160160
fprintf('\nVerifying the setup of MEX ... \n');
161161
language = 'Fortran'; % Language to compile
162+
verbose = (isfield(options, 'verbose') && islogicalscalar(options.verbose) && options.verbose);
162163
mex_well_conf = try_mex_setup(language, verbose);
163164
if mex_well_conf == 0
164165
fprintf('\nMATLAB needs you to set MEX up for Fortran.');

0 commit comments

Comments
 (0)