*** empty log message ***

This commit is contained in:
jiri 2019-03-30 17:01:03 +00:00
parent 9dd4b18976
commit 4151cda15d
2 changed files with 20 additions and 14 deletions

View File

@ -14,16 +14,21 @@ EXTRA_DIST = LICENSE doxygen.cfg aminclude.am acinclude.m4 footer.html
#todo: achieve portability of the fortran calls via autoconf? #todo: achieve portability of the fortran calls via autoconf?
#use ./configure CXXFLAGS="" LDFLAGS="" to avoid defaults #use ./configure CXXFLAGS="" LDFLAGS="" to avoid defaults
CXXFLAGS += -g
CXXFLAGS += $(OPTIMIZEOPT) $(CUDAOPT) $(FORINTOPT) $(DEBUGOPT) $(MATPTROPT)
CXXFLAGS += -DNO_STRASSEN -DFORTRAN_
CXXFLAGS += $(CBLASOPT) $(CLAPACKOPT) AM_LDFLAGS=
LDFLAGS += $(CBLASLIB) AM_CXXFLAGS=
LDFLAGS += $(BLASLIB)
LDFLAGS += $(ATLASLIB) AM_CXXFLAGS += -g
CXXFLAGS += $(TRACEBACKOPT) AM_CXXFLAGS += $(OPTIMIZEOPT) $(CUDAOPT) $(FORINTOPT) $(DEBUGOPT) $(MATPTROPT)
LDFLAGS += $(CUDALIBS) AM_CXXFLAGS += -DNO_STRASSEN -DFORTRAN_
LDFLAGS += $(TRACEBACKLIB)
AM_CXXFLAGS += $(CBLASOPT) $(CLAPACKOPT)
AM_CXXFLAGS += $(TRACEBACKOPT)
#AM_LDFLAGS += .libs/libla.a
AM_LDFLAGS += $(CBLASLIB)
AM_LDFLAGS += $(BLASLIB)
AM_LDFLAGS += $(ATLASLIB)
AM_LDFLAGS += $(CUDALIBS)
AM_LDFLAGS += $(TRACEBACKLIB)
include $(top_srcdir)/aminclude.am include $(top_srcdir)/aminclude.am

View File

@ -2,9 +2,10 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([libla], [0.6], [jiri@pittnerovi.com]) AC_INIT([libla], [0.8], [jiri@pittnerovi.com])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AM_PROG_AR
AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_INIT_AUTOMAKE([-Wall -Werror foreign])
LT_INIT LT_INIT
@ -19,12 +20,12 @@ AC_LANG(C++)
# Checks for mandatory libraries. # Checks for mandatory libraries.
ATLASLIB="" ATLASLIB=""
AC_CHECK_LIB([atlas], [ATL_zgemv],ATLASLIB=-latlas, [ AC_CHECK_LIB([atlas], [ATL_zgemv],ATLASLIB="-lblas -latlas", [
echo "ATLAS not found, I hope you are using some other (more) efficient BLAS!" echo "ATLAS not found, I hope you are using some other (more) efficient BLAS!"
]) ])
AC_SUBST([ATLASLIB]) AC_SUBST([ATLASLIB])
AC_CHECK_LIB([blas], [dgemm_],BLASLIB=-lblas, [ AC_CHECK_LIB([blas], [dgemm_],BLASLIB="-lblas", [
echo ERROR: BLAS not found! You have to install the BLAS library. echo ERROR: BLAS not found! You have to install the BLAS library.
exit exit
],[$ATLASLIB]) ],[$ATLASLIB])
@ -42,7 +43,7 @@ AC_ARG_ENABLE([matptr],[ --enable-matptr switch to double** matrix representa
#cblas and clapack available? #cblas and clapack available?
AC_CHECK_LIB([cblas], [cblas_ddot], [CBLASLIB=-lcblas], [CBLASOPT=-DNONCBLAS],[$ATLASLIB]) AC_CHECK_LIB([cblas], [cblas_ddot], [CBLASLIB="-lcblas"], [CBLASOPT=-DNONCBLAS],[$ATLASLIB])
AC_CHECK_HEADER([cblas.h],,[CBLASOPT=-DNONCBLAS CBLASLIB=""], AC_INCLUDES_DEFAULT) AC_CHECK_HEADER([cblas.h],,[CBLASOPT=-DNONCBLAS CBLASLIB=""], AC_INCLUDES_DEFAULT)
AC_SUBST([CBLASLIB]) AC_SUBST([CBLASLIB])
AC_SUBST([CBLASOPT]) AC_SUBST([CBLASOPT])