stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: provisions to detect Apple Silicon architecture (maca64 and mexmaca64) 

Works with MATLAB R2022b beta (ARM)
mr#2134
Willi Mutschler 2023-04-25 23:51:42 +02:00 committed by Sébastien Villemot
parent 5d335501d7
commit b8352b251d
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -45,8 +45,8 @@ determine the type of your MATLAB/Octave installation, type:
```matlab ```matlab
>> computer >> computer
``` ```
at the MATLAB/Octave prompt. Under MATLAB, if it returns `PCWIN64`, `GLNX64` or at the MATLAB/Octave prompt. Under MATLAB, if it returns `PCWIN64`, `GLNX64`,
`MACI64`, then it is a 64-bit MATLAB; if it returns `PCWIN`, `MACI` or `GLNX`, `MACI64` or `MACA64` then it is a 64-bit MATLAB; if it returns `PCWIN`, `MACI` or `GLNX`,
then it is a 32-bit MATLAB. Under Octave, if it returns a string that begins then it is a 32-bit MATLAB. Under Octave, if it returns a string that begins
with `x86_64`, it is a 64-bit Octave; if the strings begins with `i686`, it is with `x86_64`, it is a 64-bit Octave; if the strings begins with `i686`, it is
a 32-bit Octave. a 32-bit Octave.

2
doc/manual/source/running-dynare.rst
View File

@ -315,7 +315,7 @@ by the ``dynare`` command.
Prevent Dynare from printing the output of the steps leading up to the Prevent Dynare from printing the output of the steps leading up to the
preprocessor as well as the preprocessor output itself. preprocessor as well as the preprocessor output itself.
.. option:: mexext=mex|mexw32|mexw64|mexmaci64|mexa64 .. option:: mexext=mex|mexw32|mexw64|mexmaci64|mexmaca64|mexa64
The mex extension associated with your platform to be used The mex extension associated with your platform to be used
when compiling output associated with :opt:`use_dll`. when compiling output associated with :opt:`use_dll`.

5
m4/ax_matlab_arch.m4
View File

@ -1,7 +1,7 @@
dnl matlabarch.m4 --- check for MATLAB machine architecture. dnl matlabarch.m4 --- check for MATLAB machine architecture.
dnl dnl
dnl Copyright © 2002, 2003 Ralph Schleicher dnl Copyright © 2002, 2003 Ralph Schleicher
dnl Copyright © 2009 Dynare Team dnl Copyright © 2009-2023 Dynare Team
dnl dnl
dnl This program is free software; you can redistribute it and/or dnl This program is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU General Public License as dnl modify it under the terms of the GNU General Public License as
@ -57,6 +57,9 @@ else
*mexmaci64) *mexmaci64)
ax_cv_matlab_arch=maci64 ax_cv_matlab_arch=maci64
;; ;;
*mexmaca64)
ax_cv_matlab_arch=maca64
;;
*) *)
ax_cv_matlab_arch=unknown ax_cv_matlab_arch=unknown
;; ;;

4
m4/ax_mexopts.m4
View File

@ -68,7 +68,7 @@ case ${MATLAB_ARCH} in
FORTRAN_LIBS_FOR_CXXLINK="-Wl,-Bstatic -lgfortran -Wl,-Bdynamic" # libquadmath is already in MATLAB_LDFLAGS_NOMAP FORTRAN_LIBS_FOR_CXXLINK="-Wl,-Bstatic -lgfortran -Wl,-Bdynamic" # libquadmath is already in MATLAB_LDFLAGS_NOMAP
ax_mexopts_ok="yes" ax_mexopts_ok="yes"
;; ;;
maci64) mac[[ai]]64)
MATLAB_DEFS="-DNDEBUG" MATLAB_DEFS="-DNDEBUG"
MATLAB_CFLAGS="-fno-common -fexceptions" MATLAB_CFLAGS="-fno-common -fexceptions"
MATLAB_CXXFLAGS="-fno-common -fexceptions" MATLAB_CXXFLAGS="-fno-common -fexceptions"
@ -78,7 +78,7 @@ case ${MATLAB_ARCH} in
# This -L flag is put here, hence later on the linker command line, so as # This -L flag is put here, hence later on the linker command line, so as
# to avoid linking against the HDF5 shipped by MATLAB (which would # to avoid linking against the HDF5 shipped by MATLAB (which would
# otherwise override the HDF5 from Homebrew) # otherwise override the HDF5 from Homebrew)
MATLAB_LIBS="-L$MATLAB/bin/maci64 -lmx -lmex -lmat -lmwlapack -lmwblas" MATLAB_LIBS="-L$MATLAB/bin/${MATLAB_ARCH} -lmx -lmex -lmat -lmwlapack -lmwblas"
FORTRAN_LIBS_FOR_CXXLINK="-lgfortran -lquadmath" FORTRAN_LIBS_FOR_CXXLINK="-lgfortran -lquadmath"
ax_mexopts_ok="yes" ax_mexopts_ok="yes"
;; ;;

9
matlab/add_path_to_mex_files.m
View File

@ -89,6 +89,15 @@ else
end end
end end
end end
if strcmp(computer, 'MACA64')
tmp = [dynareroot '../mex/matlab/maca64-9.14/'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
addpath(mexpath);
end
end
end
% Add generic MATLAB path (with higher priority than the previous ones) % Add generic MATLAB path (with higher priority than the previous ones)
if exist('mexpath') if exist('mexpath')
mexpath = { mexpath; [dynareroot '../mex/matlab/'] }; mexpath = { mexpath; [dynareroot '../mex/matlab/'] };