From a173ddb9720c10be93874cb37b6a1f96b5eb17d8 Mon Sep 17 00:00:00 2001 From: Julien J Tierny Date: Sat, 14 Sep 2024 07:30:17 +0200 Subject: [PATCH 1/8] [ci] migrating check to ubuntu-24.04 --- .github/workflows/check.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 60a7afdea1..ec16bd5a71 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -22,7 +22,7 @@ concurrency: cancel-in-progress: true env: - PV_TAG: v5.12.0-headless + PV_TAG: v5.13.0-headless PV_REPO: topology-tool-kit/ttk-paraview @@ -33,7 +33,7 @@ jobs: # Check source formatting # # ----------------------- # check-formatting: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 @@ -86,7 +86,7 @@ jobs: # Code lint job # # ------------- # lint-code: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: config: @@ -108,6 +108,7 @@ jobs: libeigen3-dev \ libgraphviz-dev \ libosmesa-dev \ + libopenmpi-dev \ libsqlite3-dev \ libwebsocketpp-dev \ graphviz \ @@ -123,7 +124,7 @@ jobs: - name: Fetch TTK-ParaView headless Debian package run: | wget -O ttk-paraview-headless.deb \ - https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-ubuntu-22.04.deb + https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-ubuntu-24.04.deb - name: Install ParaView .deb run: | @@ -170,7 +171,7 @@ jobs: # Check compiler warnings # # ----------------------- # check-warnings: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: kamikaze: [KAMIKAZE=TRUE, KAMIKAZE=FALSE] @@ -193,6 +194,7 @@ jobs: libeigen3-dev \ libgraphviz-dev \ libosmesa-dev \ + libopenmpi-dev \ libsqlite3-dev \ libwebsocketpp-dev \ graphviz \ @@ -208,7 +210,7 @@ jobs: - name: Fetch TTK-ParaView headless Debian package run: | wget -O ttk-paraview-headless.deb \ - https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-ubuntu-22.04.deb + https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-ubuntu-24.04.deb - name: Install ParaView .deb run: | From a8846f84cca845d040e302737354c71806c0786c Mon Sep 17 00:00:00 2001 From: Julien Tierny Date: Mon, 16 Sep 2024 11:49:22 +0200 Subject: [PATCH 2/8] Revert "[ci] migrating check to ubuntu-24.04" This reverts commit a173ddb9720c10be93874cb37b6a1f96b5eb17d8. --- .github/workflows/check.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ec16bd5a71..60a7afdea1 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -22,7 +22,7 @@ concurrency: cancel-in-progress: true env: - PV_TAG: v5.13.0-headless + PV_TAG: v5.12.0-headless PV_REPO: topology-tool-kit/ttk-paraview @@ -33,7 +33,7 @@ jobs: # Check source formatting # # ----------------------- # check-formatting: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -86,7 +86,7 @@ jobs: # Code lint job # # ------------- # lint-code: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 strategy: matrix: config: @@ -108,7 +108,6 @@ jobs: libeigen3-dev \ libgraphviz-dev \ libosmesa-dev \ - libopenmpi-dev \ libsqlite3-dev \ libwebsocketpp-dev \ graphviz \ @@ -124,7 +123,7 @@ jobs: - name: Fetch TTK-ParaView headless Debian package run: | wget -O ttk-paraview-headless.deb \ - https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-ubuntu-24.04.deb + https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-ubuntu-22.04.deb - name: Install ParaView .deb run: | @@ -171,7 +170,7 @@ jobs: # Check compiler warnings # # ----------------------- # check-warnings: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 strategy: matrix: kamikaze: [KAMIKAZE=TRUE, KAMIKAZE=FALSE] @@ -194,7 +193,6 @@ jobs: libeigen3-dev \ libgraphviz-dev \ libosmesa-dev \ - libopenmpi-dev \ libsqlite3-dev \ libwebsocketpp-dev \ graphviz \ @@ -210,7 +208,7 @@ jobs: - name: Fetch TTK-ParaView headless Debian package run: | wget -O ttk-paraview-headless.deb \ - https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-ubuntu-24.04.deb + https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-ubuntu-22.04.deb - name: Install ParaView .deb run: | From 2e51b44c5879930077ffcdc21986da7c3d5bc11d Mon Sep 17 00:00:00 2001 From: Julien Tierny Date: Mon, 16 Sep 2024 11:50:12 +0200 Subject: [PATCH 3/8] [ci] migrating check workflow to pv513 --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 60a7afdea1..f02326c2eb 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -22,7 +22,7 @@ concurrency: cancel-in-progress: true env: - PV_TAG: v5.12.0-headless + PV_TAG: v5.13.0-headless PV_REPO: topology-tool-kit/ttk-paraview From fd6a9e641bae678d24cdb8ecf332be0dfc1a8ccd Mon Sep 17 00:00:00 2001 From: Julien Tierny Date: Mon, 16 Sep 2024 12:17:18 +0200 Subject: [PATCH 4/8] [doc] links to dark sky example (vtk-layer) --- core/vtk/ttkMorseSmaleComplex/ttkMorseSmaleComplex.h | 3 +++ core/vtk/ttkPersistenceDiagram/ttkPersistenceDiagram.h | 3 +++ core/vtk/ttkScalarFieldSmoother/ttkScalarFieldSmoother.h | 3 +++ .../ttkTopologicalSimplification.h | 3 +++ 4 files changed, 12 insertions(+) diff --git a/core/vtk/ttkMorseSmaleComplex/ttkMorseSmaleComplex.h b/core/vtk/ttkMorseSmaleComplex/ttkMorseSmaleComplex.h index c56a8b7805..593e038a2e 100644 --- a/core/vtk/ttkMorseSmaleComplex/ttkMorseSmaleComplex.h +++ b/core/vtk/ttkMorseSmaleComplex/ttkMorseSmaleComplex.h @@ -100,6 +100,9 @@ /// href="https://topology-tool-kit.github.io/examples/tectonicPuzzle/">Tectonic /// Puzzle example \n /// - Topological +/// Optimization DarkSky\n +/// - Tribute /// example \n /// diff --git a/core/vtk/ttkPersistenceDiagram/ttkPersistenceDiagram.h b/core/vtk/ttkPersistenceDiagram/ttkPersistenceDiagram.h index 0b802d97b5..a15c0b13a0 100644 --- a/core/vtk/ttkPersistenceDiagram/ttkPersistenceDiagram.h +++ b/core/vtk/ttkPersistenceDiagram/ttkPersistenceDiagram.h @@ -143,6 +143,9 @@ /// href="https://topology-tool-kit.github.io/examples/tectonicPuzzle/">Tectonic /// Puzzle example \n /// - Topological +/// Optimization DarkSky\n +/// - Tribute /// example \n /// - Persistent /// Generators Dark Sky example \n +/// - Topological +/// Optimization DarkSky\n #pragma once diff --git a/core/vtk/ttkTopologicalSimplification/ttkTopologicalSimplification.h b/core/vtk/ttkTopologicalSimplification/ttkTopologicalSimplification.h index c4c666eb9c..8fe78ba9f9 100644 --- a/core/vtk/ttkTopologicalSimplification/ttkTopologicalSimplification.h +++ b/core/vtk/ttkTopologicalSimplification/ttkTopologicalSimplification.h @@ -116,6 +116,9 @@ /// href="https://topology-tool-kit.github.io/examples/tectonicPuzzle/">Tectonic /// Puzzle example \n /// - Topological +/// Optimization DarkSky\n +/// - Tribute /// example \n /// - Date: Mon, 16 Sep 2024 12:18:45 +0200 Subject: [PATCH 5/8] [ci] continue on doxygen warnings --- .github/workflows/check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index f02326c2eb..4c2f6561f0 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -161,6 +161,7 @@ jobs: - name: Check Doxygen documentation warnings if: matrix.config.dox + continue-on-error: true run: | cd build ! cmake --build . --target doc |& grep warning From 457c01b2d2948c93a88bd237e631575b06a10a68 Mon Sep 17 00:00:00 2001 From: Julien Tierny Date: Mon, 16 Sep 2024 12:21:48 +0200 Subject: [PATCH 6/8] [ci] check code action upgrade --- .github/workflows/check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4c2f6561f0..7b80c4d475 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -35,7 +35,7 @@ jobs: check-formatting: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install latest clang-format run: | @@ -97,7 +97,7 @@ jobs: CMAKE_EXPORT_COMPILE_COMMANDS: ON steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ubuntu dependencies run: | @@ -183,7 +183,7 @@ jobs: CMAKE_EXPORT_COMPILE_COMMANDS: ON steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ubuntu dependencies run: | From 9f73d9eb557b7fab71551b1ce91de7d24f886958 Mon Sep 17 00:00:00 2001 From: Julien Tierny Date: Mon, 16 Sep 2024 14:07:16 +0200 Subject: [PATCH 7/8] [ci] removing topoOpt dark sky (out of mem) --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c0c9048c6f..e95dee3db2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -92,7 +92,6 @@ jobs: run: | sudo apt install ./ttk-paraview-headless.deb - # TODO: more aggressive warnings? (ubuntu-24.04) - name: Create & configure TTK build directory run: | mkdir build @@ -241,6 +240,8 @@ jobs: # remove buggy example # related issue: https://github.com/topology-tool-kit/ttk/issues/1055 rm python/nestedTrackingFromOverlap.py + # remove examples which fill up the memory + rm python/topologicalOptimization_darkSky.py python3 -u python/run.py - name: Test ttk-data Python scripts results [NOT ENFORCED] From df190d7205130b945ed1bce2afcb86ebb1c57e17 Mon Sep 17 00:00:00 2001 From: Julien Tierny Date: Mon, 16 Sep 2024 14:11:49 +0200 Subject: [PATCH 8/8] [ci] remove examples that fill up memory --- .github/workflows/test.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e95dee3db2..726e166e12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -209,6 +209,8 @@ jobs: # remove buggy example # related issue: https://github.com/topology-tool-kit/ttk/issues/1055 rm ttk-data/states/nestedTrackingFromOverlap.py + # remove examples which fill up the memory + rm ttk-data/states/topologicalOptimization_darkSky.pvsm cd ttk-data/tests mkdir output_screenshots @@ -374,6 +376,8 @@ jobs: # remove buggy example # related issue: https://github.com/topology-tool-kit/ttk/issues/1055 rm ttk-data/states/nestedTrackingFromOverlap.py + # remove examples which fill up the memory + rm ttk-data/states/topologicalOptimization_darkSky.pvsm cd ttk-data/tests mkdir output_screenshots pvpython -u validate.py || (tar zcf screenshots.tar.gz output_screenshots && false) @@ -394,6 +398,8 @@ jobs: # remove buggy example # related issue: https://github.com/topology-tool-kit/ttk/issues/1055 rm python/nestedTrackingFromOverlap.py + # remove examples which fill up the memory + rm python/topologicalOptimization_darkSky.py pvpython -u python/run.py env: PV_PLUGIN_PATH: /usr/local/bin/plugins/TopologyToolKit @@ -576,6 +582,8 @@ jobs: set PV_PLUGIN_PATH=%TTK_DIR%\bin\plugins cd ttk-data rm python/nestedTrackingFromOverlap.py + # remove examples which fill up the memory + rm python/topologicalOptimization_darkSky.py pvpython.exe -u python\run.py - name: Test ttk-data Python scripts results [NOT ENFORCED]