*** empty log message ***

This commit is contained in:
jiri 2009-10-07 14:56:32 +00:00
parent 8e5a29b5c5
commit 0196701bfe
3 changed files with 21 additions and 10 deletions

View File

@ -6,13 +6,15 @@ t_SOURCES = t.cc t2.cc
test_SOURCES = test.cc test_SOURCES = test.cc
LDADD = libla.a LDADD = libla.a
EXTRA_DIST = LICENSE
# #
CXXFLAGS += -fno-omit-frame-pointer -O3 -g -fPIC -finline-limit=1000 CXXFLAGS += -fno-omit-frame-pointer -O3 -g -fPIC -finline-limit=1000
CXXFLAGS += -DNO_STRASSEN -DFORTRAN_ CXXFLAGS += -DNO_STRASSEN -DFORTRAN_
CXXFLAGS += -DDEBUG CXXFLAGS += -DDEBUG
LDFLAGS += $(CBLASOPT) LDFLAGS += $(CBLASOPT) $(CLAPACKOPT)
LDFLAGS += $(CBLASLIB) LDFLAGS += $(CBLASLIB)
LDFLAGS += $(TRACEBACKOPT) LDFLAGS += $(TRACEBACKOPT)
LDFLAGS += $(TRACEBACKLIB) LDFLAGS += $(TRACEBACKLIB)

View File

@ -21,6 +21,11 @@ AC_CHECK_LIB([cblas], [cblas_ddot], [CBLASLIB=-lcblas], [CBLASOPT=-DNONCBLAS])
AC_SUBST([CBLASLIB]) AC_SUBST([CBLASLIB])
AC_SUBST([CBLASOPT]) AC_SUBST([CBLASOPT])
AC_CHECK_LIB([lapack], [clapack_dgesv], , [CLAPACKOPT=-DNONCLAPACK])
AC_SUBST([CLAPACKOPT])
#the check for traceback needs bfd to be linked into #the check for traceback needs bfd to be linked into
AC_CHECK_LIB([bfd], [bfd_fprintf_vma]) AC_CHECK_LIB([bfd], [bfd_fprintf_vma])
AC_CHECK_LIB([traceback], [sigtraceback], [TRACEBACKLIB="-ltraceback -lbfd" TRACEBACKOPT=-DUSE_TRACEBACK]) AC_CHECK_LIB([traceback], [sigtraceback], [TRACEBACKLIB="-ltraceback -lbfd" TRACEBACKOPT=-DUSE_TRACEBACK])

View File

@ -16,7 +16,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef NONCBLAS
#include "noncblas.h" #include "noncblas.h"
#include "laerror.h" #include "laerror.h"
@ -28,6 +27,7 @@
#define FORNAME(x) x #define FORNAME(x) x
#endif #endif
#ifdef NONCBLAS
//Level 1 - straightforward wrappers //Level 1 - straightforward wrappers
extern "C" double FORNAME(ddot) (const int *n, const double *x, const int *incx, const double *y, const int *incy); extern "C" double FORNAME(ddot) (const int *n, const double *x, const int *incx, const double *y, const int *incy);
@ -225,6 +225,17 @@ if(TransA == CblasConjTrans) laerror("zgemv with CblasConjTrans not supportted")
FORNAME(zgemv) (TransA==CblasNoTrans?"T":"N", &N, &M, alpha, A, &lda, X, &incX, beta, Y, &incY ); FORNAME(zgemv) (TransA==CblasNoTrans?"T":"N", &N, &M, alpha, A, &lda, X, &incX, beta, Y, &incY );
} }
extern "C" int FORNAME(idamax) (const int *N, const double *DX, const int *INCX);
CBLAS_INDEX cblas_idamax(const int N, const double *X, const int incX)
{
return FORNAME(idamax)(&N,X,&incX);
}
#endif
#ifdef NONCLAPACK
//clapack_dgesv //clapack_dgesv
//allocate auxiliary storage and transpose input and output quantities to fortran/C order //allocate auxiliary storage and transpose input and output quantities to fortran/C order
extern "C" void FORNAME(dgesv) (const int *N, const int *NRHS, double *A, const int *LDA, int *IPIV, double *B, const int *LDB, int *INFO); extern "C" void FORNAME(dgesv) (const int *N, const int *NRHS, double *A, const int *LDA, int *IPIV, double *B, const int *LDB, int *INFO);
@ -242,12 +253,5 @@ for(int i=1; i<N; ++i) for(int j=0; j<i; ++j) {double t=A[j*lda+i]; A[j*lda+i]=
return INFO; return INFO;
} }
extern "C" int FORNAME(idamax) (const int *N, const double *DX, const int *INCX);
CBLAS_INDEX cblas_idamax(const int N, const double *X, const int incX)
{
return FORNAME(idamax)(&N,X,&incX);
}
#endif #endif