From eb0aaf9adf7de8e84121b87c28ed161a517242a4 Mon Sep 17 00:00:00 2001
From: jiri <jiri>
Date: Fri, 18 Jun 2010 12:54:26 +0000
Subject: [PATCH] *** empty log message ***

---
 Makefile.am  | 11 ++++++-----
 configure.ac | 30 +++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8ff04b3..5c4bf25 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libla.la
-include_HEADERS = auxstorage.h  davidson.h   laerror.h    mat.h          qsort.h             vec.h bisection.h   diis.h       la.h         noncblas.h     smat.h bitvector.h   fourindex.h  la_traits.h  nonclass.h     sparsemat.h sparsesmat.h conjgrad.h    gmres.h      matexp.h     permutation.h  
-libla_la_SOURCES = vec.cc mat.cc smat.cc sparsemat.cc sparsesmat.cc laerror.cc noncblas.cc  bitvector.cc strassen.cc nonclass.cc
+include_HEADERS = fortran.h cuda_la.h auxstorage.h  davidson.h   laerror.h    mat.h          qsort.h             vec.h bisection.h   diis.h       la.h         noncblas.h     smat.h bitvector.h   fourindex.h  la_traits.h  nonclass.h     sparsemat.h sparsesmat.h conjgrad.h    gmres.h      matexp.h     permutation.h  
+libla_la_SOURCES = vec.cc mat.cc smat.cc sparsemat.cc sparsesmat.cc laerror.cc noncblas.cc  bitvector.cc strassen.cc nonclass.cc cuda_la.cc
 check_PROGRAMS = t test
 t_SOURCES = t.cc t2.cc 
 test_SOURCES = test.cc
@@ -11,13 +11,14 @@ EXTRA_DIST = LICENSE
 
 #todo: achieve portability of the fortran calls via autoconf?
 
-CXXFLAGS = -g 
-CXXFLAGS += $(OPTIMIZEOPT) $(DEBUGOPT) $(MATPTROPT)
+#use ./configure CXXFLAGS="" LDFLAGS="" to avoid defaults
+CXXFLAGS += -g 
+CXXFLAGS += $(OPTIMIZEOPT) $(CUDAOPT) $(FORINTOPT) $(DEBUGOPT) $(MATPTROPT)
 CXXFLAGS += -DNO_STRASSEN -DFORTRAN_
 
 CXXFLAGS += $(CBLASOPT) $(CLAPACKOPT)
 LDFLAGS += $(CBLASLIB)
 CXXFLAGS += $(TRACEBACKOPT)
+LDFLAGS += $(CUDALIBS)
 LDFLAGS += $(TRACEBACKLIB)
 
-
diff --git a/configure.ac b/configure.ac
index 592f73a..2f8ea7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,13 +34,24 @@ AC_CHECK_LIB([lapack], [dgeev_],, [
 
 
 #check for optional libraries
+
+#cblas and clapack available?
 AC_CHECK_LIB([cblas], [cblas_ddot], [CBLASLIB=-lcblas], [CBLASOPT=-DNONCBLAS])
+AC_CHECK_HEADER([cblas.h],,[CBLASOPT=-DNONCBLAS CBLASLIB=""], AC_INCLUDES_DEFAULT)
 AC_SUBST([CBLASLIB])
 AC_SUBST([CBLASOPT])
 
 AC_CHECK_LIB([lapack], [clapack_dgesv], , [CLAPACKOPT=-DNONCLAPACK])
+AC_CHECK_HEADER([clapack.h],,[CLAPACKOPT=-DNONCLAPACK], AC_INCLUDES_DEFAULT)
 AC_SUBST([CLAPACKOPT])
 
+#CUDA available? link with cublas and avoid cblas and clapack then...
+AC_CHECK_LIB([cublas], [cublasInit], [CUDALIBS=-lcublas CUDAOPT=-DCUDALA CBLASOPT=-DNONCBLAS CLAPACKOPT=-DNONCLAPACK CBLASLIB=""], [CUDALIB="" CUDAOPT=""])
+AC_CHECK_HEADER([cublas.h],,[CUDAOPT="" CUDALIBS=""], AC_INCLUDES_DEFAULT)
+AC_SUBST([CUDALIBS])
+AC_SUBST([CUDAOPT])
+
+
 #the check for traceback needs bfd to be linked into
 AC_CHECK_LIB([bfd], [bfd_fprintf_vma])
 AC_CHECK_LIB([traceback], [sigtraceback], [TRACEBACKLIB="-ltraceback -lbfd" TRACEBACKOPT="-DUSE_TRACEBACK -fno-omit-frame-pointer"])
@@ -48,6 +59,21 @@ AC_SUBST([TRACEBACKOPT])
 AC_SUBST([TRACEBACKLIB])
 
 #process options
+FORINTOPT=""
+AC_ARG_ENABLE([fotran64int],[  --enable-fotran64int to link with 64-bit-integer-BLAS+LAPACK ],
+    [case "${enableval}" in
+     yes) FORINTOPT="-DLONG_FORTRAN_INT" 
+	CBLASLIB=""
+	CBLASOPT=-DNONCBLAS
+	CLAPACKOPT=-DNONCLAPACK
+	;;
+     no) FORINTOPT="" ;;
+     *) FORINTOPT=${enableval}
+     esac],
+ ,)
+AC_SUBST([FORINTOPT])
+
+
 OPTIMIZEOPT="-O3 -finline-limit=1000"
 AC_ARG_ENABLE([optimize],[  --enable-optimize   to compile with optimization [[default= -O3 -finline-limit=1000]]],
     [case "${enableval}" in
@@ -101,7 +127,9 @@ echo "**************************************************************************
 echo "The LA library has now been configured. You may run make; make check; make install"
 echo "Please make sure that the generated Makefile employs a proper version of optimized"
 echo "BLAS/LAPACK library. If not, re-run configure with CXXFLAGS and LDFLAGS options   "
-echo "set to '-I path' and '-L path' for your preferred BLAS/LAPACK library version     "
+echo "set to '-I path' and '-L path' for your preferred BLAS/LAPACK library version.    "
+echo "In addition, similarly you might set include and link paths for Nvidia CUBLAS.    "
 echo "For usage examples see file t.cc. Do not forget using copyonwrite() before        "
 echo "changing individual matrix/vector elements via l.h.s. operator[] or operator()    "
 echo "**********************************************************************************"
+