Skip to content

Commit 7c74f6a

Browse files
weslleyspereiraweslleyspereira
committed
Applies @thijssteel's idea #492 (comment) 
1 parent df02000 commit 7c74f6a

6 files changed

Lines changed: 89 additions & 25 deletions

File tree

‎TESTING/EIG/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set(AEIGTST
2525
set(SCIGTST slafts.f slahd2.f slasum.f slatb9.f sstech.f sstect.f
2626
ssvdch.f ssvdct.f ssxt1.f)
2727

28-
set(SEIGTST schkee.f
28+
set(SEIGTST schkee.F
2929
sbdt01.f sbdt02.f sbdt03.f sbdt04.f sbdt05.f
3030
schkbb.f schkbd.f schkbk.f schkbl.f schkec.f
3131
schkgg.f schkgk.f schkgl.f schkhs.f schksb.f schkst.f schkst2stg.f schksb2stg.f
@@ -42,7 +42,7 @@ set(SEIGTST schkee.f
4242
sort03.f ssbt21.f ssgt01.f sslect.f sspt21.f sstt21.f
4343
sstt22.f ssyt21.f ssyt22.f)
4444

45-
set(CEIGTST cchkee.f
45+
set(CEIGTST cchkee.F
4646
cbdt01.f cbdt02.f cbdt03.f cbdt05.f
4747
cchkbb.f cchkbd.f cchkbk.f cchkbl.f cchkec.f
4848
cchkgg.f cchkgk.f cchkgl.f cchkhb.f cchkhs.f cchkst.f cchkst2stg.f cchkhb2stg.f
@@ -62,7 +62,7 @@ set(CEIGTST cchkee.f
6262
set(DZIGTST dlafts.f dlahd2.f dlasum.f dlatb9.f dstech.f dstect.f
6363
dsvdch.f dsvdct.f dsxt1.f)
6464

65-
set(DEIGTST dchkee.f
65+
set(DEIGTST dchkee.F
6666
dbdt01.f dbdt02.f dbdt03.f dbdt04.f dbdt05.f
6767
dchkbb.f dchkbd.f dchkbk.f dchkbl.f dchkec.f
6868
dchkgg.f dchkgk.f dchkgl.f dchkhs.f dchksb.f dchkst.f dchkst2stg.f dchksb2stg.f
@@ -79,7 +79,7 @@ set(DEIGTST dchkee.f
7979
dort03.f dsbt21.f dsgt01.f dslect.f dspt21.f dstt21.f
8080
dstt22.f dsyt21.f dsyt22.f)
8181

82-
set(ZEIGTST zchkee.f
82+
set(ZEIGTST zchkee.F
8383
zbdt01.f zbdt02.f zbdt03.f zbdt05.f
8484
zchkbb.f zchkbd.f zchkbk.f zchkbl.f zchkec.f
8585
zchkgg.f zchkgk.f zchkgl.f zchkhb.f zchkhs.f zchkst.f zchkst2stg.f zchkhb2stg.f

‎TESTING/EIG/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ cleanobj:
157157
cleanexe:
158158
rm -f xeigtst*
159159

160-
schkee.o: schkee.f
160+
schkee.o: schkee.F
161161
$(FC) $(FFLAGS_DRV) -c -o $@ $<
162-
dchkee.o: dchkee.f
162+
dchkee.o: dchkee.F
163163
$(FC) $(FFLAGS_DRV) -c -o $@ $<
164-
cchkee.o: cchkee.f
164+
cchkee.o: cchkee.F
165165
$(FC) $(FFLAGS_DRV) -c -o $@ $<
166-
zchkee.o: zchkee.f
166+
zchkee.o: zchkee.F
167167
$(FC) $(FFLAGS_DRV) -c -o $@ $<

TESTING/EIG/cchkee.f renamed to TESTING/EIG/cchkee.F

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,10 @@
10341034
* =====================================================================
10351035
PROGRAM CCHKEE
10361036
*
1037+
#if defined(_OPENMP)
1038+
use omp_lib
1039+
#endif
1040+
*
10371041
* -- LAPACK test routine (version 3.7.0) --
10381042
* -- LAPACK is a software package provided by Univ. of Tennessee, --
10391043
* -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
@@ -1071,7 +1075,7 @@ PROGRAM CCHKEE
10711075
CHARACTER*80 LINE
10721076
INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD,
10731077
$ NK, NN, NPARMS, NRHS, NTYPES,
1074-
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH
1078+
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS
10751079
REAL EPS, S1, S2, THRESH, THRSHN
10761080
* ..
10771081
* .. Local Arrays ..
@@ -1865,8 +1869,16 @@ PROGRAM CCHKEE
18651869
CALL ALAREQ( C3, NTYPES, DOTYPE, MAXTYP, NIN, NOUT )
18661870
CALL XLAENV( 1, 1 )
18671871
CALL XLAENV( 9, 25 )
1868-
IF( TSTERR )
1869-
$ CALL CERRST( 'CST', NOUT )
1872+
IF( TSTERR ) THEN
1873+
#if defined(_OPENMP)
1874+
N_THREADS = OMP_GET_NUM_THREADS()
1875+
CALL OMP_SET_NUM_THREADS(1)
1876+
#endif
1877+
CALL CERRST( 'CST', NOUT )
1878+
#if defined(_OPENMP)
1879+
CALL OMP_SET_NUM_THREADS(N_THREADS)
1880+
#endif
1881+
END IF
18701882
DO 290 I = 1, NPARMS
18711883
CALL XLAENV( 1, NBVAL( I ) )
18721884
CALL XLAENV( 2, NBMIN( I ) )
@@ -2324,8 +2336,16 @@ PROGRAM CCHKEE
23242336
MAXTYP = 15
23252337
NTYPES = MIN( MAXTYP, NTYPES )
23262338
CALL ALAREQ( C3, NTYPES, DOTYPE, MAXTYP, NIN, NOUT )
2327-
IF( TSTERR )
2328-
$ CALL CERRST( 'CHB', NOUT )
2339+
IF( TSTERR ) THEN
2340+
#if defined(_OPENMP)
2341+
N_THREADS = OMP_GET_NUM_THREADS()
2342+
CALL OMP_SET_NUM_THREADS(1)
2343+
#endif
2344+
CALL CERRST( 'CHB', NOUT )
2345+
#if defined(_OPENMP)
2346+
CALL OMP_SET_NUM_THREADS(N_THREADS)
2347+
#endif
2348+
END IF
23292349
* CALL CCHKHB( NN, NVAL, NK, KVAL, MAXTYP, DOTYPE, ISEED, THRESH,
23302350
* $ NOUT, A( 1, 1 ), NMAX, DR( 1, 1 ), DR( 1, 2 ),
23312351
* $ A( 1, 2 ), NMAX, WORK, LWORK, RWORK, RESULT,

TESTING/EIG/dchkee.f renamed to TESTING/EIG/dchkee.F

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,11 @@
10381038
*> \ingroup double_eig
10391039
*
10401040
* =====================================================================
1041-
PROGRAM DCHKEE
1041+
PROGRAM DCHKEE
1042+
*
1043+
#if defined(_OPENMP)
1044+
use omp_lib
1045+
#endif
10421046
*
10431047
* -- LAPACK test routine (version 3.7.0) --
10441048
* -- LAPACK is a software package provided by Univ. of Tennessee, --
@@ -1077,7 +1081,7 @@ PROGRAM DCHKEE
10771081
CHARACTER*80 LINE
10781082
INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD,
10791083
$ NK, NN, NPARMS, NRHS, NTYPES,
1080-
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH
1084+
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS
10811085
DOUBLE PRECISION EPS, S1, S2, THRESH, THRSHN
10821086
* ..
10831087
* .. Local Arrays ..
@@ -1870,8 +1874,16 @@ PROGRAM DCHKEE
18701874
CALL ALAREQ( C3, NTYPES, DOTYPE, MAXTYP, NIN, NOUT )
18711875
CALL XLAENV( 1, 1 )
18721876
CALL XLAENV( 9, 25 )
1873-
IF( TSTERR )
1874-
$ CALL DERRST( 'DST', NOUT )
1877+
IF( TSTERR ) THEN
1878+
#if defined(_OPENMP)
1879+
N_THREADS = OMP_GET_NUM_THREADS()
1880+
CALL OMP_SET_NUM_THREADS(1)
1881+
#endif
1882+
CALL DERRST( 'DST', NOUT )
1883+
#if defined(_OPENMP)
1884+
CALL OMP_SET_NUM_THREADS(N_THREADS)
1885+
#endif
1886+
END IF
18751887
DO 290 I = 1, NPARMS
18761888
CALL XLAENV( 1, NBVAL( I ) )
18771889
CALL XLAENV( 2, NBMIN( I ) )

TESTING/EIG/schkee.f renamed to TESTING/EIG/schkee.F

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,10 @@
10401040
* =====================================================================
10411041
PROGRAM SCHKEE
10421042
*
1043+
#if defined(_OPENMP)
1044+
use omp_lib
1045+
#endif
1046+
*
10431047
* -- LAPACK test routine (version 3.7.0) --
10441048
* -- LAPACK is a software package provided by Univ. of Tennessee, --
10451049
* -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
@@ -1077,7 +1081,7 @@ PROGRAM SCHKEE
10771081
CHARACTER*80 LINE
10781082
INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD,
10791083
$ NK, NN, NPARMS, NRHS, NTYPES,
1080-
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH
1084+
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS
10811085
REAL EPS, S1, S2, THRESH, THRSHN
10821086
* ..
10831087
* .. Local Arrays ..
@@ -1871,8 +1875,16 @@ PROGRAM SCHKEE
18711875
CALL ALAREQ( C3, NTYPES, DOTYPE, MAXTYP, NIN, NOUT )
18721876
CALL XLAENV( 1, 1 )
18731877
CALL XLAENV( 9, 25 )
1874-
IF( TSTERR )
1875-
$ CALL SERRST( 'SST', NOUT )
1878+
IF( TSTERR ) THEN
1879+
#if defined(_OPENMP)
1880+
N_THREADS = OMP_GET_NUM_THREADS()
1881+
CALL OMP_SET_NUM_THREADS(1)
1882+
#endif
1883+
CALL SERRST( 'SST', NOUT )
1884+
#if defined(_OPENMP)
1885+
CALL OMP_SET_NUM_THREADS(N_THREADS)
1886+
#endif
1887+
END IF
18761888
DO 290 I = 1, NPARMS
18771889
CALL XLAENV( 1, NBVAL( I ) )
18781890
CALL XLAENV( 2, NBMIN( I ) )

TESTING/EIG/zchkee.f renamed to TESTING/EIG/zchkee.F

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,10 @@
10341034
* =====================================================================
10351035
PROGRAM ZCHKEE
10361036
*
1037+
#if defined(_OPENMP)
1038+
use omp_lib
1039+
#endif
1040+
*
10371041
* -- LAPACK test routine (version 3.7.0) --
10381042
* -- LAPACK is a software package provided by Univ. of Tennessee, --
10391043
* -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
@@ -1071,7 +1075,7 @@ PROGRAM ZCHKEE
10711075
CHARACTER*80 LINE
10721076
INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD,
10731077
$ NK, NN, NPARMS, NRHS, NTYPES,
1074-
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH
1078+
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS
10751079
DOUBLE PRECISION EPS, S1, S2, THRESH, THRSHN
10761080
* ..
10771081
* .. Local Arrays ..
@@ -1865,8 +1869,16 @@ PROGRAM ZCHKEE
18651869
CALL ALAREQ( C3, NTYPES, DOTYPE, MAXTYP, NIN, NOUT )
18661870
CALL XLAENV( 1, 1 )
18671871
CALL XLAENV( 9, 25 )
1868-
IF( TSTERR )
1869-
$ CALL ZERRST( 'ZST', NOUT )
1872+
IF( TSTERR ) THEN
1873+
#if defined(_OPENMP)
1874+
N_THREADS = OMP_GET_NUM_THREADS()
1875+
CALL OMP_SET_NUM_THREADS(1)
1876+
#endif
1877+
CALL ZERRST( 'ZST', NOUT )
1878+
#if defined(_OPENMP)
1879+
CALL OMP_SET_NUM_THREADS(N_THREADS)
1880+
#endif
1881+
END IF
18701882
DO 290 I = 1, NPARMS
18711883
CALL XLAENV( 1, NBVAL( I ) )
18721884
CALL XLAENV( 2, NBMIN( I ) )
@@ -2322,8 +2334,16 @@ PROGRAM ZCHKEE
23222334
MAXTYP = 15
23232335
NTYPES = MIN( MAXTYP, NTYPES )
23242336
CALL ALAREQ( C3, NTYPES, DOTYPE, MAXTYP, NIN, NOUT )
2325-
IF( TSTERR )
2326-
$ CALL ZERRST( 'ZHB', NOUT )
2337+
IF( TSTERR ) THEN
2338+
#if defined(_OPENMP)
2339+
N_THREADS = OMP_GET_NUM_THREADS()
2340+
CALL OMP_SET_NUM_THREADS(1)
2341+
#endif
2342+
CALL ZERRST( 'ZHB', NOUT )
2343+
#if defined(_OPENMP)
2344+
CALL OMP_SET_NUM_THREADS(N_THREADS)
2345+
#endif
2346+
END IF
23272347
* CALL ZCHKHB( NN, NVAL, NK, KVAL, MAXTYP, DOTYPE, ISEED, THRESH,
23282348
* $ NOUT, A( 1, 1 ), NMAX, DR( 1, 1 ), DR( 1, 2 ),
23292349
* $ A( 1, 2 ), NMAX, WORK, LWORK, RWORK, RESULT,

0 commit comments

Comments
 (0)