Skip to content

Commit ae65c8a

Browse files
committed
[ci] dropping zfp on mac
1 parent 831fe6b commit ae65c8a

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed
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.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
15-
167
- name: Install ZFP dependency
178
shell: bash
189
run: |

.github/workflows/test.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,11 @@ jobs:
7373
with:
7474
key: ${{ matrix.os }}-0
7575

76-
- name: Install optional dependencies
77-
uses: ./.github/actions/install-deps-unix
76+
- name: Install optional Spectra dependency
77+
uses: ./.github/actions/install-spectra-unix
78+
79+
- name: Install optional ZFP dependency
80+
uses: ./.github/actions/install-zfp-unix
7881

7982
# TODO: try to replicate for mac
8083
- name: Install Torch
@@ -299,8 +302,8 @@ jobs:
299302
with:
300303
key: macos-0
301304

302-
- name: Install optional dependencies
303-
uses: ./.github/actions/install-deps-unix
305+
- name: Install optional Spectra dependency
306+
uses: ./.github/actions/install-spectra-unix
304307

305308
- name: Fetch TTK-ParaView headless macOS binary archive
306309
run: |
@@ -435,7 +438,7 @@ jobs:
435438
- name: Install dependencies with conda
436439
shell: bash
437440
run: |
438-
conda install -c conda-forge libboost-devel glew eigen spectralib \
441+
conda install -c conda-forge libboost-devel glew eigen spectralib zfp \
439442
sqlite scikit-learn graphviz ninja python=3.10 zlib qhull \
440443
llvm-openmp clangxx=18
441444
# add TTK & ParaView install folders to PATH

0 commit comments

Comments
 (0)