From 879e2ac0a540fa1b199e20d47830aa5eea484a4c Mon Sep 17 00:00:00 2001 From: cornet Date: Wed, 22 Apr 2009 05:54:43 +0000 Subject: build with visual studio (dynamic libraries) --- src/matrixOperations/multiplication/dmulma.c | 2 +- src/matrixOperations/multiplication/zmulma.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/matrixOperations/multiplication') diff --git a/src/matrixOperations/multiplication/dmulma.c b/src/matrixOperations/multiplication/dmulma.c index 41e61535..8edd3112 100644 --- a/src/matrixOperations/multiplication/dmulma.c +++ b/src/matrixOperations/multiplication/dmulma.c @@ -11,7 +11,7 @@ */ #ifndef WITHOUT_BLAS -#include "blas.h" +#include "lapack.h" #endif #include "matrixMultiplication.h" diff --git a/src/matrixOperations/multiplication/zmulma.c b/src/matrixOperations/multiplication/zmulma.c index f0407baa..6a38e7da 100644 --- a/src/matrixOperations/multiplication/zmulma.c +++ b/src/matrixOperations/multiplication/zmulma.c @@ -9,9 +9,9 @@ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt * */ - +#include #ifndef WITHOUT_BLAS -#include "blas.h" +#include "lapack.h" #endif #include "matrixMultiplication.h" @@ -38,13 +38,13 @@ void zmulma(doubleComplex *in1, int lines1, int columns1, double MinusOne = -1; double Zero = 0; - double *in1Real = malloc((uint) lines1 * (uint) columns1 * sizeof(double)); - double *in1Imag = malloc((uint) lines1 * (uint) columns1 * sizeof(double)); - double *in2Real = malloc((uint) lines2 * (uint) columns2 * sizeof(double)); - double *in2Imag = malloc((uint) lines2 * (uint) columns2 * sizeof(double)); + double *in1Real = (double*)malloc((unsigned int) lines1 * (unsigned int) columns1 * sizeof(double)); + double *in1Imag = (double*)malloc((unsigned int) lines1 * (unsigned int) columns1 * sizeof(double)); + double *in2Real = (double*)malloc((unsigned int) lines2 * (unsigned int) columns2 * sizeof(double)); + double *in2Imag = (double*)malloc((unsigned int) lines2 * (unsigned int) columns2 * sizeof(double)); - double *RealOut = malloc((uint) lines1 * (uint) columns2 * sizeof(double)); - double *ImagOut = malloc((uint) lines1 * (uint) columns2 * sizeof(double)); + double *RealOut = (double*)malloc((unsigned int) lines1 * (unsigned int) columns2 * sizeof(double)); + double *ImagOut = (double*)malloc((unsigned int) lines1 * (unsigned int) columns2 * sizeof(double)); zreala(in1, lines1 * columns1, in1Real); zreala(in2, lines2 * columns2, in2Real); @@ -54,6 +54,7 @@ void zmulma(doubleComplex *in1, int lines1, int columns1, /* Cr <- 1*Ar*Br + 0*Cr */ dgemm_("N","N", &lines1, &columns2, &columns1, &One, in1Real, &lines1, in2Real, &lines2, &Zero, RealOut, &lines1); + /* Cr <- -1*Ai*Bi + 1*Cr */ dgemm_("N","N", &lines1, &columns2, &columns1, &MinusOne, -- cgit