Skip to content

Commit 3c125d6

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #1 from Reference-LAPACK/master
rebase
2 parents 12d8253 + 88d84a6 commit 3c125d6

File tree

228 files changed

+11120
-1624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+11120
-1624
lines changed

‎BLAS/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
include ../make.inc
1+
TOPSRCDIR = ..
2+
include $(TOPSRCDIR)/make.inc
23

4+
.PHONY: all
35
all: blas
46

7+
.PHONY: blas
58
blas:
69
$(MAKE) -C SRC
710

11+
.PHONY: blas_testing
812
blas_testing: blas
913
$(MAKE) -C TESTING run
1014

15+
.PHONY: clean cleanobj cleanlib cleanexe cleantest
1116
clean:
1217
$(MAKE) -C SRC clean
1318
$(MAKE) -C TESTING clean

‎BLAS/SRC/Makefile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include ../../make.inc
2-
31
#######################################################################
42
# This is the makefile to create a library for the BLAS.
53
# The files are grouped as follows:
@@ -55,6 +53,10 @@ include ../../make.inc
5553
#
5654
#######################################################################
5755

56+
TOPSRCDIR = ../..
57+
include $(TOPSRCDIR)/make.inc
58+
59+
.PHONY: all
5860
all: $(BLASLIB)
5961

6062
#---------------------------------------------------------
@@ -138,33 +140,32 @@ ALLOBJ = $(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \
138140
$(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
139141

140142
$(BLASLIB): $(ALLOBJ)
141-
$(ARCH) $(ARCHFLAGS) $@ $^
143+
$(AR) $(ARFLAGS) $@ $^
142144
$(RANLIB) $@
143145

146+
.PHONY: single double complex complex16
144147
single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3)
145-
$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
148+
$(AR) $(ARFLAGS) $(BLASLIB) $^
146149
$(RANLIB) $(BLASLIB)
147150

148151
double: $(DBLAS1) $(ALLBLAS) $(DBLAS2) $(DBLAS3)
149-
$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
152+
$(AR) $(ARFLAGS) $(BLASLIB) $^
150153
$(RANLIB) $(BLASLIB)
151154

152155
complex: $(CBLAS1) $(CB1AUX) $(ALLBLAS) $(CBLAS2) $(CBLAS3)
153-
$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
156+
$(AR) $(ARFLAGS) $(BLASLIB) $^
154157
$(RANLIB) $(BLASLIB)
155158

156159
complex16: $(ZBLAS1) $(ZB1AUX) $(ALLBLAS) $(ZBLAS2) $(ZBLAS3)
157-
$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
160+
$(AR) $(ARFLAGS) $(BLASLIB) $^
158161
$(RANLIB) $(BLASLIB)
159162

160163
FRC:
161164
@FRC=$(FRC)
162165

166+
.PHONY: clean cleanobj cleanlib
163167
clean: cleanobj cleanlib
164168
cleanobj:
165169
rm -f *.o
166170
cleanlib:
167171
#rm -f $(BLASLIB) # May point to a system lib, e.g. -lblas
168-
169-
.f.o:
170-
$(FORTRAN) $(OPTS) -c -o $@ $<

‎BLAS/SRC/icamax.f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
*> \param[in] INCX
4444
*> \verbatim
4545
*> INCX is INTEGER
46-
*> storage spacing between elements of SX
46+
*> storage spacing between elements of CX
4747
*> \endverbatim
4848
*
4949
* Authors:

‎BLAS/SRC/idamax.f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
*> \param[in] INCX
4444
*> \verbatim
4545
*> INCX is INTEGER
46-
*> storage spacing between elements of SX
46+
*> storage spacing between elements of DX
4747
*> \endverbatim
4848
*
4949
* Authors:

‎BLAS/SRC/izamax.f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
*> \param[in] INCX
4444
*> \verbatim
4545
*> INCX is INTEGER
46-
*> storage spacing between elements of SX
46+
*> storage spacing between elements of ZX
4747
*> \endverbatim
4848
*
4949
* Authors:

‎BLAS/SRC/meson.build

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
SBLAS1 = files('isamax.f', 'sasum.f', 'saxpy.f', 'scopy.f', 'sdot.f', 'snrm2.f', 'srot.f', 'srotg.f', 'sscal.f', 'sswap.f', 'sdsdot.f', 'srotmg.f', 'srotm.f')
2+
3+
CBLAS1 = files('scabs1.f', 'scasum.f', 'scnrm2.f', 'icamax.f', 'caxpy.f', 'ccopy.f', 'cdotc.f', 'cdotu.f', 'csscal.f', 'crotg.f', 'cscal.f', 'cswap.f', 'csrot.f')
4+
5+
DBLAS1 = files('idamax.f', 'dasum.f', 'daxpy.f', 'dcopy.f', 'ddot.f', 'dnrm2.f', 'drot.f', 'drotg.f', 'dscal.f', 'dsdot.f', 'dswap.f', 'drotmg.f', 'drotm.f')
6+
7+
ZBLAS1 = files('dcabs1.f', 'dzasum.f', 'dznrm2.f', 'izamax.f', 'zaxpy.f', 'zcopy.f', 'zdotc.f', 'zdotu.f', 'zdscal.f', 'zrotg.f', 'zscal.f', 'zswap.f', 'zdrot.f')
8+
9+
CB1AUX = files('isamax.f', 'sasum.f', 'saxpy.f', 'scopy.f', 'snrm2.f', 'sscal.f')
10+
11+
ZB1AUX = files('idamax.f', 'dasum.f', 'daxpy.f', 'dcopy.f', 'dnrm2.f', 'dscal.f')
12+
13+
ALLBLAS = files('lsame.f', 'xerbla.f', 'xerbla_array.f')
14+
15+
SBLAS2 = files('sgemv.f', 'sgbmv.f', 'ssymv.f', 'ssbmv.f', 'sspmv.f', 'strmv.f', 'stbmv.f', 'stpmv.f', 'strsv.f', 'stbsv.f', 'stpsv.f', 'sger.f', 'ssyr.f', 'sspr.f', 'ssyr2.f', 'sspr2.f')
16+
17+
CBLAS2 = files('cgemv.f', 'cgbmv.f', 'chemv.f', 'chbmv.f', 'chpmv.f', 'ctrmv.f', 'ctbmv.f', 'ctpmv.f', 'ctrsv.f', 'ctbsv.f', 'ctpsv.f', 'cgerc.f', 'cgeru.f', 'cher.f', 'chpr.f', 'cher2.f', 'chpr2.f')
18+
19+
DBLAS2 = files('dgemv.f', 'dgbmv.f', 'dsymv.f', 'dsbmv.f', 'dspmv.f', 'dtrmv.f', 'dtbmv.f', 'dtpmv.f', 'dtrsv.f', 'dtbsv.f', 'dtpsv.f', 'dger.f', 'dsyr.f', 'dspr.f', 'dsyr2.f', 'dspr2.f')
20+
21+
ZBLAS2 = files('zgemv.f', 'zgbmv.f', 'zhemv.f', 'zhbmv.f', 'zhpmv.f', 'ztrmv.f', 'ztbmv.f', 'ztpmv.f', 'ztrsv.f', 'ztbsv.f', 'ztpsv.f', 'zgerc.f', 'zgeru.f', 'zher.f', 'zhpr.f', 'zher2.f', 'zhpr2.f')
22+
23+
SBLAS3 = files('sgemm.f', 'ssymm.f', 'ssyrk.f', 'ssyr2k.f', 'strmm.f', 'strsm.f')
24+
25+
CBLAS3 = files('cgemm.f', 'csymm.f', 'csyrk.f', 'csyr2k.f', 'ctrmm.f', 'ctrsm.f', 'chemm.f', 'cherk.f', 'cher2k.f')
26+
27+
DBLAS3 = files('dgemm.f', 'dsymm.f', 'dsyrk.f', 'dsyr2k.f', 'dtrmm.f', 'dtrsm.f')
28+
29+
ZBLAS3 = files('zgemm.f', 'zsymm.f', 'zsyrk.f', 'zsyr2k.f', 'ztrmm.f', 'ztrsm.f', 'zhemm.f', 'zherk.f', 'zher2k.f')

‎BLAS/TESTING/Makefile

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
1-
include ../../make.inc
1+
TOPSRCDIR = ../..
2+
include $(TOPSRCDIR)/make.inc
23

4+
.PHONY: all single double complex complex16
35
all: single double complex complex16
46
single: xblat1s xblat2s xblat3s
57
double: xblat1d xblat2d xblat3d
68
complex: xblat1c xblat2c xblat3c
79
complex16: xblat1z xblat2z xblat3z
810

911
xblat1s: sblat1.o $(BLASLIB)
10-
$(LOADER) $(LOADOPTS) -o $@ $^
12+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
1113
xblat1d: dblat1.o $(BLASLIB)
12-
$(LOADER) $(LOADOPTS) -o $@ $^
14+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
1315
xblat1c: cblat1.o $(BLASLIB)
14-
$(LOADER) $(LOADOPTS) -o $@ $^
16+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
1517
xblat1z: zblat1.o $(BLASLIB)
16-
$(LOADER) $(LOADOPTS) -o $@ $^
18+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
1719

1820
xblat2s: sblat2.o $(BLASLIB)
19-
$(LOADER) $(LOADOPTS) -o $@ $^
21+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
2022
xblat2d: dblat2.o $(BLASLIB)
21-
$(LOADER) $(LOADOPTS) -o $@ $^
23+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
2224
xblat2c: cblat2.o $(BLASLIB)
23-
$(LOADER) $(LOADOPTS) -o $@ $^
25+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
2426
xblat2z: zblat2.o $(BLASLIB)
25-
$(LOADER) $(LOADOPTS) -o $@ $^
27+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
2628

2729
xblat3s: sblat3.o $(BLASLIB)
28-
$(LOADER) $(LOADOPTS) -o $@ $^
30+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
2931
xblat3d: dblat3.o $(BLASLIB)
30-
$(LOADER) $(LOADOPTS) -o $@ $^
32+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
3133
xblat3c: cblat3.o $(BLASLIB)
32-
$(LOADER) $(LOADOPTS) -o $@ $^
34+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
3335
xblat3z: zblat3.o $(BLASLIB)
34-
$(LOADER) $(LOADOPTS) -o $@ $^
36+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
3537

38+
.PHONY: run
3639
run: all
3740
./xblat1s > sblat1.out
3841
./xblat1d > dblat1.out
@@ -47,13 +50,11 @@ run: all
4750
./xblat3c < cblat3.in
4851
./xblat3z < zblat3.in
4952

53+
.PHONY: clean cleanobj cleanexe cleantest
5054
clean: cleanobj cleanexe cleantest
5155
cleanobj:
5256
rm -f *.o
5357
cleanexe:
5458
rm -f xblat*
5559
cleantest:
5660
rm -f *.out core
57-
58-
.f.o:
59-
$(FORTRAN) $(OPTS) -c -o $@ $<

‎CBLAS/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h
1212
SYMBOL_NAMESPACE "F77_")
1313
if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
1414
message(WARNING "Reverting to pre-defined include/lapacke_mangling.h")
15-
configure_file(include/lapacke_mangling_with_flags.h.in
16-
${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
15+
configure_file(include/lapacke_mangling_with_flags.h.in
16+
${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
17+
configure_file(include/cblas_mangling_with_flags.h.in
18+
${LAPACK_BINARY_DIR}/include/cblas_mangling.h)
1719
endif()
1820

1921
include_directories(include ${LAPACK_BINARY_DIR}/include)

‎CBLAS/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
include ../make.inc
1+
TOPSRCDIR = ..
2+
include $(TOPSRCDIR)/make.inc
23

4+
.PHONY: all
35
all: cblas
46

7+
.PHONY: cblas
58
cblas: include/cblas_mangling.h
69
$(MAKE) -C src
710

811
include/cblas_mangling.h: include/cblas_mangling_with_flags.h.in
9-
cp $< $@
12+
cp include/cblas_mangling_with_flags.h.in $@
1013

14+
.PHONY: cblas_testing
1115
cblas_testing: cblas
1216
$(MAKE) -C testing run
1317

18+
.PHONY: cblas_example
1419
cblas_example: cblas
1520
$(MAKE) -C examples
1621

22+
.PHONY: clean cleanobj cleanlib cleanexe cleantest
1723
clean:
1824
$(MAKE) -C src clean
1925
$(MAKE) -C testing clean

‎CBLAS/examples/Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
include ../../make.inc
1+
TOPSRCDIR = ../..
2+
include $(TOPSRCDIR)/make.inc
23

4+
.SUFFIXES: .c .o
5+
.c.o:
6+
$(CC) $(CFLAGS) -I../include -c -o $@ $<
7+
8+
.PHONY: all
39
all: cblas_ex1 cblas_ex2
410

511
cblas_ex1: cblas_example1.o $(CBLASLIB) $(BLASLIB)
6-
$(LOADER) $(LOADOPTS) -o $@ $^
12+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
713
cblas_ex2: cblas_example2.o $(CBLASLIB) $(BLASLIB)
8-
$(LOADER) $(LOADOPTS) -o $@ $^
14+
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
915

16+
.PHONY: clean cleanobj cleanexe
1017
clean: cleanobj cleanexe
1118
cleanobj:
1219
rm -f *.o
1320
cleanexe:
1421
rm -f cblas_ex1 cblas_ex2
15-
16-
.c.o:
17-
$(CC) $(CFLAGS) -I../include -c -o $@ $<

0 commit comments

Comments
 (0)