Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Mar 17, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eea3019
autotools: First step towards uniformization of givaro and fflas
cyrilbouvier Dec 20, 2019
bad3784
autotools: fix for gcc 4.9
cyrilbouvier Dec 20, 2019
8604d3a
fabi-version=6: detect gcc >= 5, gcc 4.3+ and gcc 4.9.2
cyrilbouvier Feb 24, 2020
7d08ffa
Merge branch 'master' into configure_simd_detection
jgdumas Mar 12, 2020
a26a5f1
Merge branch 'master' into configure_simd_detection
jgdumas Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
13 changes: 3 additions & 10 deletions autotune/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 5 additions & 7 deletions benchmarks/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading