ufkc7e3d
/
mathnet-numerics
forked from tsai/mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

native: switched to f2c defined integers

la-knuth
Marcus Cuda 16 years ago
parent
ee933111e3
commit
944c79c721
9 changed files with 227 additions and 233 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 87
      src/NativeWrappers/GotoBlas2/blas.c
  2. 3
      src/NativeWrappers/GotoBlas2/f2c.h
  3. 328
      src/NativeWrappers/GotoBlas2/lapack.cpp
  4. 16
      src/NativeWrappers/GotoBlas2/lapack.h
  5. 4
      src/NativeWrappers/Windows/GotoBLAS2WrapperTests/GotoBLAS2WrapperTests.csproj
  6. 5
      src/NativeWrappers/Windows/MKLWrapperTests/MKLWrapperTests.csproj
  7. 13
      src/Numerics/Algorithms/LinearAlgebra/native.generic.include
  8. 2
      src/Numerics/Numerics.csproj
  9. 2
      src/UnitTests/Setup.cs

87
src/NativeWrappers/GotoBlas2/blas.c
View File

@ -1,112 +1,109 @@
#include "wrapper_common.h" #include "wrapper_common.h"
#include <stdlib.h> #include "f2c.h"
typedef struct { float r, i; } complex;
typedef struct { double r, i; } doublecomplex;
enum TRANSPOSE {CblasNoTrans=111, CblasTrans=112, CblasConjTrans=113, CblasConjNoTrans=114}; enum TRANSPOSE {CblasNoTrans=111, CblasTrans=112, CblasConjTrans=113, CblasConjNoTrans=114};
void SAXPY(int*, float*, float *x, int* incx, float *y, int* incy); void SAXPY(integer*, float*, float *x, integer* incx, float *y, integer* incy);
void DAXPY(int*, double*, double *x, int* incx, double *y, int* incy); void DAXPY(integer*, double*, double *x, integer* incx, double *y, integer* incy);
void CAXPY(int*, complex*, complex *x, int* incx, complex *y, int* incy); void CAXPY(integer*, complex*, complex *x, integer* incx, complex *y, integer* incy);
void ZAXPY(int*, doublecomplex*, doublecomplex *x, int* incx, doublecomplex *y, int* incy); void ZAXPY(integer*, doublecomplex*, doublecomplex *x, integer* incx, doublecomplex *y, integer* incy);
void SSCAL(int*, float* alpha, float*, int*); void SSCAL(integer*, float* alpha, float*, integer*);
void DSCAL(int*, double* alpha, double*, int*); void DSCAL(integer*, double* alpha, double*, integer*);
void CSCAL(int*, complex* alpha, complex*, int*); void CSCAL(integer*, complex* alpha, complex*, integer*);
void ZSCAL(int*, doublecomplex* alpha, doublecomplex*, int*); void ZSCAL(integer*, doublecomplex* alpha, doublecomplex*, integer*);
float SDOT(int*, float*, int*, float*, int*); float SDOT(integer*, float*, integer*, float*, integer*);
double DDOT(int*, double*, int*, double*, int*); double DDOT(integer*, double*, integer*, double*, integer*);
complex CDOTU(int*, complex*, int*, complex*, int*); complex CDOTU(integer*, complex*, integer*, complex*, integer*);
doublecomplex ZDOTU(int*, doublecomplex*, int*, doublecomplex*, int*); doublecomplex ZDOTU(integer*, doublecomplex*, integer*, doublecomplex*, integer*);
void SGEMM(char*, char*, int*, int*, int*, float*, float*, int*, float*, int*, float*, float*, int*); void SGEMM(char*, char*, integer*, integer*, integer*, float*, float*, integer*, float*, integer*, float*, float*, integer*);
void DGEMM(char*, char*, int*, int*, int*, double*, double*, int*, double*, int*, double*, double*, int*); void DGEMM(char*, char*, integer*, integer*, integer*, double*, double*, integer*, double*, integer*, double*, double*, integer*);
void CGEMM(char*, char*, int*, int*, int*, complex*, complex*, int*, complex*, int*, complex*, complex*, int*); void CGEMM(char*, char*, integer*, integer*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, complex*, integer*);
void ZGEMM(char*, char*, int*, int*, int*, doublecomplex*, doublecomplex*, int*, doublecomplex*, int*, doublecomplex*, doublecomplex*, int*); void ZGEMM(char*, char*, integer*, integer*, integer*, doublecomplex*, doublecomplex*, integer*, doublecomplex*, integer*, doublecomplex*, doublecomplex*, integer*);
char getTransChar(TRANSPOSE); char getTransChar(TRANSPOSE);
int one = 1; integer one = 1;
DLLEXPORT void s_axpy(int n, float alpha, float x[], float y[]){ DLLEXPORT void s_axpy(integer n, float alpha, float x[], float y[]){
SAXPY(&n, &alpha, x, &one, y, &one); SAXPY(&n, &alpha, x, &one, y, &one);
} }
DLLEXPORT void d_axpy(int n, double alpha, double x[], double y[]){ DLLEXPORT void d_axpy(integer n, double alpha, double x[], double y[]){
DAXPY(&n, &alpha, x, &one, y, &one); DAXPY(&n, &alpha, x, &one, y, &one);
} }
DLLEXPORT void c_axpy(int n, complex alpha, complex x[], complex y[]){ DLLEXPORT void c_axpy(integer n, complex alpha, complex x[], complex y[]){
CAXPY(&n, &alpha, x, &one, y, &one); CAXPY(&n, &alpha, x, &one, y, &one);
} }
DLLEXPORT void z_axpy(int n, doublecomplex alpha, doublecomplex x[], doublecomplex y[]){ DLLEXPORT void z_axpy(integer n, doublecomplex alpha, doublecomplex x[], doublecomplex y[]){
ZAXPY(&n, &alpha, x, &one, y, &one); ZAXPY(&n, &alpha, x, &one, y, &one);
} }
DLLEXPORT void s_scale(int n, float alpha, float x[]){ DLLEXPORT void s_scale(integer n, float alpha, float x[]){
SSCAL(&n, &alpha, x, &one); SSCAL(&n, &alpha, x, &one);
} }
DLLEXPORT void d_scale(int n, double alpha, double x[]){ DLLEXPORT void d_scale(integer n, double alpha, double x[]){
DSCAL(&n, &alpha, x, &one); DSCAL(&n, &alpha, x, &one);
} }
DLLEXPORT void c_scale(int n, complex alpha, complex x[]){ DLLEXPORT void c_scale(integer n, complex alpha, complex x[]){
CSCAL(&n, &alpha, x, &one); CSCAL(&n, &alpha, x, &one);
} }
DLLEXPORT void z_scale(int n, doublecomplex alpha, doublecomplex x[]){ DLLEXPORT void z_scale(integer n, doublecomplex alpha, doublecomplex x[]){
ZSCAL(&n, &alpha, x, &one); ZSCAL(&n, &alpha, x, &one);
} }
DLLEXPORT float s_dot_product(int n, float x[], float y[]){ DLLEXPORT float s_dot_product(integer n, float x[], float y[]){
return SDOT(&n, x, &one, y, &one); return SDOT(&n, x, &one, y, &one);
} }
DLLEXPORT double d_dot_product(int n, double x[], double y[]){ DLLEXPORT double d_dot_product(integer n, double x[], double y[]){
return DDOT(&n, x, &one, y, &one); return DDOT(&n, x, &one, y, &one);
} }
DLLEXPORT complex c_dot_product(int n, complex x[], complex y[]){ DLLEXPORT complex c_dot_product(integer n, complex x[], complex y[]){
return CDOTU(&n, x, &one, y, &one); return CDOTU(&n, x, &one, y, &one);
} }
DLLEXPORT doublecomplex z_dot_product(int n, doublecomplex x[], doublecomplex y[]){ DLLEXPORT doublecomplex z_dot_product(integer n, doublecomplex x[], doublecomplex y[]){
return ZDOTU(&n, x, &one, y, &one); return ZDOTU(&n, x, &one, y, &one);
} }
DLLEXPORT void s_matrix_multiply(enum TRANSPOSE transA, enum TRANSPOSE transB, int m, int n, int k, float alpha, float x[], float y[], float beta, float c[]){ DLLEXPORT void s_matrix_multiply(enum TRANSPOSE transA, enum TRANSPOSE transB, integer m, integer n, integer k, float alpha, float x[], float y[], float beta, float c[]){
int lda = transA == CblasNoTrans ? m : k; integer lda = transA == CblasNoTrans ? m : k;
int ldb = transB == CblasNoTrans ? k : n; integer ldb = transB == CblasNoTrans ? k : n;
char transAchar = getTransChar(transA); char transAchar = getTransChar(transA);
char transBchar = getTransChar(transB); char transBchar = getTransChar(transB);
SGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m); SGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m);
} }
DLLEXPORT void d_matrix_multiply(enum TRANSPOSE transA, enum TRANSPOSE transB, int m, int n, int k, double alpha, double x[], double y[], double beta, double c[]){ DLLEXPORT void d_matrix_multiply(enum TRANSPOSE transA, enum TRANSPOSE transB, integer m, integer n, integer k, double alpha, double x[], double y[], double beta, double c[]){
int lda = transA == CblasNoTrans ? m : k; integer lda = transA == CblasNoTrans ? m : k;
int ldb = transB == CblasNoTrans ? k : n; integer ldb = transB == CblasNoTrans ? k : n;
char transAchar = getTransChar(transA); char transAchar = getTransChar(transA);
char transBchar = getTransChar(transB); char transBchar = getTransChar(transB);
DGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m); DGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m);
} }
DLLEXPORT void c_matrix_multiply(enum TRANSPOSE transA, enum TRANSPOSE transB, int m, int n, int k, complex alpha, complex x[], complex y[], complex beta, complex c[]){ DLLEXPORT void c_matrix_multiply(enum TRANSPOSE transA, enum TRANSPOSE transB, integer m, integer n, integer k, complex alpha, complex x[], complex y[], complex beta, complex c[]){
int lda = transA == CblasNoTrans ? m : k; integer lda = transA == CblasNoTrans ? m : k;
int ldb = transB == CblasNoTrans ? k : n; integer ldb = transB == CblasNoTrans ? k : n;
char transAchar = getTransChar(transA); char transAchar = getTransChar(transA);
char transBchar = getTransChar(transB); char transBchar = getTransChar(transB);
CGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m); CGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m);
} }
DLLEXPORT void z_matrix_multiply(enum TRANSPOSE transA, enum TRANSPOSE transB, int m, int n, int k, doublecomplex alpha, doublecomplex x[], doublecomplex y[], doublecomplex beta, doublecomplex c[]){ DLLEXPORT void z_matrix_multiply(enum TRANSPOSE transA, enum TRANSPOSE transB, integer m, integer n, integer k, doublecomplex alpha, doublecomplex x[], doublecomplex y[], doublecomplex beta, doublecomplex c[]){
int lda = transA == CblasNoTrans ? m : k; integer lda = transA == CblasNoTrans ? m : k;
int ldb = transB == CblasNoTrans ? k : n; integer ldb = transB == CblasNoTrans ? k : n;
char transAchar = getTransChar(transA); char transAchar = getTransChar(transA);
char transBchar = getTransChar(transB); char transBchar = getTransChar(transB);
ZGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m); ZGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m);

3
src/NativeWrappers/GotoBlas2/f2c.h
View File

@ -7,8 +7,7 @@
#ifndef F2C_INCLUDE #ifndef F2C_INCLUDE
#define F2C_INCLUDE #define F2C_INCLUDE
typedef int integer; typedef long int integer;
//typedef long int integer;
typedef unsigned long int uinteger; typedef unsigned long int uinteger;
typedef char *address; typedef char *address;

328
src/NativeWrappers/GotoBlas2/lapack.cpp
View File

@ -3,76 +3,76 @@
#include "lapack.h" #include "lapack.h"
extern "C"{ extern "C"{
void STRSM(char*, char*, char*, char*, int*, int*, float*, float*, int*, float*, int*); void STRSM(char*, char*, char*, char*, integer*, integer*, float*, float*, integer*, float*, integer*);
void DTRSM(char*, char*, char*, char*, int*, int*, double*, double*, int*, double*, int*); void DTRSM(char*, char*, char*, char*, integer*, integer*, double*, double*, integer*, double*, integer*);
void CTRSM(char*, char*, char*, char*, int*, int*, complex*, complex*, int*, complex*, int*); void CTRSM(char*, char*, char*, char*, integer*, integer*, complex*, complex*, integer*, complex*, integer*);
void ZTRSM(char*, char*, char*, char*, int*, int*, doublecomplex*, doublecomplex*, int*, doublecomplex*, int*); void ZTRSM(char*, char*, char*, char*, integer*, integer*, doublecomplex*, doublecomplex*, integer*, doublecomplex*, integer*);
DLLEXPORT float s_matrix_norm(char norm, int m, int n, float a[], float work[]) DLLEXPORT float s_matrix_norm(char norm, integer m, integer n, float a[], float work[])
{ {
return slange_(&norm, &m, &n, a, &m, work); return slange_(&norm, &m, &n, a, &m, work);
} }
DLLEXPORT double d_matrix_norm(char norm, int m, int n, double a[], double work[]) DLLEXPORT double d_matrix_norm(char norm, integer m, integer n, double a[], double work[])
{ {
return dlange_(&norm, &m, &n, a, &m, work); return dlange_(&norm, &m, &n, a, &m, work);
} }
DLLEXPORT float c_matrix_norm(char norm, int m, int n, complex a[], float work[]) DLLEXPORT float c_matrix_norm(char norm, integer m, integer n, complex a[], float work[])
{ {
return clange_(&norm, &m, &n, a, &m, work); return clange_(&norm, &m, &n, a, &m, work);
} }
DLLEXPORT double z_matrix_norm(char norm, int m, int n, doublecomplex a[], double work[]) DLLEXPORT double z_matrix_norm(char norm, integer m, integer n, doublecomplex a[], double work[])
{ {
return zlange_(&norm, &m, &n, a, &m, work); return zlange_(&norm, &m, &n, a, &m, work);
} }
DLLEXPORT int s_lu_factor(int m, float a[], int ipiv[]) DLLEXPORT integer s_lu_factor(integer m, float a[], integer ipiv[])
{ {
int info = 0; integer info = 0;
sgetrf_(&m,&m,a,&m,ipiv,&info); sgetrf_(&m,&m,a,&m,ipiv,&info);
for(int i = 0; i < m; ++i ){ for(integer i = 0; i < m; ++i ){
ipiv[i] -= 1; ipiv[i] -= 1;
} }
return info; return info;
} }
DLLEXPORT int d_lu_factor(int m, double a[], int ipiv[]) DLLEXPORT integer d_lu_factor(integer m, double a[], integer ipiv[])
{ {
int info = 0; integer info = 0;
dgetrf_(&m,&m,a,&m,ipiv,&info); dgetrf_(&m,&m,a,&m,ipiv,&info);
for(int i = 0; i < m; ++i ){ for(integer i = 0; i < m; ++i ){
ipiv[i] -= 1; ipiv[i] -= 1;
} }
return info; return info;
} }
DLLEXPORT int c_lu_factor(int m, complex a[], int ipiv[]) DLLEXPORT integer c_lu_factor(integer m, complex a[], integer ipiv[])
{ {
int info = 0; integer info = 0;
cgetrf_(&m,&m,a,&m,ipiv,&info); cgetrf_(&m,&m,a,&m,ipiv,&info);
for(int i = 0; i < m; ++i ){ for(integer i = 0; i < m; ++i ){
ipiv[i] -= 1; ipiv[i] -= 1;
} }
return info; return info;
} }
DLLEXPORT int z_lu_factor(int m, doublecomplex a[], int ipiv[]) DLLEXPORT integer z_lu_factor(integer m, doublecomplex a[], integer ipiv[])
{ {
int info = 0; integer info = 0;
zgetrf_(&m,&m,a,&m,ipiv,&info); zgetrf_(&m,&m,a,&m,ipiv,&info);
for(int i = 0; i < m; ++i ){ for(integer i = 0; i < m; ++i ){
ipiv[i] -= 1; ipiv[i] -= 1;
} }
return info; return info;
} }
DLLEXPORT int s_lu_inverse(int n, float a[], float work[], int lwork) DLLEXPORT integer s_lu_inverse(integer n, float a[], float work[], integer lwork)
{ {
int* ipiv = new int[n]; integer* ipiv = new integer[n];
int info = 0; integer info = 0;
sgetrf_(&n,&n,a,&n,ipiv,&info); sgetrf_(&n,&n,a,&n,ipiv,&info);
if (info != 0){ if (info != 0){
@ -85,10 +85,10 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int d_lu_inverse(int n, double a[], double work[], int lwork) DLLEXPORT integer d_lu_inverse(integer n, double a[], double work[], integer lwork)
{ {
int* ipiv = new int[n]; integer* ipiv = new integer[n];
int info = 0; integer info = 0;
dgetrf_(&n,&n,a,&n,ipiv,&info); dgetrf_(&n,&n,a,&n,ipiv,&info);
if (info != 0){ if (info != 0){
@ -101,10 +101,10 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int c_lu_inverse(int n, complex a[], complex work[], int lwork) DLLEXPORT integer c_lu_inverse(integer n, complex a[], complex work[], integer lwork)
{ {
int* ipiv = new int[n]; integer* ipiv = new integer[n];
int info = 0; integer info = 0;
cgetrf_(&n,&n,a,&n,ipiv,&info); cgetrf_(&n,&n,a,&n,ipiv,&info);
if (info != 0){ if (info != 0){
@ -117,10 +117,10 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int z_lu_inverse(int n, doublecomplex a[], doublecomplex work[], int lwork) DLLEXPORT integer z_lu_inverse(integer n, doublecomplex a[], doublecomplex work[], integer lwork)
{ {
int* ipiv = new int[n]; integer* ipiv = new integer[n];
int info = 0; integer info = 0;
zgetrf_(&n,&n,a,&n,ipiv,&info); zgetrf_(&n,&n,a,&n,ipiv,&info);
if (info != 0){ if (info != 0){
@ -133,13 +133,13 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int s_lu_inverse_factored(int n, float a[], int ipiv[], float work[], int lwork) DLLEXPORT integer s_lu_inverse_factored(integer n, float a[], integer ipiv[], float work[], integer lwork)
{ {
int i; integer i;
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
ipiv[i] += 1; ipiv[i] += 1;
} }
int info = 0; integer info = 0;
sgetri_(&n,a,&n,ipiv,work,&lwork,&info); sgetri_(&n,a,&n,ipiv,work,&lwork,&info);
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
@ -148,14 +148,14 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int d_lu_inverse_factored(int n, double a[], int ipiv[], double work[], int lwork) DLLEXPORT integer d_lu_inverse_factored(integer n, double a[], integer ipiv[], double work[], integer lwork)
{ {
int i; integer i;
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
ipiv[i] += 1; ipiv[i] += 1;
} }
int info = 0; integer info = 0;
dgetri_(&n,a,&n,ipiv,work,&lwork,&info); dgetri_(&n,a,&n,ipiv,work,&lwork,&info);
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
@ -164,14 +164,14 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int c_lu_inverse_factored(int n, complex a[], int ipiv[], complex work[], int lwork) DLLEXPORT integer c_lu_inverse_factored(integer n, complex a[], integer ipiv[], complex work[], integer lwork)
{ {
int i; integer i;
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
ipiv[i] += 1; ipiv[i] += 1;
} }
int info = 0; integer info = 0;
cgetri_(&n,a,&n,ipiv,work,&lwork,&info); cgetri_(&n,a,&n,ipiv,work,&lwork,&info);
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
@ -180,14 +180,14 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int z_lu_inverse_factored(int n, doublecomplex a[], int ipiv[], doublecomplex work[], int lwork) DLLEXPORT integer z_lu_inverse_factored(integer n, doublecomplex a[], integer ipiv[], doublecomplex work[], integer lwork)
{ {
int i; integer i;
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
ipiv[i] += 1; ipiv[i] += 1;
} }
int info = 0; integer info = 0;
zgetri_(&n,a,&n,ipiv,work,&lwork,&info); zgetri_(&n,a,&n,ipiv,work,&lwork,&info);
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
@ -196,10 +196,10 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int s_lu_solve_factored(int n, int nrhs, float a[], int ipiv[], float b[]) DLLEXPORT integer s_lu_solve_factored(integer n, integer nrhs, float a[], integer ipiv[], float b[])
{ {
int info = 0; integer info = 0;
int i; integer i;
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
ipiv[i] += 1; ipiv[i] += 1;
} }
@ -212,10 +212,10 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int d_lu_solve_factored(int n, int nrhs, double a[], int ipiv[], double b[]) DLLEXPORT integer d_lu_solve_factored(integer n, integer nrhs, double a[], integer ipiv[], double b[])
{ {
int info = 0; integer info = 0;
int i; integer i;
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
ipiv[i] += 1; ipiv[i] += 1;
} }
@ -228,10 +228,10 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int c_lu_solve_factored(int n, int nrhs, complex a[], int ipiv[], complex b[]) DLLEXPORT integer c_lu_solve_factored(integer n, integer nrhs, complex a[], integer ipiv[], complex b[])
{ {
int info = 0; integer info = 0;
int i; integer i;
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
ipiv[i] += 1; ipiv[i] += 1;
} }
@ -244,10 +244,10 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int z_lu_solve_factored(int n, int nrhs, doublecomplex a[], int ipiv[], doublecomplex b[]) DLLEXPORT integer z_lu_solve_factored(integer n, integer nrhs, doublecomplex a[], integer ipiv[], doublecomplex b[])
{ {
int info = 0; integer info = 0;
int i; integer i;
for(i = 0; i < n; ++i ){ for(i = 0; i < n; ++i ){
ipiv[i] += 1; ipiv[i] += 1;
} }
@ -260,13 +260,13 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int s_lu_solve(int n, int nrhs, float a[], float b[]) DLLEXPORT integer s_lu_solve(integer n, integer nrhs, float a[], float b[])
{ {
float* clone = new float[n*n]; float* clone = new float[n*n];
memcpy(clone, a, n*n*sizeof(float)); memcpy(clone, a, n*n*sizeof(float));
int* ipiv = new int[n]; integer* ipiv = new integer[n];
int info = 0; integer info = 0;
sgetrf_(&n, &n, clone, &n, ipiv, &info); sgetrf_(&n, &n, clone, &n, ipiv, &info);
if (info != 0){ if (info != 0){
@ -282,13 +282,13 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int d_lu_solve(int n, int nrhs, double a[], double b[]) DLLEXPORT integer d_lu_solve(integer n, integer nrhs, double a[], double b[])
{ {
double* clone = new double[n*n]; double* clone = new double[n*n];
memcpy(clone, a, n*n*sizeof(double)); memcpy(clone, a, n*n*sizeof(double));
int* ipiv = new int[n]; integer* ipiv = new integer[n];
int info = 0; integer info = 0;
dgetrf_(&n, &n, clone, &n, ipiv, &info); dgetrf_(&n, &n, clone, &n, ipiv, &info);
if (info != 0){ if (info != 0){
@ -304,13 +304,13 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int c_lu_solve(int n, int nrhs, complex a[], complex b[]) DLLEXPORT integer c_lu_solve(integer n, integer nrhs, complex a[], complex b[])
{ {
complex* clone = new complex[n*n]; complex* clone = new complex[n*n];
memcpy(clone, a, n*n*sizeof(complex)); memcpy(clone, a, n*n*sizeof(complex));
int* ipiv = new int[n]; integer* ipiv = new integer[n];
int info = 0; integer info = 0;
cgetrf_(&n, &n, clone, &n, ipiv, &info); cgetrf_(&n, &n, clone, &n, ipiv, &info);
if (info != 0){ if (info != 0){
@ -326,13 +326,13 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int z_lu_solve(int n, int nrhs, doublecomplex a[], doublecomplex b[]) DLLEXPORT integer z_lu_solve(integer n, integer nrhs, doublecomplex a[], doublecomplex b[])
{ {
doublecomplex* clone = new doublecomplex[n*n]; doublecomplex* clone = new doublecomplex[n*n];
memcpy(clone, a, n*n*sizeof(doublecomplex)); memcpy(clone, a, n*n*sizeof(doublecomplex));
int* ipiv = new int[n]; integer* ipiv = new integer[n];
int info = 0; integer info = 0;
zgetrf_(&n, &n, clone, &n, ipiv, &info); zgetrf_(&n, &n, clone, &n, ipiv, &info);
if (info != 0){ if (info != 0){
@ -348,14 +348,14 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int s_cholesky_factor(int n, float a[]){ DLLEXPORT integer s_cholesky_factor(integer n, float a[]){
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
spotrf_(&uplo, &n, a, &n, &info); spotrf_(&uplo, &n, a, &n, &info);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
int index = i * n; integer index = i * n;
for (int j = 0; j < n && i > j; ++j) for (integer j = 0; j < n && i > j; ++j)
{ {
a[index + j] = 0; a[index + j] = 0;
} }
@ -363,14 +363,14 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int d_cholesky_factor(int n, double* a){ DLLEXPORT integer d_cholesky_factor(integer n, double* a){
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
dpotrf_(&uplo, &n, a, &n, &info); dpotrf_(&uplo, &n, a, &n, &info);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
int index = i * n; integer index = i * n;
for (int j = 0; j < n && i > j; ++j) for (integer j = 0; j < n && i > j; ++j)
{ {
a[index + j] = 0; a[index + j] = 0;
} }
@ -378,15 +378,15 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int c_cholesky_factor(int n, complex a[]){ DLLEXPORT integer c_cholesky_factor(integer n, complex a[]){
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
complex zero = {0.0f, 0.0f}; complex zero = {0.0f, 0.0f};
cpotrf_(&uplo, &n, a, &n, &info); cpotrf_(&uplo, &n, a, &n, &info);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
int index = i * n; integer index = i * n;
for (int j = 0; j < n && i > j; ++j) for (integer j = 0; j < n && i > j; ++j)
{ {
a[index + j] = zero; a[index + j] = zero;
} }
@ -394,15 +394,15 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int z_cholesky_factor(int n, doublecomplex a[]){ DLLEXPORT integer z_cholesky_factor(integer n, doublecomplex a[]){
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
doublecomplex zero = {0.0, 0.0}; doublecomplex zero = {0.0, 0.0};
zpotrf_(&uplo, &n, a, &n, &info); zpotrf_(&uplo, &n, a, &n, &info);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
int index = i * n; integer index = i * n;
for (int j = 0; j < n && i > j; ++j) for (integer j = 0; j < n && i > j; ++j)
{ {
a[index + j] = zero; a[index + j] = zero;
} }
@ -410,12 +410,12 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int s_cholesky_solve(int n, int nrhs, float a[], float b[]) DLLEXPORT integer s_cholesky_solve(integer n, integer nrhs, float a[], float b[])
{ {
float* clone = new float[n*n]; float* clone = new float[n*n];
memcpy(clone, a, n*n*sizeof(float)); memcpy(clone, a, n*n*sizeof(float));
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
spotrf_(&uplo, &n, clone, &n, &info); spotrf_(&uplo, &n, clone, &n, &info);
if (info != 0){ if (info != 0){
@ -427,12 +427,12 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int d_cholesky_solve(int n, int nrhs, double a[], double b[]) DLLEXPORT integer d_cholesky_solve(integer n, integer nrhs, double a[], double b[])
{ {
double* clone = new double[n*n]; double* clone = new double[n*n];
memcpy(clone, a, n*n*sizeof(double)); memcpy(clone, a, n*n*sizeof(double));
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
dpotrf_(&uplo, &n, clone, &n, &info); dpotrf_(&uplo, &n, clone, &n, &info);
if (info != 0){ if (info != 0){
@ -444,12 +444,12 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int c_cholesky_solve(int n, int nrhs, complex a[], complex b[]) DLLEXPORT integer c_cholesky_solve(integer n, integer nrhs, complex a[], complex b[])
{ {
complex* clone = new complex[n*n]; complex* clone = new complex[n*n];
memcpy(clone, a, n*n*sizeof(complex)); memcpy(clone, a, n*n*sizeof(complex));
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
cpotrf_(&uplo, &n, clone, &n, &info); cpotrf_(&uplo, &n, clone, &n, &info);
if (info != 0){ if (info != 0){
@ -461,12 +461,12 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int z_cholesky_solve(int n, int nrhs, doublecomplex a[], doublecomplex b[]) DLLEXPORT integer z_cholesky_solve(integer n, integer nrhs, doublecomplex a[], doublecomplex b[])
{ {
doublecomplex* clone = new doublecomplex[n*n]; doublecomplex* clone = new doublecomplex[n*n];
memcpy(clone, a, n*n*sizeof(doublecomplex)); memcpy(clone, a, n*n*sizeof(doublecomplex));
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
zpotrf_(&uplo, &n, clone, &n, &info); zpotrf_(&uplo, &n, clone, &n, &info);
if (info != 0){ if (info != 0){
@ -478,46 +478,46 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int s_cholesky_solve_factored(int n, int nrhs, float a[], float b[]) DLLEXPORT integer s_cholesky_solve_factored(integer n, integer nrhs, float a[], float b[])
{ {
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
spotrs_(&uplo, &n, &nrhs, a, &n, b, &n, &info); spotrs_(&uplo, &n, &nrhs, a, &n, b, &n, &info);
return info; return info;
} }
DLLEXPORT int d_cholesky_solve_factored(int n, int nrhs, double a[], double b[]) DLLEXPORT integer d_cholesky_solve_factored(integer n, integer nrhs, double a[], double b[])
{ {
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
dpotrs_(&uplo, &n, &nrhs, a, &n, b, &n, &info); dpotrs_(&uplo, &n, &nrhs, a, &n, b, &n, &info);
return info; return info;
} }
DLLEXPORT int c_cholesky_solve_factored(int n, int nrhs, complex a[], complex b[]) DLLEXPORT integer c_cholesky_solve_factored(integer n, integer nrhs, complex a[], complex b[])
{ {
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
cpotrs_(&uplo, &n, &nrhs, a, &n, b, &n, &info); cpotrs_(&uplo, &n, &nrhs, a, &n, b, &n, &info);
return info; return info;
} }
DLLEXPORT int z_cholesky_solve_factored(int n, int nrhs, doublecomplex a[], doublecomplex b[]) DLLEXPORT integer z_cholesky_solve_factored(integer n, integer nrhs, doublecomplex a[], doublecomplex b[])
{ {
char uplo = 'L'; char uplo = 'L';
int info = 0; integer info = 0;
zpotrs_(&uplo, &n, &nrhs, a, &n, b, &n, &info); zpotrs_(&uplo, &n, &nrhs, a, &n, b, &n, &info);
return info; return info;
} }
DLLEXPORT int s_qr_factor(int m, int n, float r[], float tau[], float q[], float work[], int len) DLLEXPORT integer s_qr_factor(integer m, integer n, float r[], float tau[], float q[], float work[], integer len)
{ {
int info = 0; integer info = 0;
sgeqrf_(&m, &n, r, &m, tau, work, &len, &info); sgeqrf_(&m, &n, r, &m, tau, work, &len, &info);
for (int i = 0; i < m; ++i) for (integer i = 0; i < m; ++i)
{ {
for (int j = 0; j < m && j < n; ++j) for (integer j = 0; j < m && j < n; ++j)
{ {
if (i > j) if (i > j)
{ {
@ -539,14 +539,14 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int d_qr_factor(int m, int n, double r[], double tau[], double q[], double work[], int len) DLLEXPORT integer d_qr_factor(integer m, integer n, double r[], double tau[], double q[], double work[], integer len)
{ {
int info = 0; integer info = 0;
dgeqrf_(&m, &n, r, &m, tau, work, &len, &info); dgeqrf_(&m, &n, r, &m, tau, work, &len, &info);
for (int i = 0; i < m; ++i) for (integer i = 0; i < m; ++i)
{ {
for (int j = 0; j < m && j < n; ++j) for (integer j = 0; j < m && j < n; ++j)
{ {
if (i > j) if (i > j)
{ {
@ -568,14 +568,14 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int c_qr_factor(int m, int n, complex r[], complex tau[], complex q[], complex work[], int len) DLLEXPORT integer c_qr_factor(integer m, integer n, complex r[], complex tau[], complex q[], complex work[], integer len)
{ {
int info = 0; integer info = 0;
cgeqrf_(&m, &n, r, &m, tau, work, &len, &info); cgeqrf_(&m, &n, r, &m, tau, work, &len, &info);
for (int i = 0; i < m; ++i) for (integer i = 0; i < m; ++i)
{ {
for (int j = 0; j < m && j < n; ++j) for (integer j = 0; j < m && j < n; ++j)
{ {
if (i > j) if (i > j)
{ {
@ -597,14 +597,14 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int z_qr_factor(int m, int n, doublecomplex r[], doublecomplex tau[], doublecomplex q[], doublecomplex work[], int len) DLLEXPORT integer z_qr_factor(integer m, integer n, doublecomplex r[], doublecomplex tau[], doublecomplex q[], doublecomplex work[], integer len)
{ {
int info = 0; integer info = 0;
zgeqrf_(&m, &n, r, &m, tau, work, &len, &info); zgeqrf_(&m, &n, r, &m, tau, work, &len, &info);
for (int i = 0; i < m; ++i) for (integer i = 0; i < m; ++i)
{ {
for (int j = 0; j < m && j < n; ++j) for (integer j = 0; j < m && j < n; ++j)
{ {
if (i > j) if (i > j)
{ {
@ -626,9 +626,9 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int s_qr_solve(int m, int n, int bn, float r[], float b[], float x[], float work[], int len) DLLEXPORT integer s_qr_solve(integer m, integer n, integer bn, float r[], float b[], float x[], float work[], integer len)
{ {
int info = 0; integer info = 0;
float* clone_r = new float[m*n]; float* clone_r = new float[m*n];
memcpy(clone_r, r, m*n*sizeof(float)); memcpy(clone_r, r, m*n*sizeof(float));
@ -652,9 +652,9 @@ extern "C"{
float one = 1.f; float one = 1.f;
sormqr_(&side, &tran, &m, &bn, &n, clone_r, &m, tau, clone_b, &m, work, &len, &info); sormqr_(&side, &tran, &m, &bn, &n, clone_r, &m, tau, clone_b, &m, work, &len, &info);
STRSM(&side, &upper, &no, &no, &n, &bn, &one, clone_r, &m, clone_b, &m); STRSM(&side, &upper, &no, &no, &n, &bn, &one, clone_r, &m, clone_b, &m);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
for (int j = 0; j < bn; ++j) for (integer j = 0; j < bn; ++j)
{ {
x[j * n + i] = clone_b[j * m + i]; x[j * n + i] = clone_b[j * m + i];
} }
@ -666,9 +666,9 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int d_qr_solve(int m, int n, int bn, double r[], double b[], double x[], double work[], int len) DLLEXPORT integer d_qr_solve(integer m, integer n, integer bn, double r[], double b[], double x[], double work[], integer len)
{ {
int info = 0; integer info = 0;
double* clone_r = new double[m*n]; double* clone_r = new double[m*n];
memcpy(clone_r, r, m*n*sizeof(double)); memcpy(clone_r, r, m*n*sizeof(double));
@ -693,9 +693,9 @@ extern "C"{
dormqr_(&side, &tran, &m, &bn, &n, clone_r, &m, tau, clone_b, &m, work, &len, &info); dormqr_(&side, &tran, &m, &bn, &n, clone_r, &m, tau, clone_b, &m, work, &len, &info);
DTRSM(&side, &upper, &no, &no, &n, &bn, &one, clone_r, &m, clone_b, &m); DTRSM(&side, &upper, &no, &no, &n, &bn, &one, clone_r, &m, clone_b, &m);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
for (int j = 0; j < bn; ++j) for (integer j = 0; j < bn; ++j)
{ {
x[j * n + i] = clone_b[j * m + i]; x[j * n + i] = clone_b[j * m + i];
} }
@ -707,9 +707,9 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int c_qr_solve(int m, int n, int bn, complex r[], complex b[], complex x[], complex work[], int len) DLLEXPORT integer c_qr_solve(integer m, integer n, integer bn, complex r[], complex b[], complex x[], complex work[], integer len)
{ {
int info = 0; integer info = 0;
complex* clone_r = new complex[m*n]; complex* clone_r = new complex[m*n];
memcpy(clone_r, r, m*n*sizeof(complex)); memcpy(clone_r, r, m*n*sizeof(complex));
@ -734,9 +734,9 @@ extern "C"{
complex one = {1.0, 0.0}; complex one = {1.0, 0.0};
CTRSM(&side, &upper, &no, &no, &n, &bn, &one, clone_r, &m, clone_b, &m); CTRSM(&side, &upper, &no, &no, &n, &bn, &one, clone_r, &m, clone_b, &m);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
for (int j = 0; j < bn; ++j) for (integer j = 0; j < bn; ++j)
{ {
x[j * n + i] = clone_b[j * m + i]; x[j * n + i] = clone_b[j * m + i];
} }
@ -748,9 +748,9 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int z_qr_solve(int m, int n, int bn, doublecomplex r[], doublecomplex b[], doublecomplex x[], doublecomplex work[], int len) DLLEXPORT integer z_qr_solve(integer m, integer n, integer bn, doublecomplex r[], doublecomplex b[], doublecomplex x[], doublecomplex work[], integer len)
{ {
int info = 0; integer info = 0;
doublecomplex* clone_r = new doublecomplex[m*n]; doublecomplex* clone_r = new doublecomplex[m*n];
memcpy(clone_r, r, m*n*sizeof(doublecomplex)); memcpy(clone_r, r, m*n*sizeof(doublecomplex));
@ -775,9 +775,9 @@ extern "C"{
doublecomplex one = {1.0, 0.0}; doublecomplex one = {1.0, 0.0};
ZTRSM(&side, &upper, &no, &no, &n, &bn, &one, clone_r, &m, clone_b, &m); ZTRSM(&side, &upper, &no, &no, &n, &bn, &one, clone_r, &m, clone_b, &m);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
for (int j = 0; j < bn; ++j) for (integer j = 0; j < bn; ++j)
{ {
x[j * n + i] = clone_b[j * m + i]; x[j * n + i] = clone_b[j * m + i];
} }
@ -789,11 +789,11 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int s_qr_solve_factored(int m, int n, int bn, float r[], float b[], float tau[], float x[], float work[], int len) DLLEXPORT integer s_qr_solve_factored(integer m, integer n, integer bn, float r[], float b[], float tau[], float x[], float work[], integer len)
{ {
char side ='L'; char side ='L';
char tran = 'T'; char tran = 'T';
int info = 0; integer info = 0;
char upper = 'U'; char upper = 'U';
char no = 'N'; char no = 'N';
float one = 1.f; float one = 1.f;
@ -803,9 +803,9 @@ extern "C"{
sormqr_(&side, &tran, &m, &bn, &n, r, &m, tau, clone_b, &m, work, &len, &info); sormqr_(&side, &tran, &m, &bn, &n, r, &m, tau, clone_b, &m, work, &len, &info);
STRSM(&side, &upper, &no, &no, &n, &bn, &one, r, &m, clone_b, &m); STRSM(&side, &upper, &no, &no, &n, &bn, &one, r, &m, clone_b, &m);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
for (int j = 0; j < bn; ++j) for (integer j = 0; j < bn; ++j)
{ {
x[j * n + i] = clone_b[j * m + i]; x[j * n + i] = clone_b[j * m + i];
} }
@ -815,11 +815,11 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int d_qr_solve_factored(int m, int n, int bn, double r[], double b[], double tau[], double x[], double work[], int len) DLLEXPORT integer d_qr_solve_factored(integer m, integer n, integer bn, double r[], double b[], double tau[], double x[], double work[], integer len)
{ {
char side ='L'; char side ='L';
char tran = 'T'; char tran = 'T';
int info = 0; integer info = 0;
char upper = 'U'; char upper = 'U';
char no = 'N'; char no = 'N';
double one = 1.; double one = 1.;
@ -829,9 +829,9 @@ extern "C"{
dormqr_(&side, &tran, &m, &bn, &n, r, &m, tau, clone_b, &m, work, &len, &info); dormqr_(&side, &tran, &m, &bn, &n, r, &m, tau, clone_b, &m, work, &len, &info);
DTRSM(&side, &upper, &no, &no, &n, &bn, &one, r, &m, clone_b, &m); DTRSM(&side, &upper, &no, &no, &n, &bn, &one, r, &m, clone_b, &m);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
for (int j = 0; j < bn; ++j) for (integer j = 0; j < bn; ++j)
{ {
x[j * n + i] = clone_b[j * m + i]; x[j * n + i] = clone_b[j * m + i];
} }
@ -841,11 +841,11 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int c_qr_solve_factored(int m, int n, int bn, complex r[], complex b[], complex tau[], complex x[], complex work[], int len) DLLEXPORT integer c_qr_solve_factored(integer m, integer n, integer bn, complex r[], complex b[], complex tau[], complex x[], complex work[], integer len)
{ {
char side ='L'; char side ='L';
char tran = 'C'; char tran = 'C';
int info = 0; integer info = 0;
char upper = 'U'; char upper = 'U';
char no = 'N'; char no = 'N';
@ -855,9 +855,9 @@ extern "C"{
cunmqr_(&side, &tran, &m, &bn, &n, r, &m, tau, clone_b, &m, work, &len, &info); cunmqr_(&side, &tran, &m, &bn, &n, r, &m, tau, clone_b, &m, work, &len, &info);
complex one = {1.0f, 0.0f}; complex one = {1.0f, 0.0f};
CTRSM(&side, &upper, &no, &no, &n, &bn, &one, r, &m, clone_b, &m); CTRSM(&side, &upper, &no, &no, &n, &bn, &one, r, &m, clone_b, &m);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
for (int j = 0; j < bn; ++j) for (integer j = 0; j < bn; ++j)
{ {
x[j * n + i] = clone_b[j * m + i]; x[j * n + i] = clone_b[j * m + i];
} }
@ -867,11 +867,11 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int z_qr_solve_factored(int m, int n, int bn, doublecomplex r[], doublecomplex b[], doublecomplex tau[], doublecomplex x[], doublecomplex work[], int len) DLLEXPORT integer z_qr_solve_factored(integer m, integer n, integer bn, doublecomplex r[], doublecomplex b[], doublecomplex tau[], doublecomplex x[], doublecomplex work[], integer len)
{ {
char side ='L'; char side ='L';
char tran = 'C'; char tran = 'C';
int info = 0; integer info = 0;
char upper = 'U'; char upper = 'U';
char no = 'N'; char no = 'N';
@ -882,9 +882,9 @@ extern "C"{
doublecomplex one = {1.0, 0.0}; doublecomplex one = {1.0, 0.0};
ZTRSM(&side, &upper, &no, &no, &n, &bn, &one, r, &m, clone_b, &m); ZTRSM(&side, &upper, &no, &no, &n, &bn, &one, r, &m, clone_b, &m);
for (int i = 0; i < n; ++i) for (integer i = 0; i < n; ++i)
{ {
for (int j = 0; j < bn; ++j) for (integer j = 0; j < bn; ++j)
{ {
x[j * n + i] = clone_b[j * m + i]; x[j * n + i] = clone_b[j * m + i];
} }
@ -894,32 +894,32 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int s_svd_factor(bool compute_vectors, int m, int n, float a[], float s[], float u[], float v[], float work[], int len) DLLEXPORT integer s_svd_factor(bool compute_vectors, integer m, integer n, float a[], float s[], float u[], float v[], float work[], integer len)
{ {
int info = 0; integer info = 0;
char job = compute_vectors ? 'A' : 'N'; char job = compute_vectors ? 'A' : 'N';
sgesvd_(&job, &job, &m, &n, a, &m, s, u, &m, v, &n, work, &len, &info); sgesvd_(&job, &job, &m, &n, a, &m, s, u, &m, v, &n, work, &len, &info);
return info; return info;
} }
DLLEXPORT int d_svd_factor(bool compute_vectors, int m, int n, double a[], double s[], double u[], double v[], double work[], int len) DLLEXPORT integer d_svd_factor(bool compute_vectors, integer m, integer n, double a[], double s[], double u[], double v[], double work[], integer len)
{ {
int info = 0; integer info = 0;
char job = compute_vectors ? 'A' : 'N'; char job = compute_vectors ? 'A' : 'N';
dgesvd_(&job, &job, &m, &n, a, &m, s, u, &m, v, &n, work, &len, &info); dgesvd_(&job, &job, &m, &n, a, &m, s, u, &m, v, &n, work, &len, &info);
return info; return info;
} }
DLLEXPORT int c_svd_factor(bool compute_vectors, int m, int n, complex a[], complex s[], complex u[], complex v[], complex work[], int len) DLLEXPORT integer c_svd_factor(bool compute_vectors, integer m, integer n, complex a[], complex s[], complex u[], complex v[], complex work[], integer len)
{ {
int info = 0; integer info = 0;
int dim_s = min(m,n); integer dim_s = min(m,n);
float* rwork = new float[5 * dim_s]; float* rwork = new float[5 * dim_s];
float* s_local = new float[dim_s]; float* s_local = new float[dim_s];
char job = compute_vectors ? 'A' : 'N'; char job = compute_vectors ? 'A' : 'N';
cgesvd_(&job, &job, &m, &n, a, &m, s_local, u, &m, v, &n, work, &len, rwork, &info); cgesvd_(&job, &job, &m, &n, a, &m, s_local, u, &m, v, &n, work, &len, rwork, &info);
for(int index = 0; index < dim_s; ++index){ for(integer index = 0; index < dim_s; ++index){
complex value = {s_local[index], 0.0f}; complex value = {s_local[index], 0.0f};
s[index] = value; s[index] = value;
} }
@ -929,16 +929,16 @@ extern "C"{
return info; return info;
} }
DLLEXPORT int z_svd_factor(bool compute_vectors, int m, int n, doublecomplex a[], doublecomplex s[], doublecomplex u[], doublecomplex v[], doublecomplex work[], int len) DLLEXPORT integer z_svd_factor(bool compute_vectors, integer m, integer n, doublecomplex a[], doublecomplex s[], doublecomplex u[], doublecomplex v[], doublecomplex work[], integer len)
{ {
int info = 0; integer info = 0;
int dim_s = min(m,n); integer dim_s = min(m,n);
double* rwork = new double[5 * min(m, n)]; double* rwork = new double[5 * min(m, n)];
double* s_local = new double[dim_s]; double* s_local = new double[dim_s];
char job = compute_vectors ? 'A' : 'N'; char job = compute_vectors ? 'A' : 'N';
zgesvd_(&job, &job, &m, &n, a, &m, s_local, u, &m, v, &n, work, &len, rwork, &info); zgesvd_(&job, &job, &m, &n, a, &m, s_local, u, &m, v, &n, work, &len, rwork, &info);
for(int index = 0; index < dim_s; ++index){ for(integer index = 0; index < dim_s; ++index){
doublecomplex value = {s_local[index], 0.0f}; doublecomplex value = {s_local[index], 0.0f};
s[index] = value; s[index] = value;
} }

16
src/NativeWrappers/GotoBlas2/lapack.h
View File

@ -11,15 +11,15 @@ extern "C"{
enum CBLAS_DIAG {CblasNonUnit=131, CblasUnit=132}; enum CBLAS_DIAG {CblasNonUnit=131, CblasUnit=132};
enum CBLAS_SIDE {CblasLeft=141, CblasRight=142}; enum CBLAS_SIDE {CblasLeft=141, CblasRight=142};
float slange_(char*, int*, int*, float*, int*, float*); float slange_(char*, integer*, integer*, float*, integer*, float*);
float dlange_(char*, int*, int*, double*, int*, double*); float dlange_(char*, integer*, integer*, double*, integer*, double*);
float clange_(char*, int*, int*, complex*, int*, float*); float clange_(char*, integer*, integer*, complex*, integer*, float*);
float zlange_(char*, int*, int*, doublecomplex*, int*, double*); float zlange_(char*, integer*, integer*, doublecomplex*, integer*, double*);
void cblas_strsm(CBLAS_ORDER, CBLAS_SIDE, CBLAS_UPLO, CBLAS_TRANSPOSE, CBLAS_DIAG, int, int, float, float*, int, float*, int); void cblas_strsm(CBLAS_ORDER, CBLAS_SIDE, CBLAS_UPLO, CBLAS_TRANSPOSE, CBLAS_DIAG, integer, integer, float, float*, integer, float*, integer);
void cblas_dtrsm(CBLAS_ORDER, CBLAS_SIDE, CBLAS_UPLO, CBLAS_TRANSPOSE, CBLAS_DIAG, int, int, double, double*, int, double*, int); void cblas_dtrsm(CBLAS_ORDER, CBLAS_SIDE, CBLAS_UPLO, CBLAS_TRANSPOSE, CBLAS_DIAG, integer, integer, double, double*, integer, double*, integer);
void cblas_ctrsm(CBLAS_ORDER, CBLAS_SIDE, CBLAS_UPLO, CBLAS_TRANSPOSE, CBLAS_DIAG, int, int, complex*, complex*, int, complex*, int); void cblas_ctrsm(CBLAS_ORDER, CBLAS_SIDE, CBLAS_UPLO, CBLAS_TRANSPOSE, CBLAS_DIAG, integer, integer, complex*, complex*, integer, complex*, integer);
void cblas_ztrsm(CBLAS_ORDER, CBLAS_SIDE, CBLAS_UPLO, CBLAS_TRANSPOSE, CBLAS_DIAG, int, int, doublecomplex*, doublecomplex*, int, doublecomplex*, int); void cblas_ztrsm(CBLAS_ORDER, CBLAS_SIDE, CBLAS_UPLO, CBLAS_TRANSPOSE, CBLAS_DIAG, integer, integer, doublecomplex*, doublecomplex*, integer, doublecomplex*, integer);
} }

4
src/NativeWrappers/Windows/GotoBLAS2WrapperTests/GotoBLAS2WrapperTests.csproj
View File

@ -65,9 +65,9 @@
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules> <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="MathNet.Numerics, Version=2011.3.29.268, Culture=neutral, PublicKeyToken=cd8b63ad3d691a37, processorArchitecture=MSIL"> <Reference Include="MathNet.Numerics, Version=2011.4.1.635, Culture=neutral, PublicKeyToken=cd8b63ad3d691a37, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\out\lib\Net40\MathNet.Numerics.dll</HintPath> <HintPath>..\..\..\..\out\debug\Net40\MathNet.Numerics.dll</HintPath>
</Reference> </Reference>
<Reference Include="nunit.framework"> <Reference Include="nunit.framework">
<HintPath>..\..\..\..\lib\NUnit.2.5.9\nunit.framework.dll</HintPath> <HintPath>..\..\..\..\lib\NUnit.2.5.9\nunit.framework.dll</HintPath>

5
src/NativeWrappers/Windows/MKLWrapperTests/MKLWrapperTests.csproj
View File

@ -116,16 +116,15 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="..\Win32\Debug\libiomp5md.dll"> <Content Include="..\Win32\Release\libiomp5md.dll">
<Link>libiomp5md.dll</Link> <Link>libiomp5md.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\Win32\Debug\MathNET.Numerics.MKL.dll"> <Content Include="..\Win32\Release\MathNET.Numerics.MKL.dll">
<Link>MathNET.Numerics.MKL.dll</Link> <Link>MathNET.Numerics.MKL.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

13
src/Numerics/Algorithms/LinearAlgebra/native.generic.include
View File

@ -437,13 +437,12 @@
throw new ArgumentException(Resources.ArgumentArraysSameLength, "a"); throw new ArgumentException(Resources.ArgumentArraysSameLength, "a");
} }
int info = SafeNativeMethods.<#=prefix#>_cholesky_factor(order, a); var info = SafeNativeMethods.<#=prefix#>_cholesky_factor(order, a);
if (info > 0)
{
throw new ArgumentException(Resources.ArgumentMatrixPositiveDefinite);
}
if (info > 0)
{
throw new ArgumentException(Resources.ArgumentMatrixPositiveDefinite);
}
} }
/// <summary> /// <summary>
@ -971,7 +970,7 @@
var vt = new <#=dataType#>[columnsA * columnsA]; var vt = new <#=dataType#>[columnsA * columnsA];
var clone = new <#=dataType#>[a.Length]; var clone = new <#=dataType#>[a.Length];
a.Copy(clone); a.Copy(clone);
SingularValueDecomposition(true, clone, rowsA, columnsA, s, u, vt, work); SingularValueDecomposition(true, clone, rowsA, columnsA, s, u, vt, work);
SvdSolveFactored(rowsA, columnsA, s, u, vt, b, columnsB, x); SvdSolveFactored(rowsA, columnsA, s, u, vt, b, columnsB, x);
} }

2
src/Numerics/Numerics.csproj
View File

@ -146,9 +146,9 @@
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
</Compile> </Compile>
<Compile Include="Algorithms\LinearAlgebra\GotoBlas\GotoBlasLinearAlgebraProvider.float.cs"> <Compile Include="Algorithms\LinearAlgebra\GotoBlas\GotoBlasLinearAlgebraProvider.float.cs">
<DependentUpon>GotoBlasLinearAlgebraProvider.float.tt</DependentUpon>
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
<DependentUpon>GotoBlasLinearAlgebraProvider.float.tt</DependentUpon>
</Compile> </Compile>
<Compile Include="Algorithms\LinearAlgebra\GotoBlas\SafeNativeMethods.cs"> <Compile Include="Algorithms\LinearAlgebra\GotoBlas\SafeNativeMethods.cs">
<DependentUpon>SafeNativeMethods.tt</DependentUpon> <DependentUpon>SafeNativeMethods.tt</DependentUpon>

2
src/UnitTests/Setup.cs
View File

@ -40,7 +40,7 @@ public class Setup
public void SetupProvider() public void SetupProvider()
{ {
var provider = MathNet.Numerics.UnitTests.Properties.Settings.Default.LinearAlgebraProvider.ToLowerInvariant(); var provider = MathNet.Numerics.UnitTests.Properties.Settings.Default.LinearAlgebraProvider.ToLowerInvariant();
System.Console.WriteLine(provider);
if (provider.Contains("mkl")) if (provider.Contains("mkl"))
{ {
MathNet.Numerics.Control.LinearAlgebraProvider = new MathNet.Numerics.Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider(); MathNet.Numerics.Control.LinearAlgebraProvider = new MathNet.Numerics.Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider();

Write Preview
Loading…
Cancel
Save