[WIP] Support Embree4

.github/workflows/wheels.yml

@@ -11,26 +11,28 @@ jobs:
       CIBW_ARCHS: auto64
       CIBW_TEST_REQUIRES: pytest numpy
       CIBW_TEST_COMMAND: pytest -v {project}/tests
-      CIBW_BEFORE_BUILD_LINUX: "yum install -y cmake wget; pip install cython; bash {project}/ci/embree3.bash"
-      CIBW_REPAIR_WHEEL_COMMAND_LINUX: "LD_LIBRARY_PATH=/root/embree/lib; auditwheel repair -w {dest_dir} {wheel}"
+      CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
+      CIBW_MANYLINUX_I686_IMAGE: manylinux_2_28
+      CIBW_BEFORE_BUILD_LINUX: "yum install -y cmake wget; pip install cython; bash {project}/ci/embree.bash"
+      CIBW_REPAIR_WHEEL_COMMAND_LINUX: "LD_LIBRARY_PATH=/root/embree4/lib; auditwheel repair -w {dest_dir} {wheel}"
       CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
-      CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path embree3\\bin; --no-mangle tbb12.dll;embree3.dll -w {dest_dir} {wheel}"
+      CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path embree4\\bin --no-mangle tbb12.dll;embree4.dll -w {dest_dir} {wheel}"
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-python@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
       name: Install Python
       with:
-        python-version: '3.7'
+        python-version: '3.11'
     - name: Install cibuildwheel
       run: |
-        python -m pip install cibuildwheel==2.3.1
+        python -m pip install cibuildwheel==2.12.3
     - name: Install Embree On Windows
       if: matrix.os == 'windows-latest'
       run: |
-        ci/embree3.bat
+        ci/embree.bat
     - name: Build wheels
       run: |
         python -m cibuildwheel --output-dir wheelhouse

ci/embree3.bash → ci/embree.bash

@@ -1,7 +1,13 @@
 #!/bin/bash
 set -xe
 
-VERSION="3.13.3"
+
+# if embree4 exits exit early
+if [ -d "/root/embree4" ]; then
+   exit 0;
+fi
+
+VERSION="4.1.0"
 
 rm -rf /tmp/embree.tar.gz
 rm -rf ~/embree
@@ -11,6 +17,6 @@ cd /tmp
 tar -zxvf embree.tar.gz
 rm -f embree.tar.gz
 
-mv embree-${VERSION}.x86_64.linux ~/embree
+mv embree-${VERSION}.x86_64.linux ~/embree4
 
 

ci/embree.bat

@@ -0,0 +1,6 @@
+mkdir embree4
+cd embree4
+
+curl -L -o embree.zip https://github.com/embree/embree/releases/download/v4.1.0/embree-4.1.0.x64.windows.zip
+
+7z x embree.zip