Merge pull request #1119 from julien-tierny/dev

[ci] updating packaging to pv6

Author: julien-tierny

.github/workflows/package.yml

@@ -12,7 +12,7 @@ on:
       - 'pack*'
 
 env:
-  PV_TAG: v5.13.0
+  PV_TAG: v6.0.1
   PV_REPO: topology-tool-kit/ttk-paraview
 
 jobs:
@@ -47,8 +47,11 @@ jobs:
           libqhull-dev \
           dpkg-dev
 
-    - name: Install optional dependencies
-      uses: ./.github/actions/install-deps-unix
+    - name: Install optional Spectra dependency
+      uses: ./.github/actions/install-spectra-unix
+
+    - name: Install optional ZFP dependency
+      uses: ./.github/actions/install-zfp-unix
 
     - name: Fetch TTK-ParaView headless Debian package
       run: |
@@ -134,7 +137,7 @@ jobs:
         echo "PYTHONPATH=/usr/lib/python3/dist-packages:$PYTHONPATH" >> $GITHUB_ENV
 
     - name: Run TTK tests
-      uses: ./.github/actions/test-ttk-unix
+      uses: ./.github/actions/test-ttk-ubuntu
 
     - uses: actions/checkout@v4
       with:
@@ -191,13 +194,13 @@ jobs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.12'
+        python-version: '3.13'
 
     - name: Install macOS dependencies
       run: |
         # ParaView dependencies
         brew install --cask xquartz
-        brew install llvm lld mesa glew qt@5 ninja 
+        brew install mesa glew qt@5 ninja libomp 
         # TTK dependencies
         brew install boost cgal eigen graphviz spectra sqlite zlib numpy qhull 
 
@@ -206,26 +209,22 @@ jobs:
       with:
         key: macos-0
 
-    - name: Install optional dependencies
-      uses: ./.github/actions/install-deps-unix
+    - name: Install optional Spectra dependency
+      uses: ./.github/actions/install-spectra-unix
+
+    - name: Install optional ZFP dependency
+      uses: ./.github/actions/install-zfp-unix
 
     - name: Fetch & install TTK-ParaView
       run: |
         wget https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-${{ env.PV_TAG }}-${{ matrix.os }}.tar.gz
         tar xzf ttk-paraview-${{ env.PV_TAG }}-${{ matrix.os }}.tar.gz
         sudo cp -r ttk-paraview/* /usr/local
         # pvpython does not embed the correct PYTHONPATH
-        echo "PYTHONPATH=/usr/local/lib/python3.12/site-packages:$PYTHONPATH" >> $GITHUB_ENV
+        echo "PYTHONPATH=/usr/local/lib/python3.13/site-packages:$PYTHONPATH" >> $GITHUB_ENV
         pvpython -m pip install --break-system-packages scikit-learn
         # pvpython is expecting a vtkpython executable at this path
-        sudo ln -s /usr/local/bin/pvpython /Library/Frameworks/Python.framework/Versions/3.12/vtkpython
-
-    - name: Set compilers as environment variables
-      run: |
-        echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
-        echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
-        echo "CPPFLAGS=$(brew --prefix llvm)/include" >> $GITHUB_ENV
-        echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib/unwind -lunwind" >> $GITHUB_ENV
+        sudo ln -s /usr/local/bin/pvpython /Library/Frameworks/Python.framework/Versions/3.13/vtkpython
 
     - name: Create & configure TTK build directory
       run: |
@@ -234,6 +233,12 @@ jobs:
         cmake \
           -DCMAKE_BUILD_TYPE=Release \
           -DQt5_DIR=$(brew --prefix qt@5)/lib/cmake/Qt5 \
+          -DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
+          -DOpenMP_C_LIB_NAMES="omp" \
+          -DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
+          -DOpenMP_CXX_LIB_NAMES="omp" \
+          -DOpenMP_omp_LIBRARY=/opt/homebrew/opt/libomp/lib/libomp.dylib \
+          -DCMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/opt/libomp/lib -lomp" \
           -DTTK_BUILD_PARAVIEW_PLUGINS=TRUE \
           -DTTK_BUILD_VTK_WRAPPERS=TRUE \
           -DTTK_BUILD_STANDALONE_APPS=TRUE \
@@ -277,13 +282,13 @@ jobs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.12'
+        python-version: '3.13'
 
     - name: Install macOS dependencies
       run: |
         # ParaView dependencies
         brew install --cask xquartz
-        brew install llvm lld mesa glew qt@5 ninja 
+        brew install mesa glew qt@5 ninja libomp
         # TTK dependencies
         brew install boost cgal eigen graphviz spectra sqlite zlib numpy qhull 
 
@@ -292,8 +297,11 @@ jobs:
       with:
         key: macos-0
 
-    - name: Install optional dependencies
-      uses: ./.github/actions/install-deps-unix
+    - name: Install optional Spectra dependency
+      uses: ./.github/actions/install-spectra-unix
+
+    - name: Install optional ZFP dependency
+      uses: ./.github/actions/install-zfp-unix
 
     - name: Fetch TTK-ParaView
       run: |
@@ -314,19 +322,14 @@ jobs:
 
     - name: Set environment variables
       run: |
-        echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
-        echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
-        echo "CPPFLAGS=$(brew --prefix llvm)/include" >> $GITHUB_ENV
-        echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib/unwind -lunwind" >> $GITHUB_ENV
-
         echo "CMAKE_PREFIX_PATH=$(brew --prefix qt@5)/lib/cmake:$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
         # pvpython does not embed the correct PYTHONPATH
-        echo "PYTHONPATH=/usr/local/lib/python3.12/site-packages:$PYTHONPATH" >> $GITHUB_ENV
+        echo "PYTHONPATH=/usr/local/lib/python3.13/site-packages:$PYTHONPATH" >> $GITHUB_ENV
         # pvpython is expecting a vtkpython executable at this path
-        sudo ln -s /usr/local/bin/pvpython /Library/Frameworks/Python.framework/Versions/3.12/vtkpython
+        sudo ln -s /usr/local/bin/pvpython /Library/Frameworks/Python.framework/Versions/3.13/vtkpython
 
     - name: Run TTK tests
-      uses: ./.github/actions/test-ttk-unix
+      uses: ./.github/actions/test-ttk-macos
 
     - uses: actions/checkout@v4
       with:
@@ -587,8 +590,12 @@ jobs:
         set PV_PLUGIN_PATH=%TTK_DIR%\bin\plugins
         cd ttk-data
         rm python/nestedTrackingFromOverlap.py
+        # tmp removal of mpi example
+        rm python/mpiExample.py
         # remove examples which fill up the memory
         rm python/topologicalOptimization_darkSky.py
+        # remove examples using raster features
+        rm python/geometryApproximation.py
         pvpython.exe -u python\run.py
 
     - name: Test ttk-data Python scripts results [NOT ENFORCED]

.github/workflows/test.yml

@@ -293,7 +293,6 @@ jobs:
         # ParaView dependencies
         brew install --cask xquartz
         brew install ninja open-mpi libomp
-        #brew install llvm lld
         # TTK dependencies
         brew install boost cgal eigen graphviz spectra sqlite numpy qhull