From: Werner Saar Date: Sat, 7 Jan 2017 07:41:42 +0000 (+0100) Subject: filtered out -fopenmp and fix for mingw X-Git-Tag: upstream/0.2.20^2~92^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1153e3ac3933c8f4727c97b864b26d9b729bed42;p=platform%2Fupstream%2Fopenblas.git filtered out -fopenmp and fix for mingw --- diff --git a/lapack-netlib/Makefile b/lapack-netlib/Makefile index 497fc3c..edde5ff 100644 --- a/lapack-netlib/Makefile +++ b/lapack-netlib/Makefile @@ -6,7 +6,7 @@ include make.inc -all: lapack_install lib blas_testing lapack_testing +all: lapack_install lib blas_testing lapack_testing lib: lapacklib tmglib #lib: blaslib variants lapacklib tmglib @@ -14,8 +14,9 @@ lib: lapacklib tmglib clean: cleanlib cleantesting cleanblas_testing cleancblas_testing lapack_install: - ( cd INSTALL; $(MAKE); ./testlsame; ./testslamch; ./testdlamch; \ - ./testsecond; ./testdsecnd; ./testieee; ./testversion ) + ( cd INSTALL; $(MAKE) ) +# ./testlsame; ./testslamch; ./testdlamch; \ +# ./testsecond; ./testdsecnd; ./testieee; ./testversion ) blaslib: ( cd BLAS/SRC; $(MAKE) ) @@ -23,7 +24,7 @@ blaslib: cblaslib: ( cd CBLAS; $(MAKE) ) -lapacklib: lapack_install +lapacklib: lapack_install ( cd SRC; $(MAKE) ) lapackelib: lapacklib @@ -36,35 +37,35 @@ lapacke_example: lapackelib ( cd LAPACKE/example; $(MAKE) ) variants: - ( cd SRC/VARIANTS; $(MAKE) ) + ( cd SRC/VARIANTS ; $(MAKE)) tmglib: ( cd TESTING/MATGEN; $(MAKE) ) -lapack_testing: lib - ( cd TESTING; $(MAKE) ) +lapack_testing: lib + ( cd TESTING ; $(MAKE) ) ./lapack_testing.py variants_testing: lib variants - ( 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 ) - ( 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 ) - ( 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 ) - ( 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 ) - ( 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 ) - ( 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 ) - + ( 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 ) + ( 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 ) + ( 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 ) + ( 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 ) + ( 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 ) + ( 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 ) + blas_testing: ( cd BLAS/TESTING; $(MAKE) -f Makeblat1 ) ( cd BLAS; ./xblat1s > sblat1.out ; \ ./xblat1d > dblat1.out ; \ ./xblat1c > cblat1.out ; \ - ./xblat1z > zblat1.out ) + ./xblat1z > zblat1.out ) ( cd BLAS/TESTING; $(MAKE) -f Makeblat2 ) ( cd BLAS; ./xblat2s < sblat2.in ; \ ./xblat2d < dblat2.in ; \ @@ -74,18 +75,18 @@ blas_testing: ( cd BLAS; ./xblat3s < sblat3.in ; \ ./xblat3d < dblat3.in ; \ ./xblat3c < cblat3.in ; \ - ./xblat3z < zblat3.in ) + ./xblat3z < zblat3.in ) cblas_testing: blaslib - ( cd CBLAS; $(MAKE) cblas_testing ) - ( cd CBLAS; $(MAKE) runtst ) + ( cd CBLAS ; $(MAKE) cblas_testing) + ( cd CBLAS ; $(MAKE) runtst) html: @echo "LAPACK HTML PAGES GENRATION with Doxygen" doxygen DOCS/Doxyfile - @echo "==================" + @echo "==================" @echo "LAPACK HTML PAGES GENRATED in DOCS/explore-html" @echo "Usage: open DOCS/explore-html/index.html" @echo "Online version available at http://www.netlib.org/lapack/explore-html/" @@ -110,7 +111,7 @@ cleanlib: ( cd LAPACKE; $(MAKE) clean ) -cleanblas_testing: +cleanblas_testing: ( cd BLAS/TESTING; $(MAKE) -f Makeblat1 clean ) ( cd BLAS/TESTING; $(MAKE) -f Makeblat2 clean ) ( cd BLAS/TESTING; $(MAKE) -f Makeblat3 clean ) @@ -124,5 +125,6 @@ cleantesting: ( cd TESTING/EIG; $(MAKE) clean ) ( cd TESTING; rm -f xlin* xeig* ) -cleanall: cleanlib cleanblas_testing cleancblas_testing cleantesting - rm -f *.a TESTING/*.out INSTALL/test* BLAS/*.out +cleanall: cleanlib cleanblas_testing cleancblas_testing cleantesting + rm -f *.a TESTING/*.out INSTALL/test* BLAS/*.out + diff --git a/lapack-netlib/SRC/Makefile b/lapack-netlib/SRC/Makefile index 4a36bc7..d327359 100644 --- a/lapack-netlib/SRC/Makefile +++ b/lapack-netlib/SRC/Makefile @@ -525,6 +525,7 @@ ZLASRC = $(filter-out $(ZLAPACKOBJS),$(ZLASRC_O)) DSLASRC = $(filter-out $(SLAPACKOBJS),$(DSLASRC_O)) ZCLASRC = $(filter-out $(CLAPACKOBJS),$(ZCLASRC_O)) +OPTS1 = $(filter-out -fopenmp, $(OPTS)) #end filter out @@ -588,10 +589,10 @@ clean: rm -f *.o DEPRECATED/*.o .f.o: - $(FORTRAN) $(OPTS) -c -o $@ $< + $(FORTRAN) $(OPTS1) -c -o $@ $< .F.o: - $(FORTRAN) $(OPTS) -c $< -o $@ + $(FORTRAN) $(OPTS1) -c $< -o $@ slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $< dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<