floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added lapack and lapacke timing libs by default

This commit is contained in:
wernsaar 2014-05-24 15:53:25 +02:00
parent 5664445543
commit 219bcb119d
4 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -207,6 +207,7 @@ else
netlib : lapack_prebuild netlib : lapack_prebuild
ifndef NOFORTRAN ifndef NOFORTRAN
@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
@$(MAKE) -C $(NETLIB_LAPACK_DIR) tmglib
endif endif
ifndef NO_LAPACKE ifndef NO_LAPACKE
@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapackelib @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapackelib
@ -230,11 +231,18 @@ ifndef NOFORTRAN
-@echo "ARCHFLAGS = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "ARCHFLAGS = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "TMGLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "BLASLIB = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "LAPACKELIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "LAPACKELIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "SUFFIX = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "SUFFIX = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "PSUFFIX = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "PSUFFIX = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "CEXTRALIB = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "CEXTRALIB = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
ifeq ($(F_COMPILER), GFORTRAN)
-@echo "TIMER = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
else
-@echo "TIMER = NONE" >> $(NETLIB_LAPACK_DIR)/make.inc
endif
-@cat make.inc >> $(NETLIB_LAPACK_DIR)/make.inc -@cat make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
endif endif
@ -256,14 +264,12 @@ lapack-timing : large.tgz timing.tgz
ifndef NOFORTRAN ifndef NOFORTRAN
(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING) (cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz ) (cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
make -C $(NETLIB_LAPACK_DIR) tmglib
make -C $(NETLIB_LAPACK_DIR)/TIMING make -C $(NETLIB_LAPACK_DIR)/TIMING
endif endif
lapack-test : lapack-test :
(cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out) (cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out)
make -j 1 -C $(NETLIB_LAPACK_DIR) tmglib
make -j 1 -C $(NETLIB_LAPACK_DIR)/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintstrfd xlintstrfz xlintsts xlintstz xlintstzc xlintstrfs xlintstrfc make -j 1 -C $(NETLIB_LAPACK_DIR)/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintstrfd xlintstrfz xlintsts xlintstz xlintstzc xlintstrfs xlintstrfc
(cd $(NETLIB_LAPACK_DIR); ./lapack_testing.py -r ) (cd $(NETLIB_LAPACK_DIR); ./lapack_testing.py -r )
@ -293,5 +299,4 @@ endif
@rm -f $(NETLIB_LAPACK_DIR)/make.inc $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_mangling.h @rm -f $(NETLIB_LAPACK_DIR)/make.inc $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_mangling.h
@rm -f *.grd Makefile.conf_last config_last.h @rm -f *.grd Makefile.conf_last config_last.h
@(cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out testing_results.txt) @(cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out testing_results.txt)
@rm -f $(NETLIB_LAPACK_DIR)/tmglib.a
@echo Done. @echo Done.

56
exports/gensymbol
View File

@ -2667,34 +2667,34 @@
## @(MATGEN_OBJ) from `lapack-3.4.1/lapacke/src/Makefile` ## @(MATGEN_OBJ) from `lapack-3.4.1/lapacke/src/Makefile`
## Not exported: requires LAPACKE_TESTING to be set and depends on libtmg ## Not exported: requires LAPACKE_TESTING to be set and depends on libtmg
## (see `lapack-3.4.1/TESTING/MATGEN`). ## (see `lapack-3.4.1/TESTING/MATGEN`).
#LAPACKE_clatms, LAPACKE_clatms,
#LAPACKE_clatms_work, LAPACKE_clatms_work,
#LAPACKE_dlatms, LAPACKE_dlatms,
#LAPACKE_dlatms_work, LAPACKE_dlatms_work,
#LAPACKE_slatms, LAPACKE_slatms,
#LAPACKE_slatms_work, LAPACKE_slatms_work,
#LAPACKE_zlatms, LAPACKE_zlatms,
#LAPACKE_zlatms_work, LAPACKE_zlatms_work,
#LAPACKE_clagge, LAPACKE_clagge,
#LAPACKE_clagge_work, LAPACKE_clagge_work,
#LAPACKE_dlagge, LAPACKE_dlagge,
#LAPACKE_dlagge_work, LAPACKE_dlagge_work,
#LAPACKE_slagge, LAPACKE_slagge,
#LAPACKE_slagge_work, LAPACKE_slagge_work,
#LAPACKE_zlagge, LAPACKE_zlagge,
#LAPACKE_zlagge_work, LAPACKE_zlagge_work,
#LAPACKE_claghe, LAPACKE_claghe,
#LAPACKE_claghe_work, LAPACKE_claghe_work,
#LAPACKE_zlaghe, LAPACKE_zlaghe,
#LAPACKE_zlaghe_work, LAPACKE_zlaghe_work,
#LAPACKE_clagsy, LAPACKE_clagsy,
#LAPACKE_clagsy_work, LAPACKE_clagsy_work,
#LAPACKE_dlagsy, LAPACKE_dlagsy,
#LAPACKE_dlagsy_work, LAPACKE_dlagsy_work,
#LAPACKE_slagsy, LAPACKE_slagsy,
#LAPACKE_slagsy_work, LAPACKE_slagsy_work,
#LAPACKE_zlagsy, LAPACKE_zlagsy,
#LAPACKE_zlagsy_work, LAPACKE_zlagsy_work,
); );
#These function may need 2 underscores. #These function may need 2 underscores.

4
lapack-netlib/lapacke/src/Makefile
View File

@ -2072,9 +2072,9 @@ SOBJ_FILES := $(SSRC_OBJ)
DOBJ_FILES := $(DSRC_OBJ) DOBJ_FILES := $(DSRC_OBJ)
ZOBJ_FILES := $(ZSRC_OBJ) ZOBJ_FILES := $(ZSRC_OBJ)
ifdef LAPACKE_TESTING # ifdef LAPACKE_TESTING
ZOBJ_FILES += $(MATGEN_OBJ) ZOBJ_FILES += $(MATGEN_OBJ)
endif #endif
ALLOBJ = $(COBJ_FILES) $(DOBJ_FILES) $(SOBJ_FILES) $(ZOBJ_FILES) $(OBJ_FILES) ALLOBJ = $(COBJ_FILES) $(DOBJ_FILES) $(SOBJ_FILES) $(ZOBJ_FILES) $(OBJ_FILES)

8
make.inc
View File

@ -1,11 +1,7 @@
SHELL = /bin/sh SHELL = /bin/sh
PLAT = _LINUX PLAT = _LINUX
DRVOPTS = $(OPTS) DRVOPTS = $(OPTS)
LOADER = $(FORTRAN) LOADER = $(FORTRAN) -pthread
TIMER = NONE
ARCHFLAGS= -ru ARCHFLAGS= -ru
#RANLIB = ranlib #RANLIB = ranlib
BLASLIB = ../../../libopenblas.a
TMGLIB = tmglib.a
#EIGSRCLIB = eigsrc.a
#LINSRCLIB = linsrc.a