Commit 52be881e authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Removed unstable and buggy measurements from parameter list. 

Cleaned up Makefile.am RPM options.
Fixed rpm build issue on Fedora Core 10.
Fixed display of max thread number in configure help.
Updated icc compilation flags to 11.0 syntax.
Set the license string to CeCILL in the .spec file.
Pushed version number to 2.8.5.
parent c71f0187

Makefile.am

+0 −46
Original line number Diff line number Diff line
@@ -20,49 +20,3 @@ rpm-icc: dist 
	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

	USE_ICC="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec

rpm-opteron:	dist

	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \

		-march=opteron" \

		TPXLDFLAGS="-static -shared-libgcc" \

		TPXLIBS="-lfftw3 -llapack -lcblas -latlas -lm" \

		rpmbuild -ba --target=x86_64 --clean $(PACKAGE_NAME).spec



rpm-athlon:	dist

	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \

		-m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" \

		TPXLDFLAGS="-static -shared-libgcc" \

		TPXLIBS="-L/usr/lib/ -lm -L/usr/local/lib/ -lfftw3 \

		-llapack -lcblas -latlas -lm" \

		rpmbuild -ba --target=i686 --clean $(PACKAGE_NAME).spec



rpm-opteron-icc:	dist

	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

	TPXCC="icc" TPXFLAGS="-O3 -g -axWPT -ip -unroll" \

		TPXLDFLAGS="-static -shared-libgcc" \

		TPXLIBS="-lfftw3 -llapack -lcblas -latlas -lm" \

		rpmbuild -ba --target=x86_64 --clean --nodeps $(PACKAGE_NAME).spec



rpm-athlon-icc:	dist

	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

		TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPT -ip -unroll" \

		TPXLDFLAGS="-static -shared-libgcc" \

		TPXLIBS="-L/usr/local/lib/ -L/usr/lib/ -lfftw3 \

		-llapack -lcblas -latlas -lm" \

		rpmbuild -ba --target=i686 --clean $(PACKAGE_NAME).spec



athlon:

	$(MAKE) CFLAGS="-O -g -pthread -funroll-loops -fomit-frame-pointer \

		-Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" \

		LIBS="-L/usr/lib/ -lpthread -lm -L/usr/local/lib/ \

		-lfftw3 -lfftw3_threads \

		-llapack -lcblas -latlas -lm"



pentium-icc:

	$(MAKE) CC="icc32" CFLAGS="-O3 -axKWNPT -ip -unroll -pthread" \

		LIBS="-L/usr/lib/ -lpthread -lm -L/usr/local/lib/ -llapack \

		-lcblas -latlas -lfftw3 -lfftw3_threads"



icc:

	$(MAKE) CC="icc" CFLAGS="-O3 -g -axWPT -ip -unroll -pthread"

Makefile.in

+3 −47
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ DATE2 = @DATE2@ 
DATE3 = @DATE3@

DEFS = @DEFS@

DEPDIR = @DEPDIR@

DSYMUTIL = @DSYMUTIL@

ECHO = @ECHO@

ECHO_C = @ECHO_C@

ECHO_N = @ECHO_N@
@@ -138,6 +139,7 @@ LN_S = @LN_S@ 
LTLIBOBJS = @LTLIBOBJS@

MAKEINFO = @MAKEINFO@

MKDIR_P = @MKDIR_P@

NMEDIT = @NMEDIT@

OBJEXT = @OBJEXT@

PACKAGE = @PACKAGE@

PACKAGER = @PACKAGER@
@@ -205,6 +207,7 @@ sharedstatedir = @sharedstatedir@ 
srcdir = @srcdir@

sysconfdir = @sysconfdir@

target_alias = @target_alias@

top_build_prefix = @top_build_prefix@

top_builddir = @top_builddir@

top_srcdir = @top_srcdir@
@@ -705,53 +708,6 @@ rpm: dist 
rpm-icc:	dist

	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

	USE_ICC="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec



rpm-opteron:	dist

	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \

		-march=opteron" \

		TPXLDFLAGS="-static -shared-libgcc" \

		TPXLIBS="-lfftw3 -llapack -lcblas -latlas -lm" \

		rpmbuild -ba --target=x86_64 --clean $(PACKAGE_NAME).spec



rpm-athlon:	dist

	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \

		-m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" \

		TPXLDFLAGS="-static -shared-libgcc" \

		TPXLIBS="-L/usr/lib/ -lm -L/usr/local/lib/ -lfftw3 \

		-llapack -lcblas -latlas -lm" \

		rpmbuild -ba --target=i686 --clean $(PACKAGE_NAME).spec



rpm-opteron-icc:	dist

	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

	TPXCC="icc" TPXFLAGS="-O3 -g -axWPT -ip -unroll" \

		TPXLDFLAGS="-static -shared-libgcc" \

		TPXLIBS="-lfftw3 -llapack -lcblas -latlas -lm" \

		rpmbuild -ba --target=x86_64 --clean --nodeps $(PACKAGE_NAME).spec



rpm-athlon-icc:	dist

	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

		TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPT -ip -unroll" \

		TPXLDFLAGS="-static -shared-libgcc" \

		TPXLIBS="-L/usr/local/lib/ -L/usr/lib/ -lfftw3 \

		-llapack -lcblas -latlas -lm" \

		rpmbuild -ba --target=i686 --clean $(PACKAGE_NAME).spec



athlon:

	$(MAKE) CFLAGS="-O -g -pthread -funroll-loops -fomit-frame-pointer \

		-Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" \

		LIBS="-L/usr/lib/ -lpthread -lm -L/usr/local/lib/ \

		-lfftw3 -lfftw3_threads \

		-llapack -lcblas -latlas -lm"



pentium-icc:

	$(MAKE) CC="icc32" CFLAGS="-O3 -axKWNPT -ip -unroll -pthread" \

		LIBS="-L/usr/lib/ -lpthread -lm -L/usr/local/lib/ -llapack \

		-lcblas -latlas -lfftw3 -lfftw3_threads"



icc:

	$(MAKE) CC="icc" CFLAGS="-O3 -g -axWPT -ip -unroll -pthread"

# Tell versions [3.59,3.63) of GNU make to not export all variables.

# Otherwise a system limit (for SysV at least) may be exceeded.

.NOEXPORT:

aclocal.m4

+145 −74

File changed.

Preview size limit exceeded, changes collapsed.

acx_prog_cc_optim.m4

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ dnl IRIX C compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 
dnl (Unicos 10.0.0.8) C compiler.

dnl

dnl This macro is a modification of Ville Laurikari's VL_PROG_CC_WARNINGS

dnl @version 1.2 (2008-10-01)

dnl @version 1.3 (2009-03-23)

dnl @authors Emmanuel Bertin <bertin@iap.fr> Ville Laurikari <vl@iki.fi>

dnl

AC_DEFUN([ACX_PROG_CC_OPTIM], [
@@ -32,14 +32,14 @@ EOF 
      if $CC -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 &&

           $CC -c -O conftest.c > /dev/null 2>&1 &&

           test -f conftest.o; then

        prog_cc_optim_flags="-O3 -axWPTS -ip -no-prec-div -unroll"

        prog_cc_optim_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2 -ip -no-prec-div -unroll"

        prog_ld_optim_flags="-static-intel"



      dnl INTEL C 32bits compiler

      elif $CC -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1 &&

           $CC -c -O conftest.c > /dev/null 2>&1 &&

           test -f conftest.o; then

        prog_cc_optim_flags="-O -axKWNPTS -ip -no-prec-div"

        prog_cc_optim_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2 -ip -no-prec-div -unroll"

        prog_ld_optim_flags="-static-intel"



      dnl GCC

configure

+4252 −3284

File changed.

Preview size limit exceeded, changes collapsed.