Skip to content

Commit e40079b

Browse files
committed
[ci] tbb for parallel 3d Delaunay
1 parent 74c950b commit e40079b

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/package.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
libeigen3-dev \
4040
libgraphviz-dev \
4141
libsqlite3-dev \
42+
libtbb-dev \
4243
libgl1-mesa-dev \
4344
libwebsocketpp-dev \
4445
graphviz \
@@ -202,7 +203,7 @@ jobs:
202203
brew install --cask xquartz
203204
brew install mesa glew qt@5 ninja libomp
204205
# TTK dependencies
205-
brew install boost cgal eigen graphviz spectra sqlite zlib numpy qhull
206+
brew install boost cgal eigen graphviz spectra sqlite tbb zlib numpy qhull
206207
207208
- name: Install and setup sccache
208209
uses: f3d-app/sccache-setup-action@v1
@@ -290,7 +291,7 @@ jobs:
290291
brew install --cask xquartz
291292
brew install mesa glew qt@5 ninja libomp
292293
# TTK dependencies
293-
brew install boost cgal eigen graphviz spectra sqlite zlib numpy qhull
294+
brew install boost cgal eigen graphviz spectra sqlite tbb zlib numpy qhull
294295
295296
- name: Install and setup sccache
296297
uses: f3d-app/sccache-setup-action@v1

.github/workflows/test-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
brew install --cask xquartz
4343
brew install ninja open-mpi libomp
4444
# TTK dependencies
45-
brew install boost cgal eigen graphviz spectra sqlite numpy qhull
45+
brew install boost cgal eigen graphviz spectra sqlite tbb numpy qhull
4646
4747
- name: Run sccache-cache
4848
uses: mozilla-actions/[email protected]

.github/workflows/test-ubuntu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
libosmesa-dev \
4343
libopenmpi-dev \
4444
libsqlite3-dev \
45+
libtbb-dev \
4546
libwebsocketpp-dev \
4647
graphviz \
4748
python3-sklearn \

core/base/delaunayRipsPersistenceDiagram/geoPHd.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,6 @@ namespace ttk::gph {
411411
#ifndef TTK_GPH_PARALLEL
412412
computeDPH(ph, MSA);
413413
#else
414-
tbb::global_control gc(
415-
tbb::global_control::max_allowed_parallelism, nThreads_);
416414
omp_set_num_threads(nThreads_);
417415

418416
DisjointSets UF(N_c);

0 commit comments

Comments
 (0)