Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- Distributed computation of persistent homology!
- New backend for TrackingFromFields (critical point based)
- Fast planar Rips filtration persistence computation
- Migration to ParaView 6
- CI updates

### 1.3.0
Expand Down
32 changes: 9 additions & 23 deletions paraview/patch/headless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
os: [ubuntu-22.04, ubuntu-24.04]
steps:
- uses: actions/checkout@v4
name: Checkout TTK-ParaView source code
Expand All @@ -41,6 +41,7 @@ jobs:
-DCMAKE_INSTALL_PREFIX=/usr \
-DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=lib/python3/dist-packages \
-DPARAVIEW_USE_MPI=ON \
-DPARAVIEW_USE_PYTHON=ON \
-DPARAVIEW_USE_QT=OFF \
-DVTK_USE_X=OFF \
-DVTK_OPENGL_HAS_OSMESA=ON \
Expand Down Expand Up @@ -82,20 +83,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 ninja open-mpi
- 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
brew install ninja open-mpi
- name: Create & configure ParaView build directory
run: |
Expand All @@ -122,14 +116,14 @@ jobs:
cd build
sudo cmake --build . --target install
# 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
- name: Test Python imports
run: |
python3 -m vtk
python3 -m paraview.simple
pvpython -m vtk
pvpython -m paraview.simple
echo "import vtk" | python3
echo "from paraview.simple import *" | python3
echo "import vtk" | pvpython
echo "from paraview.simple import *" | pvpython
env:
DYLD_LIBRARY_PATH: /usr/local/lib

Expand Down Expand Up @@ -237,14 +231,6 @@ jobs:
- name: Fetch all uploaded artifacts
uses: actions/download-artifact@v4

- name: Upload Ubuntu Focal .deb as Release Asset
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
tag: ${{ github.ref }}
file: ttk-paraview-headless-ubuntu-20.04/ttk-paraview.deb
asset_name: ttk-paraview-headless-ubuntu-20.04.deb

- name: Upload Ubuntu Jammy .deb as Release Asset
uses: svenstaro/upload-release-action@v2
with:
Expand Down
31 changes: 8 additions & 23 deletions paraview/patch/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
os: [ubuntu-22.04, ubuntu-24.04]
steps:
- uses: actions/checkout@v4
name: Checkout TTK-ParaView source code
Expand Down Expand Up @@ -85,20 +85,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

- 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
brew install mesa glew qt@5 ninja

- name: Create & configure ParaView build directory
run: |
Expand All @@ -124,14 +117,14 @@ jobs:
cd build
sudo cmake --build . --target install
# 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

- name: Test Python imports
run: |
python3 -m vtk
python3 -m paraview.simple
pvpython -m vtk
pvpython -m paraview.simple
echo "import vtk" | python3
echo "from paraview.simple import *" | python3
echo "import vtk" | pvpython
echo "from paraview.simple import *" | pvpython
env:
DYLD_LIBRARY_PATH: /usr/local/lib

Expand Down Expand Up @@ -238,14 +231,6 @@ jobs:
- name: Fetch all uploaded artifacts
uses: actions/download-artifact@v4

- name: Upload Ubuntu Focal .deb as Release Asset
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
tag: ${{ github.ref }}
file: ttk-paraview-ubuntu-20.04/ttk-paraview.deb
asset_name: ttk-paraview-$tag-ubuntu-20.04.deb

- name: Upload Ubuntu Jammy .deb as Release Asset
uses: svenstaro/upload-release-action@v2
with:
Expand Down
Loading
Loading