Skip to content

Commit 4a36891

Browse files
[tbb/omp] Removing/deactivating OMP threading support since we would still have a TBB dependency
1 parent 7c8c9af commit 4a36891

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ Version History
2424
- Adding `ClearSurface` and `ClearVolume` function to clear the surface and volume samples separately.
2525
This allows to wait until a specific number of samples is collected for the surface or volume cache before updating/fitting the `Field`.
2626

27+
- Deactivating/removing `OMP` threading support since it would still have a dependency on `TBB`
28+
2729
- Bugfixes:
2830
- Fixing bug causing crash during `Field::Update` when in previous iterations no volume or surface samples were present.
2931

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ include(openpgl_macros)
2929

3030
## openpgl specific configuration ##
3131

32-
option(OPENPGL_USE_OMP_THREADING "Use omp instead of tbb for threading." OFF)
32+
#option(OPENPGL_USE_OMP_THREADING "Use omp instead of tbb for threading." OFF)
3333
option(OPENPGL_BUILD_STATIC "Build OpenPGL as static library." OFF)
3434

3535
option(OPENPGL_BUILD_TOOLS "Build tool applications." OFF)

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ specification is still in flux and might change with upcoming releases.
5151
## Open PGL 0.5.0
5252

5353
- Api changes:
54+
5455
- `PathSegmentStorage`:
5556
- Removed support for splatting training samples due to the
5657
fact that knn-lookups have proven to be better. Therefore,
@@ -75,7 +76,12 @@ specification is still in flux and might change with upcoming releases.
7576
the surface and volume samples separately. This allows to
7677
wait until a specific number of samples is collected for the
7778
surface or volume cache before updating/fitting the `Field`.
79+
80+
- Deactivating/removing `OMP` threading support since it would still
81+
have a dependency on `TBB`
82+
7883
- Bugfixes:
84+
7985
- Fixing bug causing crash during `Field::Update` when in previous
8086
iterations no volume or surface samples were present.
8187

openpgl/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,18 @@ else()
110110
endif()
111111

112112

113-
if(OPENPGL_USE_OMP_THREADING)
114-
set(OPENPGL_RELEASE_OPTIONS -fopenmp)
115-
endif()
113+
#if(OPENPGL_USE_OMP_THREADING)
114+
# set(OPENPGL_RELEASE_OPTIONS -fopenmp)
115+
#endif()
116116

117117
target_compile_options(${PROJECT_NAME} PUBLIC "$<$<CONFIG:RELEASE>:${OPENPGL_RELEASE_OPTIONS}>")
118118

119119
# CMAKE 3.8 feature
120120
#target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
121121

122-
if(OPENPGL_USE_OMP_THREADING)
123-
add_compile_definitions(OPENPGL_USE_OMP_THREADING)
124-
endif()
122+
#if(OPENPGL_USE_OMP_THREADING)
123+
# add_compile_definitions(OPENPGL_USE_OMP_THREADING)
124+
#endif()
125125

126126
#add_compile_options()
127127

0 commit comments

Comments
 (0)