autotools: towards uniformization of givaro and fflas-ffpack (#293)

* autotools: First step towards uniformization of givaro and fflas * autotools: fix for gcc 4.9 * fabi-version=6: detect gcc >= 5, gcc 4.3+ and gcc 4.9.2 Co-authored-by: Jean-Guillaume Dumas <[email protected]>
linbox-team · Mar 17, 2020 · cad4a57 · cad4a57
1 parent 2d9df94
commit cad4a57
Show file tree

Hide file tree

Showing 25 changed files with 332 additions and 1,682 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,15 +14,17 @@ matrix:
           - ubuntu-toolchain-r-test
           packages:
           - g++-4.9
+          - binutils
           - gfortran-4.9
           - libgmp-dev
           - libgmpxx4ldbl
           - libtool
           - autoconf
           - libopenblas-dev
+
     - os: linux
       sudo: required
-      dist: xenial
+      dist: bionic
       compiler: gcc
       env: GCC_VERSION=7
       addons:
@@ -31,30 +33,33 @@ matrix:
           - ubuntu-toolchain-r-test
           packages:
           - g++-7
+          - binutils
           - gfortran-7
           - libgmp-dev
           - libgmpxx4ldbl
           - libtool
           - autoconf
           - libopenblas-dev
+
     - os: linux
       sudo: required
-      dist: xenial
+      dist: bionic
       compiler: gcc
       env: GCC_VERSION=8
-      # BLAS_LIBS='--with-blas-libs="-latlas -lcblas"'
       addons:
         apt:
           sources:
           - ubuntu-toolchain-r-test
           packages:
           - g++-8
+          - binutils
           - gfortran-8
           - libgmp-dev
           - libgmpxx4ldbl
           - libtool
           - autoconf
           - libopenblas-dev
+
     # - os: linux
     #   sudo: required
     #   dist: trusty
@@ -94,7 +99,7 @@ before_script:
   - git clone --depth 1 https://github.com/linbox-team/givaro.git && cd givaro && ./autogen.sh && make && sudo make install && cd ..
   - git clone --depth=1 https://github.com/xianyi/OpenBLAS.git  && cd OpenBLAS && make && sudo make PREFIX="/usr/local" install && cd ..
   - export LD_LIBRARY_PATH=/usr/local/lib
-  - ./autogen.sh #$BLAS_LIBS
+  - ./autogen.sh
 
 script:
   - make

diff --git a/autotune/Makefile.am b/autotune/Makefile.am
@@ -20,16 +20,9 @@
 # ========LICENCE========
 #/
 
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -I$(top_srcdir)
-
-# Forcing compilation without the precompiled libraries for the autotuning only
-# if FFLASFFPACK_PRECOMPILED
-# AM_LDFLAGS = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) \
-# 	$(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la \
-# 	$(top_builddir)/fflas-ffpack/interfaces/libs/libffpack.la
-# else
-AM_LDFLAGS = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS)
-#endif
+AM_CXXFLAGS = $(FFLASFFPACK_CXXFLAGS) $(GIVARO_CFLAGS) $(BLAS_CFLAGS) $(PARFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)
+LDADD = $(GIVARO_LIBS) $(BLAS_LIBS) $(PARLIBS)
 
 AUTOTUNE_FGEMM = winograd-modular-float winograd-modular-double winograd-modularbalanced-float winograd-modularbalanced-double
 AUTOTUNE_PLUQ = pluq

diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
@@ -23,14 +23,12 @@
 SUBDIRS =
 benchmarks:  $(BENCHMARKS)
 
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -I$(top_srcdir) $(PRECOMPILE_FLAGS)
-
+AM_CXXFLAGS = $(FFLASFFPACK_CXXFLAGS) $(GIVARO_CFLAGS) $(BLAS_CFLAGS) $(PARFLAGS) $(PRECOMPILE_FLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)
+LDADD = $(GIVARO_LIBS) $(BLAS_LIBS) $(PARLIBS)
 if FFLASFFPACK_PRECOMPILED
-LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) \
-	$(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la \
-	$(top_builddir)/fflas-ffpack/interfaces/libs/libffpack.la
-else
-LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS)
+LDADD += $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la
+LDADD += $(top_builddir)/fflas-ffpack/interfaces/libs/libffpack.la
 endif
 
 PERFPUBLISHERFILE=benchmarks-report.xml