From baa9fd935497ee1475c142ccfeb6fa088eff0e31 Mon Sep 17 00:00:00 2001 From: "Mads R. B. Kristensen" Date: Fri, 23 Nov 2018 11:15:34 +0100 Subject: [PATCH 1/2] removed openmp import from bincount_cython --- bridge/npbackend/bohrium/nobh/bincount_cython.pyx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bridge/npbackend/bohrium/nobh/bincount_cython.pyx b/bridge/npbackend/bohrium/nobh/bincount_cython.pyx index 3de83a29f..a3616bbe2 100644 --- a/bridge/npbackend/bohrium/nobh/bincount_cython.pyx +++ b/bridge/npbackend/bohrium/nobh/bincount_cython.pyx @@ -12,10 +12,6 @@ cimport numpy as cnp ctypedef cnp.uint64_t uint64 ctypedef cnp.int64_t int64 -IF UNAME_SYSNAME == "Linux": - cimport openmp - - @cython.boundscheck(False) # turn off bounds-checking @cython.cdivision(True) # turn off division-by-zero checking cdef _count(uint64[:] x, uint64[:] out): From 41776489528dbf9e7c885277c4c8992821952dea Mon Sep 17 00:00:00 2001 From: "Mads R. B. Kristensen" Date: Fri, 23 Nov 2018 13:17:20 +0100 Subject: [PATCH 2/2] cmake: setting CMAKE_INSTALL_NAME_DIR to install dir --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b662376dd..1f678ca36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,6 +122,9 @@ find_package(OpenCV 3) set_package_properties(OpenCV PROPERTIES DESCRIPTION "Open Source Computer Vision" URL "opencv.org") set_package_properties(OpenCV PROPERTIES TYPE RECOMMENDED PURPOSE "Enables the OpenCV extended method") +# We do not want MacOSX to set "@path" when installing because of the MacOSX wheel tool `delocate`. +# Instead, we set the installation path manually. +set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIBDIR}) ##################### # Bohrium components