Skip to content

Commit 0dbf940

Browse files
WardFWardF
authored
Merge pull request #460 from Unidata/fix_ftst_failure.wif
Fix failure in ftst
2 parents 5adc015 + 65cd08a commit 0dbf940

File tree

6 files changed

+98
-20
lines changed

6 files changed

+98
-20
lines changed

‎.github/run_tests_docker.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
###
2+
# Use the docker container to run tests in a parameterized way.
3+
###
4+
5+
name: Run Docker-based regression testing
6+
7+
on: [pull_request,workflow_dispatch]
8+
9+
concurrency:
10+
group: ${{ github.workflow}}-${{ github.head_ref }}
11+
cancel-in-progress: true
12+
13+
permissions: {}
14+
15+
jobs:
16+
netcdf-tests-serial:
17+
name: Docker-Based NetCDF-C, Fortran Regression Testing (Serial)
18+
runs-on: ubuntu-latest
19+
strategy:
20+
matrix:
21+
c-branch: [ 'v4.9.3' ]
22+
c-compiler: [ 'gcc', 'clang' ]
23+
h5ver: [ '1.14.3' ]
24+
build-system: [ 'both' ]
25+
26+
steps:
27+
- uses: actions/checkout@v4
28+
- name: Pull and Run netCDF Regression Tests
29+
uses: WardF/netcdf-test-action@v1
30+
with:
31+
run-c: 'FALSE'
32+
repo-type: 'fortran'
33+
hdf5-version: '${{ matrix.h5ver }}'
34+
c-compiler: '${{ matrix.c-compiler }}'
35+
c-branch: '${{ matrix.c-branch }}'
36+
run-fortran: 'TRUE'
37+
build-system: '${{ matrix.build-system }}'
38+
39+
netcdf-tests-parallel:
40+
41+
needs: netcdf-tests-serial
42+
43+
name: Docker-Based NetCDF-C, Fortran Regression Testing (parallel)
44+
runs-on: ubuntu-latest
45+
strategy:
46+
matrix:
47+
build-system: [ 'both' ]
48+
h5ver: [ '1.14.3' ]
49+
c-branch: [ 'v4.9.3' ]
50+
c-compiler: [ 'mpicc' ]
51+
mpich-version: [ '4.3.0' ]
52+
53+
54+
steps:
55+
- uses: actions/checkout@v4
56+
- name: Pull and Run netCDF Regression Tests
57+
uses: WardF/netcdf-test-action@v1
58+
with:
59+
repo-type: 'fortran'
60+
build-system: '${{ matrix.build-system }}'
61+
hdf5-version: '${{ matrix.h5ver }}'
62+
run-c: 'FALSE'
63+
c-compiler: '${{ matrix.c-compiler }}'
64+
mpich-version: '${{ matrix.mpich-version }}'
65+
c-branch: '${{ matrix.c-branch }}'
66+
run-fortran: 'TRUE'

‎.github/workflows/run_tests_docker.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
runs-on: ubuntu-latest
1919
strategy:
2020
matrix:
21-
c-branch: [ 'v4.9.2' ]
21+
repo-type: [ 'fortran' ]
22+
c-branch: [ 'v4.9.3' ]
2223
h5ver: [ '1.12.1', '1.14.6' ]
23-
fortran-branch: [ 'v4.6.1' ]
2424
c-compiler: [ 'gcc', 'clang' ]
2525
buildsystem: [ 'both' ]
2626

@@ -29,14 +29,14 @@ jobs:
2929
- name: Pull and Run netCDF Regression Tests
3030
uses: WardF/netcdf-test-action@v1
3131
with:
32-
run-c: 'TRUE'
32+
repo-type: '${{ matrix.repo-type }}'
33+
run-c: 'FALSE'
3334
build-system: '${{ matrix.buildsystem }}'
3435
hdf5-version: '${{ matrix.h5ver }}'
3536
ctest-repeat: 3
3637
c-compiler: '${{ matrix.c-compiler }}'
3738
c-branch: '${{ matrix.c-branch }}'
3839
run-fortran: 'TRUE'
39-
fortran-branch: '${{ matrix.fortran-branch }}'
4040

4141
netcdf-tests-parallel:
4242

@@ -46,9 +46,9 @@ jobs:
4646
runs-on: ubuntu-latest
4747
strategy:
4848
matrix:
49-
c-branch: [ 'v4.9.2' ]
49+
repo-type: [ 'fortran' ]
50+
c-branch: [ 'v4.9.3' ]
5051
h5ver: [ '1.14.6' ]
51-
fortran-branch: [ 'v4.6.1' ]
5252
c-compiler: [ 'mpicc' ]
5353
mpich-version: [ '4.3.0' ]
5454
buildsystem: [ 'cmake', 'autotools' ]
@@ -58,12 +58,13 @@ jobs:
5858
- name: Pull and Run netCDF Regression Tests
5959
uses: WardF/netcdf-test-action@v1
6060
with:
61-
run-c: 'TRUE'
61+
repo-type: '${{ matrix.repo-type }}'
62+
run-c: 'FALSE'
6263
build-system: '${{ matrix.buildsystem }}'
6364
hdf5-version: '${{ matrix.h5ver }}'
6465
ctest-repeat: 3
6566
c-compiler: '${{ matrix.c-compiler }}'
6667
c-branch: '${{ matrix.c-branch }}'
6768
mpich-version: '${{ matrix.mpich-version }}'
6869
run-fortran: 'TRUE'
69-
fortran-branch: '${{ matrix.fortran-branch }}'
70+

‎.github/workflows/run_tests_linux.yml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
hdf5: [ 1.12.2 ]
22-
netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
22+
netcdf: [ v4.9.3 ]
2323

2424
steps:
2525

@@ -75,7 +75,7 @@ jobs:
7575
strategy:
7676
matrix:
7777
hdf5: [ 1.12.2 ]
78-
netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
78+
netcdf: [ v4.9.3 ]
7979

8080
steps:
8181

@@ -101,7 +101,7 @@ jobs:
101101
uses: actions/cache@v4
102102
with:
103103
path: ~/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }}
104-
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-par
104+
key: hdf5-nc-${{ runner.os }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-par
105105

106106

107107
- name: Build libhdf5-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-par
@@ -134,7 +134,7 @@ jobs:
134134
strategy:
135135
matrix:
136136
hdf5: [ 1.12.2 ]
137-
netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
137+
netcdf: [ v4.9.3 ]
138138

139139
steps:
140140

@@ -231,7 +231,7 @@ jobs:
231231
strategy:
232232
matrix:
233233
hdf5: [ 1.12.2 ]
234-
netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
234+
netcdf: [ v4.9.3 ]
235235

236236
steps:
237237

@@ -261,7 +261,7 @@ jobs:
261261
uses: actions/cache@v4
262262
with:
263263
path: ~/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }}
264-
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-par
264+
key: hdf5-nc-${{ runner.os }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-par
265265

266266
- name: Check Cache
267267
shell: bash -l {0}
@@ -314,9 +314,16 @@ jobs:
314314

315315
- name: Run Tests
316316
shell: bash -l {0}
317-
run: CC=${CC} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make check -j
317+
run: CC=${CC} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make check -j 4
318318
if: ${{ success() }}
319319

320+
- name: View Failure Logs
321+
shell: bash -l {0}
322+
run: |
323+
echo -e "\n\n\to NPROC: $(nproc)\n\n"
324+
find . -name "test-suite.log" -exec cat {} \;
325+
if: ${{ failure() }}
326+
320327
#- name: Make Distcheck
321328
# shell: bash -l {0}
322329
# run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make distcheck -j
@@ -329,7 +336,7 @@ jobs:
329336
strategy:
330337
matrix:
331338
hdf5: [ 1.12.2 ]
332-
netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
339+
netcdf: [ v4.9.3 ]
333340

334341
steps:
335342

‎.github/workflows/run_tests_macos.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
hdf5: [ 1.12.2 ]
22-
netcdf: [ v4.9.0, main ]
22+
netcdf: [ v4.9.3-prep.wif, main ]
2323

2424
steps:
2525

@@ -79,7 +79,7 @@ jobs:
7979
strategy:
8080
matrix:
8181
hdf5: [ 1.12.2 ]
82-
netcdf: [ v4.9.0, main ]
82+
netcdf: [ v4.9.3-prep.wif, main ]
8383

8484
steps:
8585

@@ -165,7 +165,7 @@ jobs:
165165
strategy:
166166
matrix:
167167
hdf5: [ 1.12.2 ]
168-
netcdf: [ v4.9.0, main ]
168+
netcdf: [ v4.9.3-prep.wif, main ]
169169

170170
steps:
171171

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ The netCDF Fortran libraries contain both F77 and F90 APIs. For documentation se
2121

2222
* https://docs.unidata.ucar.edu/netcdf-fortran/current/
2323

24+
Requirements
25+
-------------
26+
* NetCDF-C v4.9.3+
27+
2428
Getting NetCDF
2529
--------------
2630

‎nf_test4/ftst_vars.F‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ program ftst_vars
3838
integer DEFAULT_CACHE_SIZE, DEFAULT_CACHE_NELEMS_OLD
3939
integer DEFAULT_CACHE_NELEMS_NEW
4040
integer DEFAULT_CACHE_PREEMPTION
41-
parameter (DEFAULT_CACHE_SIZE = 16777216)
41+
parameter (DEFAULT_CACHE_SIZE = 67108864)
4242
parameter (DEFAULT_CACHE_NELEMS_OLD = 4133)
4343
parameter (DEFAULT_CACHE_NELEMS_NEW = 1000)
4444
parameter (DEFAULT_CACHE_PREEMPTION = 75)

0 commit comments

Comments
 (0)