v4: corrected bugs in kronecker dlls for Linux 64
git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1510 ac1d8469-bf42-47a9-8791-bf33cf982152time-shift
parent
33baab148b
commit
9d9826766c
|
@ -18,7 +18,7 @@ typedef unsigned int mwSize;
|
||||||
extern "C"{
|
extern "C"{
|
||||||
int dgemm(char*, char*, mwSize*, mwSize*, mwSize*, double*, double*, mwSize*, double*, mwSize*, double*, double*, mwSize*);
|
int dgemm(char*, char*, mwSize*, mwSize*, mwSize*, double*, double*, mwSize*, double*, mwSize*, double*, double*, mwSize*);
|
||||||
}
|
}
|
||||||
#elif
|
#else
|
||||||
#include "blas.h"
|
#include "blas.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ void full_A_times_kronecker_B_C(double *A, double *B, double *C, double *D,
|
||||||
ka = 0 ;
|
ka = 0 ;
|
||||||
for(unsigned long int row=0; row<mB; row++)
|
for(unsigned long int row=0; row<mB; row++)
|
||||||
{
|
{
|
||||||
dgemm(transpose, transpose, &mA, &nC, &mC, &B[mB*col+row], &A[ka], &mA, &C[0], &mC, &one, &D[kd], &mA);
|
dgemm(transpose, transpose, (int*)&mA, (int*)&nC, (int*)&mC, &B[mB*col+row], &A[ka], (int*)&mA, &C[0], (int*)&mC, &one, &D[kd], (int*)&mA);
|
||||||
ka += shiftA;
|
ka += shiftA;
|
||||||
}
|
}
|
||||||
kd += shiftD;
|
kd += shiftD;
|
||||||
|
@ -55,7 +55,7 @@ void full_A_times_kronecker_B_B(double *A, double *B, double *D, mwSize mA, mwSi
|
||||||
ka = 0 ;
|
ka = 0 ;
|
||||||
for(unsigned long int row=0; row<mB; row++)
|
for(unsigned long int row=0; row<mB; row++)
|
||||||
{
|
{
|
||||||
dgemm(transpose, transpose, &mA, &nB, &mB, &B[mB*col+row], &A[ka], &mA, &B[0], &mB, &one, &D[kd], &mA);
|
dgemm(transpose, transpose, (int*)&mA, (int*)&nB, (int*)&mB, &B[mB*col+row], &A[ka], (int*)&mA, &B[0], (int*)&mB, &one, &D[kd], (int*)&mA);
|
||||||
ka += shiftA;
|
ka += shiftA;
|
||||||
}
|
}
|
||||||
kd += shiftD;
|
kd += shiftD;
|
||||||
|
|
|
@ -15,7 +15,7 @@ function build()
|
||||||
MATLAB_PATH = [ matlabroot '/bin' ];
|
MATLAB_PATH = [ matlabroot '/bin' ];
|
||||||
LIB_PATH = [ MATLAB_PATH '/glnx86' ];
|
LIB_PATH = [ MATLAB_PATH '/glnx86' ];
|
||||||
LIB_NAME = '/libmwblas.so';
|
LIB_NAME = '/libmwblas.so';
|
||||||
COPY_COMMAND = 'cp *.mexglx ../../dynare_v4/matlab';
|
COPY_COMMAND = 'cp *.mexglx ../../2007b';
|
||||||
COMPILE_COMMAND = '/mex ';
|
COMPILE_COMMAND = '/mex ';
|
||||||
COMPILE_OPTIONS = '';
|
COMPILE_OPTIONS = '';
|
||||||
CLEAN_COMMAND = 'rm *.mexglx';
|
CLEAN_COMMAND = 'rm *.mexglx';
|
||||||
|
@ -23,7 +23,7 @@ function build()
|
||||||
MATLAB_PATH = [matlabroot '/bin'];
|
MATLAB_PATH = [matlabroot '/bin'];
|
||||||
LIB_PATH = [MATLAB_PATH '/glnxa64'];
|
LIB_PATH = [MATLAB_PATH '/glnxa64'];
|
||||||
LIB_NAME = '/libmwblas.so';
|
LIB_NAME = '/libmwblas.so';
|
||||||
COPY_COMMAND = 'cp *.mexa64 ../../dynare_v4/matlab/';
|
COPY_COMMAND = 'cp *.mexa64 ../../2007b';
|
||||||
COMPILE_COMMAND = '/mex ';
|
COMPILE_COMMAND = '/mex ';
|
||||||
COMPILE_OPTIONS = ' -largeArrayDims ';
|
COMPILE_OPTIONS = ' -largeArrayDims ';
|
||||||
CLEAN_COMMAND = 'rm *.mexa64';
|
CLEAN_COMMAND = 'rm *.mexa64';
|
||||||
|
|
Loading…
Reference in New Issue