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

Merge pull request #1460 from martin-frbg/issue1425 

Revert insidious suppression of the -fopenmp flag in the LAPACK subtree
This commit is contained in:
Martin Kroeker 2018-02-18 15:12:20 +01:00 committed by GitHub
parent 0391c07b17 eaab622f03
commit 7cd7acf71e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lapack-netlib/SRC/Makefile
View File

@ -533,7 +533,9 @@ ZLASRC = $(filter-out $(ZLAPACKOBJS),$(ZLASRC_O))
DSLASRC = $(filter-out $(SLAPACKOBJS),$(DSLASRC_O))
ZCLASRC = $(filter-out $(CLAPACKOBJS),$(ZCLASRC_O))
OPTS1 = $(filter-out -fopenmp, $(OPTS))
#from commit 1046, supposedly related to mingw but breaks thread safety
#in insiduous ways on all platforms when used in place of OPTS below
#OPTS1 = $(filter-out -fopenmp, $(OPTS))
#end filter out
@ -597,10 +599,10 @@ clean:
rm -f *.o DEPRECATED/*.o
.f.o:
$(FORTRAN) $(OPTS1) -c -o $@ $<
$(FORTRAN) $(OPTS) -c -o $@ $<
.F.o:
$(FORTRAN) $(OPTS1) -c $< -o $@
$(FORTRAN) $(OPTS) -c $< -o $@
slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<

2
lapack-netlib/SRC/chetrd_hb2st.F
View File

@ -512,7 +512,7 @@ C END IF
*
* Call the kernel
*
#if defined(_OPENMP)
#if defined(_OPENMP) && _OPENMP >= 201307L
IF( TTYPE.NE.1 ) THEN
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
!$OMP$ DEPEND(in:WORK(MYID-1))

2
lapack-netlib/SRC/dsytrd_sb2st.F
View File

@ -481,7 +481,7 @@
*
* Call the kernel
*
#if defined(_OPENMP)
#if defined(_OPENMP) && _OPENMP >= 201307L
IF( TTYPE.NE.1 ) THEN
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
!$OMP$ DEPEND(in:WORK(MYID-1))

2
lapack-netlib/SRC/ssytrd_sb2st.F
View File

@ -481,7 +481,7 @@
*
* Call the kernel
*
#if defined(_OPENMP)
#if defined(_OPENMP) && _OPENMP >= 201307
IF( TTYPE.NE.1 ) THEN
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
!$OMP$ DEPEND(in:WORK(MYID-1))

3
lapack-netlib/SRC/zhetrd_hb2st.F
View File

@ -512,7 +512,8 @@ C END IF
*
* Call the kernel
*
#if defined(_OPENMP)
#if defined(_OPENMP) && _OPENMP >= 201307L
IF( TTYPE.NE.1 ) THEN
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1))
!$OMP$ DEPEND(in:WORK(MYID-1))