Skip to content

Commit 14d3525

Browse files
prj-prj-
authored
Update used Actions + small regression fix in make petsc-slepc (FreeFem#381)
1 parent be6e57b commit 14d3525

9 files changed

Lines changed: 39 additions & 31 deletions

File tree

‎.github/workflows/full-mpich.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
INSTALL_DIR: /usr/local
5757
runs-on: ubuntu-${{ matrix.version }}
5858
steps:
59-
- uses: actions/checkout@v4
59+
- uses: actions/checkout@v6
6060

6161
- name: Install dependencies
6262
run: |
@@ -88,7 +88,7 @@ jobs:
8888
8989
- name: Cache PETSc installation
9090
id: cache-petsc
91-
uses: actions/cache@v4
91+
uses: actions/cache@v5
9292
with:
9393
path: |
9494
${{ env.INSTALL_DIR }}/ff-petsc
@@ -111,7 +111,7 @@ jobs:
111111
112112
- name: Upload PETSc and reconfigure logs on fail
113113
if: ${{ failure() }}
114-
uses: actions/upload-artifact@v4
114+
uses: actions/upload-artifact@v7
115115
with:
116116
name: PETSc-reconfigure-logs
117117
path: |
@@ -144,7 +144,7 @@ jobs:
144144
145145
- name: Upload
146146
if: ${{ inputs.upload_build_artifacts == true }}
147-
uses: actions/upload-artifact@v4
147+
uses: actions/upload-artifact@v7
148148
with:
149149
name: install_tree_${{ matrix.version }}
150150
path: install_tree.tar.gz
@@ -166,7 +166,7 @@ jobs:
166166
runs-on: macos-${{ matrix.version }}
167167

168168
steps:
169-
- uses: actions/checkout@v4
169+
- uses: actions/checkout@v6
170170

171171
# Remove homebrew LLVM compiler, and use most recent Xcode development
172172
# tools
@@ -203,7 +203,7 @@ jobs:
203203
204204
- name: Cache PETSc installation
205205
id: cache-petsc
206-
uses: actions/cache@v4
206+
uses: actions/cache@v5
207207
with:
208208
path: |
209209
${{ steps.petsc-info.outputs.home }}/freefem/ff-petsc
@@ -226,7 +226,7 @@ jobs:
226226
227227
- name: Upload PETSc and reconfigure logs on fail
228228
if: ${{ failure() }}
229-
uses: actions/upload-artifact@v4
229+
uses: actions/upload-artifact@v7
230230
with:
231231
name: PETSc-reconfigure-logs
232232
path: |

‎.github/workflows/full-msmpi.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
pacman -R --noconfirm mingw-w64-x86_64-python mingw-w64-x86_64-gdb \
9595
mingw-w64-x86_64-gdb-multiarch
9696
97-
- uses: actions/checkout@v4
97+
- uses: actions/checkout@v6
9898

9999
- name: Set configure flags and variables
100100
id: flags
@@ -120,7 +120,7 @@ jobs:
120120
121121
- name: Cache PETSc installation
122122
id: cache-petsc
123-
uses: actions/cache@v4
123+
uses: actions/cache@v5
124124
with:
125125
path: |
126126
${{ steps.petsc-info.outputs.win_home }}/freefem/ff-petsc
@@ -144,7 +144,7 @@ jobs:
144144
145145
- name: Upload PETSc and reconfigure logs on fail
146146
if: ${{ failure() }}
147-
uses: actions/upload-artifact@v4
147+
uses: actions/upload-artifact@v7
148148
with:
149149
name: PETSc-reconfigure-logs
150150
path: |
@@ -167,7 +167,7 @@ jobs:
167167

168168
- name: Upload .exe
169169
if: ${{ inputs.upload_build_artifacts == true }}
170-
uses: actions/upload-artifact@v4
170+
uses: actions/upload-artifact@v7
171171
with:
172172
name: v${{ inputs.release_version }}-Windows-${{ matrix.windows_version }}
173173
path: Output/*.exe

‎.github/workflows/full-openmpi.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
INSTALL_DIR: /usr/local
5454
runs-on: ubuntu-${{ matrix.version }}
5555
steps:
56-
- uses: actions/checkout@v4
56+
- uses: actions/checkout@v6
5757

5858
- name: Install dependencies
5959
run: |
@@ -85,7 +85,7 @@ jobs:
8585
8686
- name: Cache PETSc installation
8787
id: cache-petsc
88-
uses: actions/cache@v4
88+
uses: actions/cache@v5
8989
with:
9090
path: |
9191
${{ env.INSTALL_DIR }}/ff-petsc
@@ -108,7 +108,7 @@ jobs:
108108
109109
- name: Upload PETSc and reconfigure logs on fail
110110
if: ${{ failure() }}
111-
uses: actions/upload-artifact@v4
111+
uses: actions/upload-artifact@v7
112112
with:
113113
name: PETSc-reconfigure-logs
114114
path: |
@@ -141,7 +141,7 @@ jobs:
141141
142142
- name: Upload
143143
if: ${{ inputs.upload_build_artifacts == true }}
144-
uses: actions/upload-artifact@v4
144+
uses: actions/upload-artifact@v7
145145
with:
146146
name: install_tree_${{ matrix.version }}
147147
path: install_tree.tar.gz

‎.github/workflows/minimal.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
unzip
124124
mingw-w64-x86_64-lapack
125125
126-
- uses: actions/checkout@v4
126+
- uses: actions/checkout@v6
127127

128128
- name: Configure
129129
run: |

‎.github/workflows/release_check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
outputs:
2525
ff_version: ${{ steps.get_version.outputs.ff_version }}
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v6
2828

2929
- name: Extract version from configure.ac
3030
id: get_version
@@ -45,7 +45,7 @@ jobs:
4545
- name: CPU info
4646
run: lscpu
4747

48-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v6
4949

5050
- name: Download package
5151
run: |
@@ -82,7 +82,7 @@ jobs:
8282
with:
8383
mpi: msmpi
8484

85-
- uses: actions/checkout@v4
85+
- uses: actions/checkout@v6
8686

8787
- name: Download package
8888
run: |

‎.github/workflows/release_deb.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
matrix:
3333
ubuntu_version: ${{ fromJSON(inputs.ubuntu_versions) }}
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v6
3636

3737
- name: Set version variables
3838
id: version
@@ -43,7 +43,7 @@ jobs:
4343
echo "Version: $VERSION"
4444
echo "Release tag name: $RELEASE_TAG_NAME"
4545
46-
- uses: actions/download-artifact@v5
46+
- uses: actions/download-artifact@v8
4747
with:
4848
name: install_tree_${{ matrix.ubuntu_version }}
4949
path: ./artifacts
@@ -57,7 +57,7 @@ jobs:
5757
./install_tree ${{ inputs.release_version }}
5858
5959
- name: Upload .deb as artifact
60-
uses: actions/upload-artifact@v4
60+
uses: actions/upload-artifact@v7
6161
with:
6262
name: v${{ inputs.release_version }}-ubuntu-${{ matrix.ubuntu_version }}
6363
path: ./*.deb

‎.github/workflows/releases.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
windows_versions: ${{ steps.set_os_versions.outputs.windows_versions }}
1515

1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v6
1818

1919
- name: Extract version from configure.ac
2020
id: get_version
@@ -60,7 +60,7 @@ jobs:
6060
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6161

6262
- name: Create Release
63-
uses: softprops/action-gh-release@v1
63+
uses: softprops/action-gh-release@v2
6464
with:
6565
files: |
6666
./release-assets/*.deb

‎.github/workflows/sequential.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
tar
130130
mingw-w64-x86_64-cmake
131131
132-
- uses: actions/checkout@v4
132+
- uses: actions/checkout@v6
133133

134134
- name: Configure
135135
run: |

‎3rdparty/ff-petsc/Makefile‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,20 @@ PETSC_DOWNLOAD := $(PETSC_DOWNLOAD) --download-cmake
7070
endif
7171
PETSC_DOWNLOAD_C := $(PETSC_DOWNLOAD_C) --download-htool
7272
unexport MAKEFLAGS
73-
COMMON_FLAGS := --with-debugging=0 --with-ssl=0 --with-x=0 --with-fortran-bindings=0 --with-hg=0 --with-c2html=0 --with-coverage=0 --with-syclc=0 --with-hipc=0 --with-cudac=0 --with-tau-perfstubs=0 --with-python=0 \
73+
COMMON_FLAGS := --with-debugging=0 FOPTFLAGS=-O --with-ssl=0 --with-x=0 --with-fortran-bindings=0 --with-hg=0 --with-c2html=0 --with-coverage=0 --with-syclc=0 --with-hipc=0 --with-cudac=0 --with-tau-perfstubs=0 --with-python=0 \
7474
--download-slepc --download-hpddm
7575

7676
ifneq ($(wildcard ~/.petsc_pkg),)
7777
COMMON_FLAGS += --with-packages-download-dir=~/.petsc_pkg
7878
endif
79+
7980
ifeq ($(FF_generic_petsc), yes)
80-
COMMON_FLAGS += --with-avx512-kernels=0 CFLAGS+='-mtune=generic' CXXFLAGS+='-mtune=generic' FFLAGS+='-mtune=generic'
81+
COMMON_FLAGS += COPTFLAGS=-O2 CXXOPTFLAGS=-O2 --with-avx512-kernels=0 FFLAGS+='-mtune=generic'
82+
ifeq ($(WIN32DLLTARGET),)
83+
COMMON_FLAGS += CFLAGS+='-mtune=generic' CXXFLAGS+='-mtune=generic'
84+
endif
85+
else
86+
COMMON_FLAGS += COPTFLAGS=-O3 CXXOPTFLAGS=-O3
8187
endif
8288

8389
ifeq ($(FC),)
@@ -126,10 +132,12 @@ endif
126132
endif
127133

128134
ifneq ($(WIN32DLLTARGET),)
129-
COMMON_FLAGS += --with-shared-libraries=0 \
130-
CXXFLAGS+='-fno-stack-protector -Wno-format -Wno-format-extra-args' \
131-
CFLAGS+='-fno-stack-protector -Wno-format -Wno-format-extra-args -Wno-maybe-uninitialized' \
132-
--with-mpiexec='/C/Program\ Files/Microsoft\ MPI/Bin/mpiexec'
135+
COMMON_FLAGS += --with-shared-libraries=0 --with-mpiexec='/C/Program\ Files/Microsoft\ MPI/Bin/mpiexec'
136+
PETSC_CXXFLAGS := -fno-stack-protector -Wno-format -Wno-format-extra-args
137+
ifeq ($(FF_generic_petsc), yes)
138+
PETSC_CXXFLAGS += -mtune=generic
139+
endif
140+
COMMON_FLAGS += CFLAGS+='$(PETSC_CXXFLAGS) -Wno-maybe-uninitialized' CXXFLAGS+='$(PETSC_CXXFLAGS)'
133141
ifneq ($(FC),)
134142
ifneq ($(wildcard ~/.petsc_pkg),)
135143
PETSC_DOWNLOAD += '--download-slepc-configure-arguments=--with-packages-build-dir=$(PETSC_DIR)/fr/externalpackages --download-arpack --with-packages-download-dir=~/.petsc_pkg'

0 commit comments

Comments
 (0)