Skip to content

Commit e698ad4

Browse files
authored
[CI] Fix cache and add CPU info (FreeFem#379)
* Fix PETSc cache key and get CPU info * Fix PETSc install location in cache
1 parent 4429ea0 commit e698ad4

4 files changed

Lines changed: 25 additions & 6 deletions

File tree

.github/workflows/full-mpich.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ jobs:
7575
fi
7676
echo "staging-dir=${{ github.workspace }}/install_staging" >> $GITHUB_OUTPUT
7777
78+
- name: CPU info
79+
run: lscpu
80+
7881
- name: Extract PETSc and runner info
7982
id: petsc-info
8083
run: |
@@ -88,8 +91,8 @@ jobs:
8891
uses: actions/cache@v4
8992
with:
9093
path: |
91-
${{ steps.petsc-info.outputs.home }}/freefem/ff-petsc
92-
key: petsc-${{ github.workflow }}-${{ steps.petsc-info.outputs.image }}-${{ matrix.cfg.opts }}-${{ steps.petsc-info.outputs.version }}-${{ hashFiles('3rdparty/ff-petsc/Makefile') }}
94+
${{ env.INSTALL_DIR }}/ff-petsc
95+
key: "petsc-Full version MPICH-${{ steps.petsc-info.outputs.image }}-${{ matrix.cfg.opts }}-${{ steps.petsc-info.outputs.version }}-${{ hashFiles('3rdparty/ff-petsc/Makefile') }}"
9396

9497
- name: Configure
9598
run: |
@@ -187,6 +190,9 @@ jobs:
187190
- name: Symlink gfortran
188191
run: ./etc/actions/macos/link_fortran.sh "$(uname -p)"
189192

193+
- name: CPU info
194+
run: system_profiler SPHardwareDataType
195+
190196
- name: Extract PETSc and runner info
191197
id: petsc-info
192198
run: |
@@ -201,7 +207,7 @@ jobs:
201207
with:
202208
path: |
203209
${{ steps.petsc-info.outputs.home }}/freefem/ff-petsc
204-
key: petsc-${{ github.workflow }}-${{ steps.petsc-info.outputs.image }}-${{ matrix.cfg.opts }}-${{ steps.petsc-info.outputs.version }}-${{ hashFiles('3rdparty/ff-petsc/Makefile') }}
210+
key: "petsc-Full version MPICH-${{ steps.petsc-info.outputs.image }}-${{ matrix.cfg.opts }}-${{ steps.petsc-info.outputs.version }}-${{ hashFiles('3rdparty/ff-petsc/Makefile') }}"
205211

206212
- name: Configure
207213
run: |

.github/workflows/full-msmpi.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ jobs:
105105
echo "configure-flags=--enable-optim --enable-generic" >> $GITHUB_OUTPUT
106106
fi
107107
108+
- name: CPU info
109+
shell: pwsh
110+
run: systeminfo
111+
108112
- name: Extract PETSc and runner info
109113
id: petsc-info
110114
run: |
@@ -120,7 +124,7 @@ jobs:
120124
with:
121125
path: |
122126
${{ steps.petsc-info.outputs.win_home }}/freefem/ff-petsc
123-
key: petsc-${{ github.workflow }}-${{ steps.petsc-info.outputs.image }}-${{ matrix.cfg.opts }}-${{ steps.petsc-info.outputs.version }}-${{ hashFiles('3rdparty/ff-petsc/Makefile') }}
127+
key: "petsc-Full version MS-MPI-${{ steps.petsc-info.outputs.image }}-${{ matrix.cfg.opts }}-${{ steps.petsc-info.outputs.version }}-${{ hashFiles('3rdparty/ff-petsc/Makefile') }}"
124128

125129
- name: Configure
126130
run: |

.github/workflows/full-openmpi.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ jobs:
7272
fi
7373
echo "staging-dir=${{ github.workspace }}/install_staging" >> $GITHUB_OUTPUT
7474
75+
- name: CPU info
76+
run: lscpu
77+
7578
- name: Extract PETSc and runner info
7679
id: petsc-info
7780
run: |
@@ -85,8 +88,8 @@ jobs:
8588
uses: actions/cache@v4
8689
with:
8790
path: |
88-
${{ steps.petsc-info.outputs.home }}/freefem/ff-petsc
89-
key: petsc-${{ github.workflow }}-${{ steps.petsc-info.outputs.image }}-${{ matrix.cfg.opts }}-${{ steps.petsc-info.outputs.version }}-${{ hashFiles('3rdparty/ff-petsc/Makefile') }}
91+
${{ env.INSTALL_DIR }}/ff-petsc
92+
key: "petsc-Full version Open MPI-${{ steps.petsc-info.outputs.image }}-${{ matrix.cfg.opts }}-${{ steps.petsc-info.outputs.version }}-${{ hashFiles('3rdparty/ff-petsc/Makefile') }}"
9093

9194
- name: Configure
9295
run: |

.github/workflows/release_check.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ jobs:
4242
name: Ubuntu ${{ matrix.version }} - Check .deb
4343
runs-on: ubuntu-${{ matrix.version }}
4444
steps:
45+
- name: CPU info
46+
run: lscpu
47+
4548
- uses: actions/checkout@v4
4649

4750
- name: Download package
@@ -71,6 +74,9 @@ jobs:
7174
shell: pwsh
7275

7376
steps:
77+
- name: CPU info
78+
run: systeminfo
79+
7480
- name: Setup MPI
7581
uses: mpi4py/setup-mpi@v1
7682
with:

0 commit comments

Comments
 (0)