Merge branch 'master' into master

Author: mikedh

.github/workflows/wheels.yml

@@ -13,9 +13,11 @@ jobs:
       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_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}"
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-python@v1
@@ -25,6 +27,10 @@ jobs:
     - name: Install cibuildwheel
       run: |
         python -m pip install cibuildwheel==2.3.1
+    - name: Install Embree On Windows
+      if: matrix.os == 'windows-latest'
+      run: |
+        ci/embree3.bat
     - name: Build wheels
       run: |
         python -m cibuildwheel --output-dir wheelhouse
@@ -34,10 +40,8 @@ jobs:
         path: ./wheelhouse
     - name: Upload To PyPi
       env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      # TODO : remove `if false` statement after secrets are set in Github UI
-      if: false
+        TWINE_USERNAME: __token__
+        TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
       run: |
         pip install twine
         twine upload ./wheelhouse/*

.travis.yml

@@ -0,0 +1,3 @@
+curl -L -o embree.zip https://github.com/embree/embree/releases/download/v3.13.3/embree-3.13.3.x64.vc14.windows.zip
+7z x embree.zip
+move embree-3.13.3.x64.vc14.windows embree3

ci/embree3.bat

@@ -9,6 +9,8 @@ from enum import Enum
 from libc.stdio cimport printf
 from libc.stdlib cimport free
 
+__version__ = '0.0.3'
+
 # In this section, we define an aligned memory allocation function,
 # "aligned_alloc". This should be used throughout this .pyx file to
 # ensure that memory allocated for use by Embree is 16-byte
@@ -20,13 +22,21 @@ from libc.stdlib cimport free
 IF UNAME_SYSNAME == "Windows":
     cdef extern from "<malloc.h>":
         cdef void *_aligned_malloc(size_t size, size_t alignment)
+        cdef void _aligned_free(void *memblock)
     cdef void *aligned_alloc(size_t size, size_t alignment):
         return _aligned_malloc(size, alignment)
+    # memory obtained from _aligned_malloc()
+    # must be freed with _aligned_free()
+    # while posix_memalign() just uses regular free()
+    cdef void aligned_free(void *memblock):
+        _aligned_free(memblock)
 ELIF UNAME_SYSNAME == "Darwin":
     # malloc is 16-byte mem aligned by default on Darwin
     from libc.stdlib cimport malloc
     cdef void *aligned_alloc(size_t size, size_t alignment):
         return malloc(size)
+    cdef void aligned_free(void *memblock):
+        free(memblock)
 ELSE:
     from posix.stdlib cimport posix_memalign
     cdef void *aligned_alloc(size_t size, size_t alignment):
@@ -41,6 +51,8 @@ ELSE:
         elif code != 0:
             raise Exception('posix_memalign: unknown error code')
         return ptr
+    cdef void aligned_free(void *memblock):
+        free(memblock)
 
 DEF RTC_MAX_INSTANCE_LEVEL_COUNT = 1
 
@@ -793,7 +805,7 @@ cdef class Ray1M:
         self._M = M
 
     def __dealloc__(self):
-        free(self._ray)
+        aligned_free(self._ray)
 
     @property
     def size(self):
@@ -863,7 +875,7 @@ cdef class RayHit1M:
         self._M = M
 
     def __dealloc__(self):
-        free(self._rayhit)
+        aligned_free(self._rayhit)
 
     @property
     def size(self):
@@ -984,27 +996,27 @@ cdef class RayHitNp:
             hit.instID[i] = <unsigned *>aligned_alloc(N*sizeof(unsigned), 0x10)
 
     def __dealloc__(self):
-        free(self._rayhit.ray.org_x)
-        free(self._rayhit.ray.org_y)
-        free(self._rayhit.ray.org_z)
-        free(self._rayhit.ray.tnear)
-        free(self._rayhit.ray.dir_x)
-        free(self._rayhit.ray.dir_y)
-        free(self._rayhit.ray.dir_z)
-        free(self._rayhit.ray.time)
-        free(self._rayhit.ray.tfar)
-        free(self._rayhit.ray.mask)
-        free(self._rayhit.ray.id)
-        free(self._rayhit.ray.flags)
-        free(self._rayhit.hit.Ng_x)
-        free(self._rayhit.hit.Ng_y)
-        free(self._rayhit.hit.Ng_z)
-        free(self._rayhit.hit.u)
-        free(self._rayhit.hit.v)
-        free(self._rayhit.hit.primID)
-        free(self._rayhit.hit.geomID)
+        aligned_free(self._rayhit.ray.org_x)
+        aligned_free(self._rayhit.ray.org_y)
+        aligned_free(self._rayhit.ray.org_z)
+        aligned_free(self._rayhit.ray.tnear)
+        aligned_free(self._rayhit.ray.dir_x)
+        aligned_free(self._rayhit.ray.dir_y)
+        aligned_free(self._rayhit.ray.dir_z)
+        aligned_free(self._rayhit.ray.time)
+        aligned_free(self._rayhit.ray.tfar)
+        aligned_free(self._rayhit.ray.mask)
+        aligned_free(self._rayhit.ray.id)
+        aligned_free(self._rayhit.ray.flags)
+        aligned_free(self._rayhit.hit.Ng_x)
+        aligned_free(self._rayhit.hit.Ng_y)
+        aligned_free(self._rayhit.hit.Ng_z)
+        aligned_free(self._rayhit.hit.u)
+        aligned_free(self._rayhit.hit.v)
+        aligned_free(self._rayhit.hit.primID)
+        aligned_free(self._rayhit.hit.geomID)
         for i in range(RTC_MAX_INSTANCE_LEVEL_COUNT):
-            free(self._rayhit.hit.instID[i])
+            aligned_free(self._rayhit.hit.instID[i])
 
     @property
     def size(self):

embree.pyx

@@ -1,25 +1,51 @@
-
 import os
 
 from setuptools import find_packages, setup
 from setuptools.extension import Extension
-
 from Cython.Build import cythonize
 
+# the current working directory
+cwd = os.path.abspath(os.path.expanduser(
+    os.path.dirname(__file__)))
+
+include = ['/opt/local/include',
+           os.path.expanduser('~/embree/include')]
+library = ['/opt/local/lib',
+           os.path.expanduser('~/embree/lib')]
+
+if os.name == 'nt':
+    include = [
+        'c:/Program Files/Intel/Embree3/include',
+        os.path.join(cwd, 'embree3', 'include')]
+    library = [
+        'c:/Program Files/Intel/Embree3/lib',
+        os.path.join(cwd, 'embree3', 'lib')]
+
 extensions = [
     Extension(
         'embree',
         ['embree.pyx'],
         libraries=['embree3'],
-        include_dirs=['/opt/local/include',
-                      os.path.expanduser('~/embree/include')],
-        library_dirs=['/opt/local/lib',
-                      os.path.expanduser('~/embree/lib')]
+        include_dirs=include,
+        library_dirs=library
     )
 ]
 
+with open(os.path.join(cwd, 'README.md'), 'r') as f:
+    long_description = f.read()
+with open(os.path.join(cwd, 'embree.pyx'), 'r') as f:
+    # use eval to get a clean string of version from file
+    __version__ = eval(
+        next(line for line in f if
+             line.startswith('__version__')).split('=')[-1])
+
 setup(
     name='embree',
+    version=__version__,
+    description='Ray queries on triangular meshes.',
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    install_requires=['numpy'],
     packages=find_packages(),
     ext_modules=cythonize(extensions),
     zip_safe=False