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

native: change the gotoblas wrapper to use the dll build and lapack interface

pull/36/head
Marcus Cuda 15 years ago
parent
06b43e5481
commit
4306a730d4
4 changed files with 123 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 113
      src/NativeWrappers/GotoBlas2/blas.c
  2. 44
      src/NativeWrappers/GotoBlas2/lapack.cpp
  3. 8
      src/NativeWrappers/Windows/GotoBLAS2/GotoBLAS2Wrapper.vcxproj
  4. 8
      src/NativeWrappers/Windows/GotoBLAS2WrapperTests/GotoBLAS2WrapperTests.csproj

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

@ -1,82 +1,127 @@
#include "cblas.h"
#include "wrapper_common.h"
#include <stdlib.h>
typedef struct { float r, i; } complex;
typedef struct { double r, i; } doublecomplex;
enum TRANSPOSE {CblasNoTrans=111, CblasTrans=112, CblasConjTrans=113, CblasConjNoTrans=114};
void SAXPY(int*, float*, float *x, int* incx, float *y, int* incy);
void DAXPY(int*, double*, double *x, int* incx, double *y, int* incy);
void CAXPY(int*, complex*, complex *x, int* incx, complex *y, int* incy);
void ZAXPY(int*, doublecomplex*, doublecomplex *x, int* incx, doublecomplex *y, int* incy);
void SSCAL(int*, float* alpha, float*, int*);
void DSCAL(int*, double* alpha, double*, int*);
void CSCAL(int*, complex* alpha, complex*, int*);
void ZSCAL(int*, doublecomplex* alpha, doublecomplex*, int*);
float SDOT(int*, float*, int*, float*, int*);
double DDOT(int*, double*, int*, double*, int*);
complex CDOTU(int*, complex*, int*, complex*, int*);
doublecomplex ZDOTU(int*, doublecomplex*, int*, doublecomplex*, int*);
void SGEMM(char*, char*, int*, int*, int*, float*, float*, int*, float*, int*, float*, float*, int*);
void DGEMM(char*, char*, int*, int*, int*, double*, double*, int*, double*, int*, double*, double*, int*);
void CGEMM(char*, char*, int*, int*, int*, complex*, complex*, int*, complex*, int*, complex*, complex*, int*);
void ZGEMM(char*, char*, int*, int*, int*, doublecomplex*, doublecomplex*, int*, doublecomplex*, int*, doublecomplex*, doublecomplex*, int*);
char getTransChar(TRANSPOSE);
int one = 1;
DLLEXPORT void s_axpy(int n, float alpha, float x[], float y[]){
cblas_saxpy(n, alpha, x, 1, y, 1);
SAXPY(&n, &alpha, x, &one, y, &one);
}
DLLEXPORT void d_axpy(int n, double alpha, double x[], double y[]){
cblas_daxpy(n, alpha, x, 1, y, 1);
DAXPY(&n, &alpha, x, &one, y, &one);
}
DLLEXPORT void c_axpy(int n, Complex8 alpha, Complex8 x[], Complex8 y[]){
cblas_caxpy(n, &alpha, x, 1, y, 1);
DLLEXPORT void c_axpy(int n, complex alpha, complex x[], complex y[]){
CAXPY(&n, &alpha, x, &one, y, &one);
}
DLLEXPORT void z_axpy(int n, Complex16 alpha, Complex16 x[], Complex16 y[]){
cblas_zaxpy(n, &alpha, x, 1, y, 1);
DLLEXPORT void z_axpy(int n, doublecomplex alpha, doublecomplex x[], doublecomplex y[]){
ZAXPY(&n, &alpha, x, &one, y, &one);
}
DLLEXPORT void s_scale(int n, float alpha, float x[]){
cblas_sscal(n, alpha, x, 1);
SSCAL(&n, &alpha, x, &one);
}
DLLEXPORT void d_scale(int n, double alpha, double x[]){
cblas_dscal(n, alpha, x, 1);
DSCAL(&n, &alpha, x, &one);
}
DLLEXPORT void c_scale(int n, Complex8 alpha, Complex8 x[]){
cblas_cscal(n, &alpha, x, 1);
DLLEXPORT void c_scale(int n, complex alpha, complex x[]){
CSCAL(&n, &alpha, x, &one);
}
DLLEXPORT void z_scale(int n, Complex16 alpha, Complex16 x[]){
cblas_zscal(n, &alpha, x, 1);
DLLEXPORT void z_scale(int n, doublecomplex alpha, doublecomplex x[]){
ZSCAL(&n, &alpha, x, &one);
}
DLLEXPORT float s_dot_product(int n, float x[], float y[]){
return cblas_sdot(n, x, 1, y, 1);
return SDOT(&n, x, &one, y, &one);
}
DLLEXPORT double d_dot_product(int n, double x[], double y[]){
return cblas_ddot(n, x, 1, y, 1);
return DDOT(&n, x, &one, y, &one);
}
DLLEXPORT Complex8 c_dot_product(int n, Complex8 x[], Complex8 y[]){
Complex8 ret;
cblas_cdotu_sub(n, x, 1, y, 1, &ret);
return ret;
DLLEXPORT complex c_dot_product(int n, complex x[], complex y[]){
return CDOTU(&n, x, &one, y, &one);
}
DLLEXPORT Complex16 z_dot_product(int n, Complex16 x[], Complex16 y[]){
Complex16 ret;
cblas_zdotu_sub(n, x, 1, y, 1, &ret);
return ret;
DLLEXPORT doublecomplex z_dot_product(int n, doublecomplex x[], doublecomplex y[]){
return ZDOTU(&n, x, &one, y, &one);
}
DLLEXPORT void s_matrix_multiply(enum CBLAS_TRANSPOSE transA, enum CBLAS_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, int m, int n, int k, float alpha, float x[], float y[], float beta, float c[]){
int lda = transA == CblasNoTrans ? m : k;
int ldb = transB == CblasNoTrans ? k : n;
cblas_sgemm(CblasColMajor, transA, transB, m, n, k, alpha, x, lda, y, ldb, beta, c, m);
char transAchar = getTransChar(transA);
char transBchar = getTransChar(transB);
SGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m);
}
DLLEXPORT void d_matrix_multiply(enum CBLAS_TRANSPOSE transA, enum CBLAS_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, int m, int n, int k, double alpha, double x[], double y[], double beta, double c[]){
int lda = transA == CblasNoTrans ? m : k;
int ldb = transB == CblasNoTrans ? k : n;
cblas_dgemm(CblasColMajor, transA, transB, m, n, k, alpha, x, lda, y, ldb, beta, c, m);
char transAchar = getTransChar(transA);
char transBchar = getTransChar(transB);
DGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m);
}
DLLEXPORT void c_matrix_multiply(enum CBLAS_TRANSPOSE transA, enum CBLAS_TRANSPOSE transB, int m, int n, int k, Complex8 alpha, Complex8 x[], Complex8 y[], Complex8 beta, Complex8 c[]){
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[]){
int lda = transA == CblasNoTrans ? m : k;
int ldb = transB == CblasNoTrans ? k : n;
cblas_cgemm(CblasColMajor, transA, transB, m, n, k, &alpha, x, lda, y, ldb, &beta, c, m);
char transAchar = getTransChar(transA);
char transBchar = getTransChar(transB);
CGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m);
}
DLLEXPORT void z_matrix_multiply(enum CBLAS_TRANSPOSE transA, enum CBLAS_TRANSPOSE transB, int m, int n, int k, Complex16 alpha, Complex16 x[], Complex16 y[], Complex16 beta, Complex16 c[]){
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[]){
int lda = transA == CblasNoTrans ? m : k;
int ldb = transB == CblasNoTrans ? k : n;
char transAchar = getTransChar(transA);
char transBchar = getTransChar(transB);
ZGEMM(&transAchar, &transBchar, &m, &n, &k, &alpha, x, &lda, y, &ldb, &beta, c, &m);
}
cblas_zgemm(CblasColMajor, transA, transB, m, n, k, &alpha, x, lda, y, ldb, &beta, c, m);
char getTransChar(enum TRANSPOSE trans){
char cTrans;
switch( trans ){
case CblasNoTrans : cTrans = 'N';
break;
case CblasTrans : cTrans = 'T';
break;
case CblasConjTrans : cTrans = 'C';
break;
}
return cTrans;
}

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

@ -3,6 +3,12 @@
#include "lapack.h"
extern "C"{
void STRSM(char*, char*, char*, char*, int*, int*, float*, float*, int*, float*, int*);
void DTRSM(char*, char*, char*, char*, int*, int*, double*, double*, int*, double*, int*);
void CTRSM(char*, char*, char*, char*, int*, int*, complex*, complex*, int*, complex*, int*);
void ZTRSM(char*, char*, char*, char*, int*, int*, doublecomplex*, doublecomplex*, int*, doublecomplex*, int*);
DLLEXPORT float s_matrix_norm(char norm, int m, int n, float a[], float work[])
{
return slange_(&norm, &m, &n, a, &m, work);
@ -641,8 +647,11 @@ extern "C"{
char side ='L';
char tran = 'T';
char upper = 'U';
char no = 'N';
float one = 1.f;
sormqr_(&side, &tran, &m, &bn, &n, clone_r, &m, tau, clone_b, &m, work, &len, &info);
cblas_strsm(CblasColMajor, CblasLeft, CblasUpper, CblasNoTrans, CblasNonUnit, n, bn, 1.0, 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 (int j = 0; j < bn; ++j)
@ -678,9 +687,12 @@ extern "C"{
char side ='L';
char tran = 'T';
char upper = 'U';
char no = 'N';
double one = 1.;
dormqr_(&side, &tran, &m, &bn, &n, clone_r, &m, tau, clone_b, &m, work, &len, &info);
cblas_dtrsm(CblasColMajor, CblasLeft, CblasUpper, CblasNoTrans, CblasNonUnit, n, bn, 1.0, 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 (int j = 0; j < bn; ++j)
@ -713,13 +725,14 @@ extern "C"{
char side ='L';
char tran = 'C';
char upper = 'U';
char no = 'N';
complex* clone_b = new complex[m*bn];
memcpy(clone_b, b, m*bn*sizeof(complex));
cunmqr_(&side, &tran, &m, &bn, &n, clone_r, &m, tau, clone_b, &m, work, &len, &info);
complex one = {1.0, 0.0};
cblas_ctrsm(CblasColMajor, CblasLeft, CblasUpper, CblasNoTrans, CblasNonUnit, 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)
{
@ -753,13 +766,14 @@ extern "C"{
char side ='L';
char tran = 'C';
char upper = 'U';
char no = 'N';
doublecomplex* clone_b = new doublecomplex[m*bn];
memcpy(clone_b, b, m*bn*sizeof(doublecomplex));
zunmqr_(&side, &tran, &m, &bn, &n, clone_r, &m, tau, clone_b, &m, work, &len, &info);
doublecomplex one = {1.0, 0.0};
cblas_ztrsm(CblasColMajor, CblasLeft, CblasUpper, CblasNoTrans, CblasNonUnit, 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)
{
@ -780,12 +794,15 @@ extern "C"{
char side ='L';
char tran = 'T';
int info = 0;
char upper = 'U';
char no = 'N';
float one = 1.f;
float* clone_b = new float[m*bn];
memcpy(clone_b, b, m*bn*sizeof(float));
sormqr_(&side, &tran, &m, &bn, &n, r, &m, tau, clone_b, &m, work, &len, &info);
cblas_strsm(CblasColMajor, CblasLeft, CblasUpper, CblasNoTrans, CblasNonUnit, n, bn, 1.0, 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 (int j = 0; j < bn; ++j)
@ -803,12 +820,15 @@ extern "C"{
char side ='L';
char tran = 'T';
int info = 0;
char upper = 'U';
char no = 'N';
double one = 1.;
double* clone_b = new double[m*bn];
memcpy(clone_b, b, m*bn*sizeof(double));
dormqr_(&side, &tran, &m, &bn, &n, r, &m, tau, clone_b, &m, work, &len, &info);
cblas_dtrsm(CblasColMajor, CblasLeft, CblasUpper, CblasNoTrans, CblasNonUnit, n, bn, 1.0, 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 (int j = 0; j < bn; ++j)
@ -826,13 +846,15 @@ extern "C"{
char side ='L';
char tran = 'C';
int info = 0;
char upper = 'U';
char no = 'N';
complex* clone_b = new complex[m*bn];
memcpy(clone_b, b, m*bn*sizeof(complex));
cunmqr_(&side, &tran, &m, &bn, &n, r, &m, tau, clone_b, &m, work, &len, &info);
complex one = {1.0f, 0.0f};
cblas_ctrsm(CblasColMajor, CblasLeft, CblasUpper, CblasNoTrans, CblasNonUnit, 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 (int j = 0; j < bn; ++j)
@ -850,13 +872,15 @@ extern "C"{
char side ='L';
char tran = 'C';
int info = 0;
char upper = 'U';
char no = 'N';
doublecomplex* clone_b = new doublecomplex[m*bn];
memcpy(clone_b, b, m*bn*sizeof(doublecomplex));
zunmqr_(&side, &tran, &m, &bn, &n, r, &m, tau, clone_b, &m, work, &len, &info);
doublecomplex one = {1.0, 0.0};
cblas_ztrsm(CblasColMajor, CblasLeft, CblasUpper, CblasNoTrans, CblasNonUnit, 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)
{

8
src/NativeWrappers/Windows/GotoBLAS2/GotoBLAS2Wrapper.vcxproj
View File

@ -85,8 +85,8 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\..\..\..\lib\GotoBLAS2;</AdditionalLibraryDirectories>
<AdditionalDependencies>libgoto2_core2p-r1.13_x86.lib;libf2c_x86.lib;lapack_x86.lib;libf2c_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\..\lib\GotoBLAS2\x86;</AdditionalLibraryDirectories>
<AdditionalDependencies>libgoto2.lib;libf2c_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<OutputFile>$(OutDir)MathNET.Numerics.GotoBLAS2.dll</OutputFile>
</Link>
@ -123,8 +123,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\..\..\..\lib\GotoBLAS2;</AdditionalLibraryDirectories>
<AdditionalDependencies>libgoto2_core2p-r1.13_x86.lib;libf2c_x86.lib;lapack_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\..\lib\GotoBLAS2\x86;</AdditionalLibraryDirectories>
<AdditionalDependencies>libgoto2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<OutputFile>$(OutDir)MathNET.Numerics.GotoBLAS2.dll</OutputFile>
</Link>

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

@ -29,7 +29,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
@ -104,7 +104,11 @@
<Compile Include="Single\GotoBlasLinearAlgebraProviderTests.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="..\x64\Release\MathNET.Numerics.GotoBLAS2.dll">
<Content Include="..\..\..\..\lib\GotoBLAS2\x86\libgoto2.dll">
<Link>libgoto2.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\Release\MathNET.Numerics.GotoBLAS2.dll">
<Link>MathNET.Numerics.GotoBLAS2.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>

Write Preview
Loading…
Cancel
Save