diff --git a/mex/2007b/A_times_B_kronecker_C.mexa64 b/mex/2007b/A_times_B_kronecker_C.mexa64 index 9dd6b620c..f5c04c8bd 100755 Binary files a/mex/2007b/A_times_B_kronecker_C.mexa64 and b/mex/2007b/A_times_B_kronecker_C.mexa64 differ diff --git a/mex/2007b/gensylv.mexa64 b/mex/2007b/gensylv.mexa64 index 03210dfae..e39f75de5 100755 Binary files a/mex/2007b/gensylv.mexa64 and b/mex/2007b/gensylv.mexa64 differ diff --git a/mex/2007b/mjdgges.mexa64 b/mex/2007b/mjdgges.mexa64 index d871f2530..d83a84658 100755 Binary files a/mex/2007b/mjdgges.mexa64 and b/mex/2007b/mjdgges.mexa64 differ diff --git a/mex/2007b/simulate.mexa64 b/mex/2007b/simulate.mexa64 index afa9012b9..6b99ca0a3 100755 Binary files a/mex/2007b/simulate.mexa64 and b/mex/2007b/simulate.mexa64 differ diff --git a/mex/2007b/sparse_hessian_times_B_kronecker_C.mexa64 b/mex/2007b/sparse_hessian_times_B_kronecker_C.mexa64 index df86b19d8..d054df6f5 100755 Binary files a/mex/2007b/sparse_hessian_times_B_kronecker_C.mexa64 and b/mex/2007b/sparse_hessian_times_B_kronecker_C.mexa64 differ diff --git a/mex/sources/build.m b/mex/sources/build.m index 7d4bd6aaa..4af6a8754 100644 --- a/mex/sources/build.m +++ b/mex/sources/build.m @@ -19,7 +19,7 @@ if strcmpi('GLNX86', computer) || strcmpi('GLNXA64', computer) ... || strcmpi('MACI', computer) || strcmpi('MAC', computer) % GNU/Linux (x86-32 or x86-64) or MacOS (Intel or PPC) if strcmpi('GLNXA64', computer) % 64 bits ? - COMPILE_OPTIONS = [ COMPILE_OPTIONS ' -largeArrayDims -DMX_COMPAT_32' ]; + COMPILE_OPTIONS = [ COMPILE_OPTIONS ' -largeArrayDims']; end LAPACK_PATH = '-lmwlapack'; if VERSION <= 7.4 diff --git a/mex/sources/kronecker/A_times_B_kronecker_C.cc b/mex/sources/kronecker/A_times_B_kronecker_C.cc index 9a7f7dc95..8692e8ea3 100644 --- a/mex/sources/kronecker/A_times_B_kronecker_C.cc +++ b/mex/sources/kronecker/A_times_B_kronecker_C.cc @@ -23,7 +23,7 @@ typedef int mwSize; # define DGEMM dgemm # endif extern "C"{ - int DGEMM(char*, char*, mwSize*, mwSize*, mwSize*, double*, double*, mwSize*, double*, mwSize*, double*, double*, mwSize*); + int DGEMM(char*, char*, int*, int*, int*, double*, double*, int*, double*, int*, double*, double*, int*); } #else # include "blas.h" @@ -31,7 +31,7 @@ extern "C"{ #endif void full_A_times_kronecker_B_C(double *A, double *B, double *C, double *D, - mwSize mA, mwSize nA, mwSize mB, mwSize nB, mwSize mC, mwSize nC) + int mA, int nA, int mB, int nB, int mC, int nC) { const unsigned long shiftA = mA*mC ; const unsigned long shiftD = mA*nC ; @@ -51,7 +51,7 @@ void full_A_times_kronecker_B_C(double *A, double *B, double *C, double *D, } -void full_A_times_kronecker_B_B(double *A, double *B, double *D, mwSize mA, mwSize nA, mwSize mB, mwSize nB) +void full_A_times_kronecker_B_B(double *A, double *B, double *D, int mA, int nA, int mB, int nB) { const unsigned long int shiftA = mA*mB ; const unsigned long int shiftD = mA*nB ; @@ -128,10 +128,10 @@ void mexFunction( int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[] ) // Computational part: if (nrhs == 2) { - full_A_times_kronecker_B_B(A, B, &D[0], mA, nA, mB, nB); + full_A_times_kronecker_B_B(A, B, &D[0], (int) mA, (int) nA, (int) mB, (int) nB); } else { - full_A_times_kronecker_B_C(A, B, C, &D[0], mA, nA, mB, nB, mC, nC); + full_A_times_kronecker_B_C(A, B, C, &D[0], (int) mA, (int) nA, (int) mB, (int) nB, (int) mC, (int) nC); } }