Skip to content

setup and pyoctnet updated for windows installation #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

setup and pyoctnet updated for windows installation #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions py/pyoctnet.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# cython: language_level=3

cimport cython
import numpy as np
cimport numpy as np
cimport numpy as cnp
from numpy cimport PyArray_SetBaseObject

from libc.stdlib cimport free, malloc
from libcpp cimport bool
Expand All @@ -38,7 +41,7 @@ np.import_array()
"""
Lightweight wrapper class for native float arrays. Allows numpy style access.
"""
cdef class FloatArrayWrapper:
cdef class FloatArrayWrapper(object):
""" native float array that is encapsulated. """
cdef float* data_ptr
""" size/length of the float array. """
Expand Down Expand Up @@ -302,12 +305,12 @@ cdef class Octree:
cdef FloatArrayWrapper wrapper = FloatArrayWrapper()
wrapper.set_data(self.grid.data, self.grid.n_leafs * self.grid.feature_size, 0)
cdef np.ndarray array = np.array(wrapper, copy=False)
array.base = <PyObject*> wrapper
Py_INCREF(wrapper)
cdef np.ndarray[cnp.float32_t, ndim=1] c_array = array
PyArray_SetBaseObject(c_array, wrapper)

if grid_idx is not None and bit_idx is not None:
didx = self.data_idx(grid_idx, bit_idx)
array = array[didx : didx + self.feature_size()]
didx = self.data_idx(grid_idx, bit_idx)
array = array[didx : didx + self.feature_size()]
return array

"""
Expand Down
13 changes: 8 additions & 5 deletions py/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@
from Cython.Distutils import build_ext
import numpy as np
import platform
import sys

extra_compile_args = ['-msse', '-msse2', '-msse3', '-msse4.2']
extra_link_args = []
if 'Linux' in platform.system():
print('Added OpenMP')
extra_compile_args.append('-fopenmp')
extra_link_args.append('-fopenmp')

if sys.platform == 'win32':
# For MSVC, you can add appropriate flags or leave empty
extra_compile_args = ['/O2', '/openmp']
elif 'Linux' in platform.system():
print('Added OpenMP')
extra_compile_args = ['-fopenmp', '-msse', '-msse2', '-msse3', '-msse4.2']
extra_link_args = ['-fopenmp']
setup(
name="pyoctnet",
cmdclass= {'build_ext': build_ext},
Expand Down