diff --git a/examples/Makefile.am b/examples/Makefile.am index cebcebfd7b134a03f6765986c7ee6f780afa0adc..6639c0156fd45349e4cc06d20bfaf227752ec810 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -21,9 +21,9 @@ AUTOMAKE_OPTIONS=gnu # Add the source directory and debug to CFLAGS AM_CFLAGS = -g -Wall -Werror -I../src $(OPENMP_CFLAGS) -DCPU_TPS=2.67e9 \ - -fsanitize=address -fno-omit-frame-pointer + # -fsanitize=address -fno-omit-frame-pointer -AM_LDFLAGS = -lm -fsanitize=address +AM_LDFLAGS = -lm # -fsanitize=address # Set-up the library bin_PROGRAMS = test test_qr test_bh @@ -36,7 +36,7 @@ test_LDADD = ../src/.libs/libquicksched.a # Sources for test_qr test_qr_SOURCES = test_qr.c test_qr_CFLAGS = $(AM_CFLAGS) -test_qr_LDADD = ../src/.libs/libquicksched.a -llapacke -lcblas +test_qr_LDADD = ../src/.libs/libquicksched.a -llapacke -llapack -lblas # Sources for test_bh test_bh_SOURCES = test_bh.c diff --git a/examples/Makefile.in b/examples/Makefile.in index 9da0b5092de51ac2a8c8c1202ea89eaf2f9f7613..0416eb5d73e049b75fef49cf172381810d2ea0ab 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -33,23 +33,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -125,11 +108,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(test_SOURCES) $(test_bh_SOURCES) $(test_qr_SOURCES) DIST_SOURCES = $(test_SOURCES) $(test_bh_SOURCES) $(test_qr_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -148,7 +126,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -196,7 +173,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -210,7 +186,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PRTDIAG = @PRTDIAG@ @@ -228,7 +203,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ acx_pthread_config = @acx_pthread_config@ @@ -262,6 +236,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -283,9 +258,9 @@ AUTOMAKE_OPTIONS = gnu # Add the source directory and debug to CFLAGS AM_CFLAGS = -g -Wall -Werror -I../src $(OPENMP_CFLAGS) -DCPU_TPS=2.67e9 \ - -fsanitize=address -fno-omit-frame-pointer + # -fsanitize=address -fno-omit-frame-pointer -AM_LDFLAGS = -lm -fsanitize=address +AM_LDFLAGS = -lm # -fsanitize=address # Sources for test test_SOURCES = test.c @@ -295,7 +270,7 @@ test_LDADD = ../src/.libs/libquicksched.a # Sources for test_qr test_qr_SOURCES = test_qr.c test_qr_CFLAGS = $(AM_CFLAGS) -test_qr_LDADD = ../src/.libs/libquicksched.a -llapacke -lcblas +test_qr_LDADD = ../src/.libs/libquicksched.a -llapacke -llapack -lblas # Sources for test_bh test_bh_SOURCES = test_bh.c @@ -337,11 +312,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -381,13 +353,13 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) $(EXTRA_test_DEPENDENCIES) +test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) @rm -f test$(EXEEXT) $(test_LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS) -test_bh$(EXEEXT): $(test_bh_OBJECTS) $(test_bh_DEPENDENCIES) $(EXTRA_test_bh_DEPENDENCIES) +test_bh$(EXEEXT): $(test_bh_OBJECTS) $(test_bh_DEPENDENCIES) @rm -f test_bh$(EXEEXT) $(test_bh_LINK) $(test_bh_OBJECTS) $(test_bh_LDADD) $(LIBS) -test_qr$(EXEEXT): $(test_qr_OBJECTS) $(test_qr_DEPENDENCIES) $(EXTRA_test_qr_DEPENDENCIES) +test_qr$(EXEEXT): $(test_qr_OBJECTS) $(test_qr_DEPENDENCIES) @rm -f test_qr$(EXEEXT) $(test_qr_LINK) $(test_qr_OBJECTS) $(test_qr_LDADD) $(LIBS) @@ -569,15 +541,10 @@ install-am: all-am installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff --git a/examples/runs.sh b/examples/runs_bh.sh similarity index 92% rename from examples/runs.sh rename to examples/runs_bh.sh index 2359fabd2149b432d364eae70df403f62d8f9a28..9c5852f818da051739a10c8619a356a9396cee34 100644 --- a/examples/runs.sh +++ b/examples/runs_bh.sh @@ -5,7 +5,7 @@ prog=test_bh params="-n 1000000 -r 10" # Main loop -for n in {1..16} +for n in {1..64} do if [ ! -e ${prog}_${n}.dump ]