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

filtered out -fopenmp and fix for mingw

This commit is contained in:
Werner Saar 2017-01-07 08:41:42 +01:00
parent 7c2c488c23
commit 1153e3ac39
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lapack-netlib/Makefile
View File

@ -14,8 +14,9 @@ lib: lapacklib tmglib
clean: cleanlib cleantesting cleanblas_testing cleancblas_testing clean: cleanlib cleantesting cleanblas_testing cleancblas_testing
lapack_install: lapack_install:
( cd INSTALL; $(MAKE); ./testlsame; ./testslamch; ./testdlamch; \ ( cd INSTALL; $(MAKE) )
./testsecond; ./testdsecnd; ./testieee; ./testversion ) # ./testlsame; ./testslamch; ./testdlamch; \
# ./testsecond; ./testdsecnd; ./testieee; ./testversion )
blaslib: blaslib:
( cd BLAS/SRC; $(MAKE) ) ( cd BLAS/SRC; $(MAKE) )
@ -36,28 +37,28 @@ lapacke_example: lapackelib
( cd LAPACKE/example; $(MAKE) ) ( cd LAPACKE/example; $(MAKE) )
variants: variants:
( cd SRC/VARIANTS; $(MAKE) ) ( cd SRC/VARIANTS ; $(MAKE))
tmglib: tmglib:
( cd TESTING/MATGEN; $(MAKE) ) ( cd TESTING/MATGEN; $(MAKE) )
lapack_testing: lib lapack_testing: lib
( cd TESTING; $(MAKE) ) ( cd TESTING ; $(MAKE) )
./lapack_testing.py ./lapack_testing.py
variants_testing: lib variants variants_testing: lib variants
( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/cholrl.a'; \ ( cd TESTING ; rm -f xlintst* ; $(MAKE) VARLIB='SRC/VARIANTS/LIB/cholrl.a' ; \
mv stest.out stest_cholrl.out; mv dtest.out dtest_cholrl.out; mv ctest.out ctest_cholrl.out; mv ztest.out ztest_cholrl.out ) mv stest.out stest_cholrl.out ; mv dtest.out dtest_cholrl.out ; mv ctest.out ctest_cholrl.out ; mv ztest.out ztest_cholrl.out )
( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/choltop.a'; \ ( cd TESTING ; rm -f xlintst* ; $(MAKE) VARLIB='SRC/VARIANTS/LIB/choltop.a' ; \
mv stest.out stest_choltop.out; mv dtest.out dtest_choltop.out; mv ctest.out ctest_choltop.out; mv ztest.out ztest_choltop.out ) mv stest.out stest_choltop.out ; mv dtest.out dtest_choltop.out ; mv ctest.out ctest_choltop.out ; mv ztest.out ztest_choltop.out )
( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/lucr.a'; \ ( cd TESTING ; rm -f xlintst* ; $(MAKE) VARLIB='SRC/VARIANTS/LIB/lucr.a' ; \
mv stest.out stest_lucr.out; mv dtest.out dtest_lucr.out; mv ctest.out ctest_lucr.out; mv ztest.out ztest_lucr.out ) mv stest.out stest_lucr.out ; mv dtest.out dtest_lucr.out ; mv ctest.out ctest_lucr.out ; mv ztest.out ztest_lucr.out )
( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/lull.a'; \ ( cd TESTING ; rm -f xlintst* ; $(MAKE) VARLIB='SRC/VARIANTS/LIB/lull.a' ; \
mv stest.out stest_lull.out; mv dtest.out dtest_lull.out; mv ctest.out ctest_lull.out; mv ztest.out ztest_lull.out ) mv stest.out stest_lull.out ; mv dtest.out dtest_lull.out ; mv ctest.out ctest_lull.out ; mv ztest.out ztest_lull.out )
( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/lurec.a'; \ ( cd TESTING ; rm -f xlintst* ; $(MAKE) VARLIB='SRC/VARIANTS/LIB/lurec.a' ; \
mv stest.out stest_lurec.out; mv dtest.out dtest_lurec.out; mv ctest.out ctest_lurec.out; mv ztest.out ztest_lurec.out ) mv stest.out stest_lurec.out ; mv dtest.out dtest_lurec.out ; mv ctest.out ctest_lurec.out ; mv ztest.out ztest_lurec.out )
( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/qrll.a'; \ ( cd TESTING ; rm -f xlintst* ; $(MAKE) VARLIB='SRC/VARIANTS/LIB/qrll.a' ; \
mv stest.out stest_qrll.out; mv dtest.out dtest_qrll.out; mv ctest.out ctest_qrll.out; mv ztest.out ztest_qrll.out ) mv stest.out stest_qrll.out ; mv dtest.out dtest_qrll.out ; mv ctest.out ctest_qrll.out ; mv ztest.out ztest_qrll.out )
blas_testing: blas_testing:
( cd BLAS/TESTING; $(MAKE) -f Makeblat1 ) ( cd BLAS/TESTING; $(MAKE) -f Makeblat1 )
@ -77,8 +78,8 @@ blas_testing:
./xblat3z < zblat3.in ) ./xblat3z < zblat3.in )
cblas_testing: blaslib cblas_testing: blaslib
( cd CBLAS; $(MAKE) cblas_testing ) ( cd CBLAS ; $(MAKE) cblas_testing)
( cd CBLAS; $(MAKE) runtst ) ( cd CBLAS ; $(MAKE) runtst)
@ -126,3 +127,4 @@ cleantesting:
cleanall: cleanlib cleanblas_testing cleancblas_testing cleantesting cleanall: cleanlib cleanblas_testing cleancblas_testing cleantesting
rm -f *.a TESTING/*.out INSTALL/test* BLAS/*.out rm -f *.a TESTING/*.out INSTALL/test* BLAS/*.out

5
lapack-netlib/SRC/Makefile
View File

@ -525,6 +525,7 @@ ZLASRC = $(filter-out $(ZLAPACKOBJS),$(ZLASRC_O))
DSLASRC = $(filter-out $(SLAPACKOBJS),$(DSLASRC_O)) DSLASRC = $(filter-out $(SLAPACKOBJS),$(DSLASRC_O))
ZCLASRC = $(filter-out $(CLAPACKOBJS),$(ZCLASRC_O)) ZCLASRC = $(filter-out $(CLAPACKOBJS),$(ZCLASRC_O))
OPTS1 = $(filter-out -fopenmp, $(OPTS))
#end filter out #end filter out
@ -588,10 +589,10 @@ clean:
rm -f *.o DEPRECATED/*.o rm -f *.o DEPRECATED/*.o
.f.o: .f.o:
$(FORTRAN) $(OPTS) -c -o $@ $< $(FORTRAN) $(OPTS1) -c -o $@ $<
.F.o: .F.o:
$(FORTRAN) $(OPTS) -c $< -o $@ $(FORTRAN) $(OPTS1) -c $< -o $@
slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $< slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $< dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<