Skip to content

Commit a534579

Browse files
julien-tiernyjulien-tierny
authored
Merge branch 'dev' into mtnn_refactor
2 parents f835015 + 7048f12 commit a534579

File tree

174 files changed

+17071
-1432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+17071
-1432
lines changed

‎.github/actions/install-spectra-unix/action.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: 'Install dependencies for Unix'
2+
description: 'Install Spectra optional dependencies'
3+
runs:
4+
using: "composite"
5+
steps:
6+
7+
- name: Install Spectra dependency
8+
shell: bash
9+
run: |
10+
wget https://github.com/yixuan/spectra/archive/v1.1.0.tar.gz
11+
tar xvf v1.1.0.tar.gz
12+
mkdir build_spectra && cd build_spectra
13+
cmake ../spectra-1.1.0
14+
sudo cmake --build . --target install --parallel

.github/actions/install-deps-unix/action.yml renamed to .github/actions/install-zfp-unix/action.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
name: 'Install dependencies for Unix'
2-
description: 'Install TTK optional dependencies on Ubuntu & macOS'
2+
description: 'Install ZFP optional dependencies'
33
runs:
44
using: "composite"
55
steps:
66

7-
- name: Install Spectra dependency
8-
shell: bash
9-
run: |
10-
wget https://github.com/yixuan/spectra/archive/v1.0.1.tar.gz
11-
tar xvf v1.0.1.tar.gz
12-
mkdir build_spectra && cd build_spectra
13-
cmake ../spectra-1.0.1
14-
sudo cmake --build . --target install --parallel
15-
167
- name: Install ZFP dependency
178
shell: bash
189
run: |

‎.github/actions/test-ttk-macos/action.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: 'Test TTK for Unix'
2+
description: 'Test TTK standalone, examples & states on Ubuntu & macOS'
3+
runs:
4+
using: "composite"
5+
steps:
6+
7+
- name: Test C++ example
8+
shell: bash
9+
run: |
10+
cd $GITHUB_WORKSPACE/examples/c++
11+
mkdir build && cd build
12+
cmake .. \
13+
-DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
14+
-DOpenMP_C_LIB_NAMES="omp" \
15+
-DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
16+
-DOpenMP_CXX_LIB_NAMES="omp" \
17+
-DOpenMP_omp_LIBRARY=/opt/homebrew/opt/libomp/lib/libomp.dylib \
18+
-DCMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/opt/libomp/lib -lomp"
19+
cmake --build . --parallel
20+
./ttkExample-c++ -i ../../data/inputData.off
21+
22+
- name: Test VTK-C++ example
23+
shell: bash
24+
run: |
25+
cd $GITHUB_WORKSPACE/examples/vtk-c++
26+
mkdir build && cd build
27+
cmake .. \
28+
-DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
29+
-DOpenMP_C_LIB_NAMES="omp" \
30+
-DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
31+
-DOpenMP_CXX_LIB_NAMES="omp" \
32+
-DOpenMP_omp_LIBRARY=/opt/homebrew/opt/libomp/lib/libomp.dylib \
33+
-DCMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/opt/libomp/lib -lomp"
34+
cmake --build . --parallel
35+
./ttkExample-vtk-c++ -i ../../data/inputData.vtu
36+
37+
- name: Test Python example
38+
shell: bash
39+
run: |
40+
cd $GITHUB_WORKSPACE/examples/python
41+
python3 example.py ../data/inputData.vtu
42+
43+
- name: Test pvpython example
44+
shell: bash
45+
run: |
46+
cd $GITHUB_WORKSPACE/examples/pvpython
47+
pvpython example.py ../data/inputData.vtu
48+
49+
- name: Test standalone
50+
shell: bash
51+
run: |
52+
cd $GITHUB_WORKSPACE
53+
ttkHelloWorldCmd -i examples/data/inputData.vtu

.github/actions/test-ttk-unix/action.yml renamed to .github/actions/test-ttk-ubuntu/action.yml

File renamed without changes.

‎.github/workflows/check.yml‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,16 @@
11
name: check_code
22

33
on:
4-
push:
5-
# triggered on tag pushes with tags beginning with either "v" or "dev"
6-
branch-ignore:
7-
- '*'
8-
tags:
9-
- 'v*'
10-
- 'dev*'
11-
- 'ci*'
12-
- 'check*'
13-
pull_request:
14-
# also triggered by pull requests on the "dev" & "mpi" branches
15-
branches:
16-
- 'dev'
17-
- 'mpi'
18-
19-
20-
concurrency:
21-
group: ${{ github.workflow }}-${{ github.ref }}
22-
cancel-in-progress: true
4+
workflow_call:
5+
workflow_dispatch:
236

247
env:
25-
PV_TAG: v5.13.0-headless
8+
PV_TAG: v6.0.1-headless
269
PV_REPO: topology-tool-kit/ttk-paraview
2710

2811

2912
jobs:
3013

31-
3214
# ----------------------- #
3315
# Check source formatting #
3416
# ----------------------- #
@@ -105,6 +87,7 @@ jobs:
10587
# TTK dependencies
10688
sudo apt install -y \
10789
libboost-system-dev \
90+
libcgal-dev \
10891
libeigen3-dev \
10992
libgraphviz-dev \
11093
libosmesa-dev \
@@ -117,8 +100,11 @@ jobs:
117100
doxygen \
118101
clang-tidy
119102
120-
- name: Install optional dependencies
121-
uses: ./.github/actions/install-deps-unix
103+
- name: Install optional Spectra dependency
104+
uses: ./.github/actions/install-spectra-unix
105+
106+
- name: Install optional ZFP dependency
107+
uses: ./.github/actions/install-zfp-unix
122108

123109
- name: Fetch TTK-ParaView headless Debian package
124110
run: |
@@ -153,10 +139,12 @@ jobs:
153139
154140
- name: Use Clang static analyzer
155141
if: matrix.config.sa
142+
# "FastRipsPersistenceDiagram2.cpp" is excluded because static analysis fails on CGAL's "Mpzf.h" file
156143
run: |
157144
git ls-files \
158145
| grep core \
159146
| grep -E "\.cpp$|\.cxx$" \
147+
| grep -v "FastRipsPersistenceDiagram2.cpp" \
160148
| xargs -n1 -P$(nproc) clang-tidy -p build --checks="-*,clang-analyzer-*" --warnings-as-errors="*" 2> /dev/null
161149
162150
- name: Check Doxygen documentation warnings
@@ -171,7 +159,7 @@ jobs:
171159
# Check compiler warnings #
172160
# ----------------------- #
173161
check-warnings:
174-
runs-on: ubuntu-22.04
162+
runs-on: ubuntu-24.04
175163
strategy:
176164
matrix:
177165
kamikaze: [KAMIKAZE=TRUE, KAMIKAZE=FALSE]
@@ -191,6 +179,7 @@ jobs:
191179
# TTK dependencies
192180
sudo apt install -y \
193181
libboost-system-dev \
182+
libcgal-dev \
194183
libeigen3-dev \
195184
libgraphviz-dev \
196185
libosmesa-dev \
@@ -203,13 +192,16 @@ jobs:
203192
clang-tools \
204193
libomp-dev
205194
206-
- name: Install optional dependencies
207-
uses: ./.github/actions/install-deps-unix
195+
- name: Install optional Spectra dependency
196+
uses: ./.github/actions/install-spectra-unix
197+
198+
- name: Install optional ZFP dependency
199+
uses: ./.github/actions/install-zfp-unix
208200

209201
- name: Fetch TTK-ParaView headless Debian package
210202
run: |
211203
wget -O ttk-paraview-headless.deb \
212-
https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-ubuntu-22.04.deb
204+
https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-ubuntu-24.04.deb
213205
214206
- name: Install ParaView .deb
215207
run: |

0 commit comments

Comments
 (0)