Merge branch 'master' of https://github.com/Reference-LAPACK/lapack

Author: langou

.gitignore

@@ -23,7 +23,8 @@ CBLAS/examples/cblas_ex1
 CBLAS/examples/cblas_ex2
 
 # LAPACK testing
-TESTING/x*
+TESTING/LIN/xlintst*
+TESTING/EIG/xeigtst*
 TESTING/*.out
 TESTING/*.txt
 

BLAS/Makefile

@@ -0,0 +1,22 @@
+include ../make.inc
+
+all: blas
+
+blas:
+	$(MAKE) -C SRC
+
+blas_testing: blas
+	$(MAKE) -C TESTING run
+
+clean:
+	$(MAKE) -C SRC clean
+	$(MAKE) -C TESTING clean
+cleanobj:
+	$(MAKE) -C SRC cleanobj
+	$(MAKE) -C TESTING cleanobj
+cleanlib:
+	$(MAKE) -C SRC cleanlib
+cleanexe:
+	$(MAKE) -C TESTING cleanexe
+cleantest:
+	$(MAKE) -C TESTING cleantest

BLAS/SRC/Makefile

@@ -42,7 +42,7 @@ include ../../make.inc
 #  top-level make.inc
 #
 #  To remove the object files after the library is created, enter
-#       make clean
+#       make cleanobj
 #  To force the source files to be recompiled, enter, for example,
 #       make single FRC=FRC
 #
@@ -138,34 +138,33 @@ ALLOBJ = $(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \
 	$(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
 
 $(BLASLIB): $(ALLOBJ)
-	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
+	$(ARCH) $(ARCHFLAGS) $@ $^
 	$(RANLIB) $@
 
 single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3)
-	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(SBLAS1) $(ALLBLAS) \
-	$(SBLAS2) $(SBLAS3)
+	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
 	$(RANLIB) $(BLASLIB)
 
 double: $(DBLAS1) $(ALLBLAS) $(DBLAS2) $(DBLAS3)
-	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(DBLAS1) $(ALLBLAS) \
-	$(DBLAS2) $(DBLAS3)
+	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
 	$(RANLIB) $(BLASLIB)
 
 complex: $(CBLAS1) $(CB1AUX) $(ALLBLAS) $(CBLAS2) $(CBLAS3)
-	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(CBLAS1) $(CB1AUX) \
-	$(ALLBLAS) $(CBLAS2) $(CBLAS3)
+	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
 	$(RANLIB) $(BLASLIB)
 
 complex16: $(ZBLAS1) $(ZB1AUX) $(ALLBLAS) $(ZBLAS2) $(ZBLAS3)
-	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(ZBLAS1) $(ZB1AUX) \
-	$(ALLBLAS) $(ZBLAS2) $(ZBLAS3)
+	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
 	$(RANLIB) $(BLASLIB)
 
 FRC:
 	@FRC=$(FRC)
 
-clean:
+clean: cleanobj cleanlib
+cleanobj:
 	rm -f *.o
+cleanlib:
+	#rm -f $(BLASLIB)  # May point to a system lib, e.g. -lblas
 
 .f.o:
 	$(FORTRAN) $(OPTS) -c -o $@ $<

BLAS/TESTING/Makefile

@@ -6,32 +6,32 @@ double:    xblat1d xblat2d xblat3d
 complex:   xblat1c xblat2c xblat3c
 complex16: xblat1z xblat2z xblat3z
 
-xblat1s: sblat1.o
-	$(LOADER) $(LOADOPTS) -o $@ sblat1.o $(BLASLIB)
-xblat1d: dblat1.o
-	$(LOADER) $(LOADOPTS) -o $@ dblat1.o $(BLASLIB)
-xblat1c: cblat1.o
-	$(LOADER) $(LOADOPTS) -o $@ cblat1.o $(BLASLIB)
-xblat1z: zblat1.o
-	$(LOADER) $(LOADOPTS) -o $@ zblat1.o $(BLASLIB)
+xblat1s: sblat1.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
+xblat1d: dblat1.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
+xblat1c: cblat1.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
+xblat1z: zblat1.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
 
-xblat2s: sblat2.o
-	$(LOADER) $(LOADOPTS) -o $@ sblat2.o $(BLASLIB)
-xblat2d: dblat2.o
-	$(LOADER) $(LOADOPTS) -o $@ dblat2.o $(BLASLIB)
-xblat2c: cblat2.o
-	$(LOADER) $(LOADOPTS) -o $@ cblat2.o $(BLASLIB)
-xblat2z: zblat2.o
-	$(LOADER) $(LOADOPTS) -o $@ zblat2.o $(BLASLIB)
+xblat2s: sblat2.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
+xblat2d: dblat2.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
+xblat2c: cblat2.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
+xblat2z: zblat2.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
 
-xblat3s: sblat3.o
-	$(LOADER) $(LOADOPTS) -o $@ sblat3.o $(BLASLIB)
-xblat3d: dblat3.o
-	$(LOADER) $(LOADOPTS) -o $@ dblat3.o $(BLASLIB)
-xblat3c: cblat3.o
-	$(LOADER) $(LOADOPTS) -o $@ cblat3.o $(BLASLIB)
-xblat3z: zblat3.o
-	$(LOADER) $(LOADOPTS) -o $@ zblat3.o $(BLASLIB)
+xblat3s: sblat3.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
+xblat3d: dblat3.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
+xblat3c: cblat3.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
+xblat3z: zblat3.o $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
 
 run: all
 	./xblat1s > sblat1.out
@@ -47,8 +47,13 @@ run: all
 	./xblat3c < cblat3.in
 	./xblat3z < zblat3.in
 
-clean:
-	rm -f *.o xblat* *.out
+clean: cleanobj cleanexe cleantest
+cleanobj:
+	rm -f *.o
+cleanexe:
+	rm -f xblat*
+cleantest:
+	rm -f *.out core
 
 .f.o:
 	$(FORTRAN) $(OPTS) -c -o $@ $<

CBLAS/Makefile

@@ -1,27 +1,31 @@
 include ../make.inc
 
-all:
-	cd include && cp cblas_mangling_with_flags.h.in cblas_mangling.h
-	cd src && $(MAKE) all
+all: cblas
 
+cblas: include/cblas_mangling.h
+	$(MAKE) -C src
 
-clean: cleanlib
+include/cblas_mangling.h: include/cblas_mangling_with_flags.h.in
+	cp $< $@
 
-cleanlib:
-	cd src && $(MAKE) clean
-
-cleanexe:
-	cd testing && $(MAKE) cleanexe
-
-cleanall: clean cleanexe
-	cd src && $(MAKE) cleanall
-	cd examples && $(MAKE) cleanall
+cblas_testing: cblas
+	$(MAKE) -C testing run
 
-cblas_testing:
-	cd testing && $(MAKE) all
+cblas_example: cblas
+	$(MAKE) -C examples
 
-runtst:
-	cd testing && $(MAKE) run
-
-example: all
-	cd examples && $(MAKE) all
+clean:
+	$(MAKE) -C src clean
+	$(MAKE) -C testing clean
+	$(MAKE) -C examples clean
+cleanobj:
+	$(MAKE) -C src cleanobj
+	$(MAKE) -C testing cleanobj
+	$(MAKE) -C examples cleanobj
+cleanlib:
+	$(MAKE) -C src cleanlib
+cleanexe:
+	$(MAKE) -C testing cleanexe
+	$(MAKE) -C examples cleanexe
+cleantest:
+	$(MAKE) -C testing cleantest

CBLAS/examples/Makefile

@@ -2,13 +2,16 @@ include ../../make.inc
 
 all: cblas_ex1 cblas_ex2
 
-cblas_ex1: cblas_example1.o
-	$(LOADER) $(LOADOPTS) -o $@ cblas_example1.o $(CBLASLIB) $(BLASLIB)
-cblas_ex2: cblas_example2.o
-	$(LOADER) $(LOADOPTS) -o $@ cblas_example2.o $(CBLASLIB) $(BLASLIB)
+cblas_ex1: cblas_example1.o $(CBLASLIB) $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
+cblas_ex2: cblas_example2.o $(CBLASLIB) $(BLASLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^
 
-cleanall:
-	rm -f *.o cblas_ex1 cblas_ex2
+clean: cleanobj cleanexe
+cleanobj:
+	rm -f *.o
+cleanexe:
+	rm -f cblas_ex1 cblas_ex2
 
 .c.o:
 	$(CC) $(CFLAGS) -I../include -c -o $@ $<

CBLAS/src/Makefile

@@ -45,22 +45,22 @@ sclev1 = cblas_scasum.o scasumsub.o cblas_scnrm2.o scnrm2sub.o
 
 # Single precision real
 slib1: $(slev1) $(sclev1)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(slev1) $(sclev1)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # Double precision real
 dlib1: $(dlev1)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(dlev1)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # Single precision complex
 clib1: $(clev1) $(sclev1)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(clev1) $(sclev1)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # Double precision complex
 zlib1: $(zlev1)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(zlev1)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 #
@@ -97,22 +97,22 @@ zlev2 = cblas_zgemv.o cblas_zgbmv.o cblas_zhemv.o cblas_zhbmv.o cblas_zhpmv.o \
 
 # Single precision real
 slib2: $(slev2) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(slev2) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # Double precision real
 dlib2: $(dlev2) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(dlev2) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # Single precision complex
 clib2: $(clev2) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(clev2) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # Double precision complex
 zlib2: $(zlev2) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(zlev2) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 #
@@ -143,22 +143,22 @@ zlev3 = cblas_zgemm.o cblas_zsymm.o cblas_zhemm.o cblas_zherk.o \
 
 # Single precision real
 slib3: $(slev3) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(slev3) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # Double precision real
 dlib3: $(dlev3) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(dlev3) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # Single precision complex
 clib3: $(clev3) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(clev3) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # Double precision complex
 zlib3: $(zlev3) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(zlev3) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 
@@ -168,34 +168,34 @@ alev3 = $(slev3) $(dlev3) $(clev3) $(zlev3)
 
 # All level 1
 all1: $(alev1)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(alev1)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # All level 2
 all2: $(alev2) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(alev2) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # All level 3
 all3: $(alev3) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(alev3) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
 	$(RANLIB) $(CBLASLIB)
 
 # All levels and precisions
 $(CBLASLIB): $(alev1) $(alev2) $(alev3) $(errhand)
-	$(ARCH) $(ARCHFLAGS) $@ $(alev1) $(alev2) $(alev3) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $@ $^
 	$(RANLIB) $@
 
 FRC:
 	@FRC=$(FRC)
 
-clean:
-	rm -f *.o a.out core
-cleanall:
+clean: cleanobj cleanlib
+cleanobj:
+	rm -f *.o
+cleanlib:
 	rm -f $(CBLASLIB)
 
 .c.o:
 	$(CC) $(CFLAGS) -I../include -c -o $@ $<
-
 .f.o:
 	$(FORTRAN) $(OPTS) -c -o $@ $<

CBLAS/testing/CMakeLists.txt

@@ -25,22 +25,22 @@ macro(add_cblas_test output input target)
 endmacro()
 
 
-# Object files for single real precision
+# Object files for single precision real
 set(STESTL1O c_sblas1.c)
 set(STESTL2O c_sblas2.c c_s2chke.c auxiliary.c c_xerbla.c)
 set(STESTL3O c_sblas3.c c_s3chke.c auxiliary.c c_xerbla.c)
 
-# Object files for double real precision
+# Object files for double precision real
 set(DTESTL1O c_dblas1.c)
 set(DTESTL2O c_dblas2.c c_d2chke.c auxiliary.c c_xerbla.c)
 set(DTESTL3O c_dblas3.c c_d3chke.c auxiliary.c c_xerbla.c)
 
-# Object files for single complex precision
+# Object files for single precision complex
 set(CTESTL1O c_cblat1.f c_cblas1.c)
 set(CTESTL2O c_cblas2.c c_c2chke.c auxiliary.c c_xerbla.c)
 set(CTESTL3O c_cblas3.c c_c3chke.c auxiliary.c c_xerbla.c)
 
-# Object files for double complex precision
+# Object files for double precision complex
 set(ZTESTL1O c_zblas1.c)
 set(ZTESTL2O c_zblas2.c c_z2chke.c auxiliary.c c_xerbla.c)
 set(ZTESTL3O c_zblas3.c c_z3chke.c auxiliary.c c_xerbla.c)