TBB for Embree3

howetuft · Jan 5, 2025 · aa1285a · aa1285a
1 parent e3aec07
commit aa1285a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -228,9 +228,10 @@ jobs:
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: |
             TBB=/project/full_deploy/host/onetbb/$TBB_VERSION/Release/x86_64/lib
             OIDN=/project/full_deploy/host/oidn/$OIDN_VERSION/Release/x86_64/lib
+            EMBREE3=/project/full_deploy/host/embree3/$EMBREE3_VERSION/Release/x86_64/lib
             HWLOC=/project/full_deploy/host/hwloc/2.9.3/Release/x86_64/lib
             LEVEL_ZERO=/project/full_deploy/host/level-zero/1.17.39/Release/x86_64/lib
-            LD_LIBRARY_PATH=$TBB:$HWLOC:$LEVEL_ZERO:$OIDN:$LD_LIBRARY_PATH
+            LD_LIBRARY_PATH=$TBB:$HWLOC:$LEVEL_ZERO:$OIDN:$EMBREE3:$LD_LIBRARY_PATH
             echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
             export LD_LIBRARY_PATH
 

diff --git a/conan-profiles/conan-profile-common b/conan-profiles/conan-profile-common
@@ -16,7 +16,9 @@ yasm/*
 
 [options]
 oidn/*:shared=True
-embree3/*:with_tbb=False
+embree3/*:with_tbb=True
+embree3/*:shared=True
+
 
 # boost/*:without_atomic=True
 boost/*:without_charconv=True

diff --git a/scripts/repair_wheel_windows.sh b/scripts/repair_wheel_windows.sh
@@ -27,6 +27,7 @@ delvewheel repair -v \
   --add-path="${redist_paths}" \
   --add-path="C:/Users/runneradmin/full_deploy/host/onetbb/${TBB_VERSION}/Release/x86_64/bin" \
   --add-path="C:/Users/runneradmin/full_deploy/host/oidn/${OIDN_VERSION}/Release/x86_64/bin" \
+  --add-path="C:/Users/runneradmin/full_deploy/host/embree3/${EMBREE3_VERSION}/Release/x86_64/bin" \
   -w "${dest_dir}" \
   "${wheel}"