Aquila-Consortium/libsharp2
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better multiarch support

Browse source
This commit is contained in:
Martin Reinecke 2019-01-22 12:05:13 +01:00
parent dc5fbb0afd
commit 8c715c11c8
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Makefile.am
View file

@ -18,6 +18,8 @@ libsharp_la_SOURCES = \
libsharp/sharp_vecsupport.h \ libsharp/sharp_vecsupport.h \
libsharp/sharp_ylmgen_c.h libsharp/sharp_ylmgen_c.h
if HAVE_MULTIARCH
libavx_la_SOURCES = libsharp/sharp_core_inc.c libavx_la_SOURCES = libsharp/sharp_core_inc.c
libavx2_la_SOURCES = libsharp/sharp_core_inc.c libavx2_la_SOURCES = libsharp/sharp_core_inc.c
libfma_la_SOURCES = libsharp/sharp_core_inc.c libfma_la_SOURCES = libsharp/sharp_core_inc.c
@ -26,8 +28,16 @@ libavx512f_la_SOURCES = libsharp/sharp_core_inc.c
noinst_LTLIBRARIES = libavx.la libavx2.la libfma.la libfma4.la libavx512f.la noinst_LTLIBRARIES = libavx.la libavx2.la libfma.la libfma4.la libavx512f.la
libavx_la_CFLAGS = ${AM_CFLAGS} -mavx -DARCH=avx
libavx2_la_CFLAGS = ${AM_CFLAGS} -mavx2 -DARCH=avx2
libfma_la_CFLAGS = ${AM_CFLAGS} -mfma -DARCH=fma
libfma4_la_CFLAGS = ${AM_CFLAGS} -mfma4 -DARCH=fma4
libavx512f_la_CFLAGS = ${AM_CFLAGS} -mavx512f -DARCH=avx512f
libsharp_la_LIBADD = libavx.la libavx2.la libfma.la libfma4.la libavx512f.la libsharp_la_LIBADD = libavx.la libavx2.la libfma.la libfma4.la libavx512f.la
endif
include_HEADERS = \ include_HEADERS = \
libsharp/sharp.h \ libsharp/sharp.h \
libsharp/sharp_geomhelpers.h \ libsharp/sharp_geomhelpers.h \
@ -45,12 +55,6 @@ TESTS = runtest.sh
AM_CFLAGS = -I$(top_srcdir)/c_utils -I$(top_srcdir)/libsharp @AM_CFLAGS@ AM_CFLAGS = -I$(top_srcdir)/c_utils -I$(top_srcdir)/libsharp @AM_CFLAGS@
libavx_la_CFLAGS = ${AM_CFLAGS} -mavx -DARCH=avx
libavx2_la_CFLAGS = ${AM_CFLAGS} -mavx2 -DARCH=avx2
libfma_la_CFLAGS = ${AM_CFLAGS} -mfma -DARCH=fma
libfma4_la_CFLAGS = ${AM_CFLAGS} -mfma4 -DARCH=fma4
libavx512f_la_CFLAGS = ${AM_CFLAGS} -mavx512f -DARCH=avx512f
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
nodist_pkgconfig_DATA = @PACKAGE_NAME@.pc nodist_pkgconfig_DATA = @PACKAGE_NAME@.pc

3
configure.ac
View file

@ -33,6 +33,9 @@ LIBS="-lm"
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
tmpval=`echo $CFLAGS | grep -c '\-DMULTIARCH'`
AM_CONDITIONAL([HAVE_MULTIARCH], [test $tmpval -gt 0])
dnl dnl
dnl Create pkgconfig .pc file. dnl Create pkgconfig .pc file.
dnl dnl