Skip to content

Commit 3b26987

Browse files
Merge pull request #597 from isuruf/n_threads
Make the type of N_THREADS to be INTEGER*4 explicitly
2 parents aa631b4 + 742aacd commit 3b26987

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

.appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ environment:
2020

2121
install:
2222
- call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
23+
- conda config --set auto_update_conda false
2324
- conda config --add channels conda-forge --force
2425
- conda install --yes --quiet flang jom
2526
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64

TESTING/EIG/cchkee.F

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,8 @@ PROGRAM CCHKEE
10721072
CHARACTER*80 LINE
10731073
INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD,
10741074
$ NK, NN, NPARMS, NRHS, NTYPES,
1075-
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS
1075+
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH
1076+
INTEGER*4 N_THREADS, ONE_THREAD
10761077
REAL EPS, S1, S2, THRESH, THRSHN
10771078
* ..
10781079
* .. Local Arrays ..
@@ -1869,7 +1870,8 @@ PROGRAM CCHKEE
18691870
IF( TSTERR ) THEN
18701871
#if defined(_OPENMP)
18711872
N_THREADS = OMP_GET_MAX_THREADS()
1872-
CALL OMP_SET_NUM_THREADS(1)
1873+
ONE_THREAD = 1
1874+
CALL OMP_SET_NUM_THREADS(ONE_THREAD)
18731875
#endif
18741876
CALL CERRST( 'CST', NOUT )
18751877
#if defined(_OPENMP)
@@ -2336,7 +2338,8 @@ PROGRAM CCHKEE
23362338
IF( TSTERR ) THEN
23372339
#if defined(_OPENMP)
23382340
N_THREADS = OMP_GET_MAX_THREADS()
2339-
CALL OMP_SET_NUM_THREADS(1)
2341+
ONE_THREAD = 1
2342+
CALL OMP_SET_NUM_THREADS(ONE_THREAD)
23402343
#endif
23412344
CALL CERRST( 'CHB', NOUT )
23422345
#if defined(_OPENMP)

TESTING/EIG/dchkee.F

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,8 @@ PROGRAM DCHKEE
10781078
CHARACTER*80 LINE
10791079
INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD,
10801080
$ NK, NN, NPARMS, NRHS, NTYPES,
1081-
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS
1081+
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH
1082+
INTEGER*4 N_THREADS, ONE_THREAD
10821083
DOUBLE PRECISION EPS, S1, S2, THRESH, THRSHN
10831084
* ..
10841085
* .. Local Arrays ..
@@ -1874,7 +1875,8 @@ PROGRAM DCHKEE
18741875
IF( TSTERR ) THEN
18751876
#if defined(_OPENMP)
18761877
N_THREADS = OMP_GET_MAX_THREADS()
1877-
CALL OMP_SET_NUM_THREADS(1)
1878+
ONE_THREAD = 1
1879+
CALL OMP_SET_NUM_THREADS(ONE_THREAD)
18781880
#endif
18791881
CALL DERRST( 'DST', NOUT )
18801882
#if defined(_OPENMP)

TESTING/EIG/schkee.F

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,8 @@ PROGRAM SCHKEE
10781078
CHARACTER*80 LINE
10791079
INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD,
10801080
$ NK, NN, NPARMS, NRHS, NTYPES,
1081-
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS
1081+
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH
1082+
INTEGER*4 N_THREADS, ONE_THREAD
10821083
REAL EPS, S1, S2, THRESH, THRSHN
10831084
* ..
10841085
* .. Local Arrays ..
@@ -1875,7 +1876,8 @@ PROGRAM SCHKEE
18751876
IF( TSTERR ) THEN
18761877
#if defined(_OPENMP)
18771878
N_THREADS = OMP_GET_MAX_THREADS()
1878-
CALL OMP_SET_NUM_THREADS(1)
1879+
ONE_THREAD = 1
1880+
CALL OMP_SET_NUM_THREADS(ONE_THREAD)
18791881
#endif
18801882
CALL SERRST( 'SST', NOUT )
18811883
#if defined(_OPENMP)

TESTING/EIG/zchkee.F

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,8 @@ PROGRAM ZCHKEE
10721072
CHARACTER*80 LINE
10731073
INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD,
10741074
$ NK, NN, NPARMS, NRHS, NTYPES,
1075-
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS
1075+
$ VERS_MAJOR, VERS_MINOR, VERS_PATCH
1076+
INTEGER*4 N_THREADS, ONE_THREAD
10761077
DOUBLE PRECISION EPS, S1, S2, THRESH, THRSHN
10771078
* ..
10781079
* .. Local Arrays ..
@@ -1869,7 +1870,8 @@ PROGRAM ZCHKEE
18691870
IF( TSTERR ) THEN
18701871
#if defined(_OPENMP)
18711872
N_THREADS = OMP_GET_MAX_THREADS()
1872-
CALL OMP_SET_NUM_THREADS(1)
1873+
ONE_THREAD = 1
1874+
CALL OMP_SET_NUM_THREADS(ONE_THREAD)
18731875
#endif
18741876
CALL ZERRST( 'ZST', NOUT )
18751877
#if defined(_OPENMP)
@@ -2334,7 +2336,8 @@ PROGRAM ZCHKEE
23342336
IF( TSTERR ) THEN
23352337
#if defined(_OPENMP)
23362338
N_THREADS = OMP_GET_MAX_THREADS()
2337-
CALL OMP_SET_NUM_THREADS(1)
2339+
ONE_THREAD = 1
2340+
CALL OMP_SET_NUM_THREADS(ONE_THREAD)
23382341
#endif
23392342
CALL ZERRST( 'ZHB', NOUT )
23402343
#if defined(_OPENMP)

0 commit comments

Comments
 (0)