init mac support

fixstars · Dec 19, 2023 · 0f1ad40 · 0f1ad40
1 parent 3fa5b10
commit 0f1ad40
Show file tree

Hide file tree

Showing 22 changed files with 97 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 /build*
 __pycache__
+.DS_Store
+.vscode
diff --git a/cmake/IonUtil.cmake b/cmake/IonUtil.cmake
@@ -48,14 +48,25 @@ function(ion_run NAME COMPILE_NAME)
         COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTPUT_PATH}
     )
     if (UNIX)
-        add_custom_command(OUTPUT ${HEADER} ${STATIC_LIB}
+        if(APPLE)
+            add_custom_command(OUTPUT ${HEADER} ${STATIC_LIB}
+            COMMAND ${CMAKE_SOURCE_DIR}/script/invoke.sh $<TARGET_FILE:${COMPILE_NAME}>
+                HL_TARGET ${IER_TARGET_STRING}
+                DYLD_LIBRARY_PATH ${Halide_DIR}/../../../bin
+                DYLD_LIBRARY_PATH ${CMAKE_BINARY_DIR}
+                DYLD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/src/bb
+            DEPENDS ${COMPILE_NAME} ${OUTPUT_PATH}
+            WORKING_DIRECTORY ${OUTPUT_PATH})
+        else()
+            add_custom_command(OUTPUT ${HEADER} ${STATIC_LIB}
             COMMAND ${CMAKE_SOURCE_DIR}/script/invoke.sh $<TARGET_FILE:${COMPILE_NAME}>
                 HL_TARGET ${IER_TARGET_STRING}
                 LD_LIBRARY_PATH ${Halide_DIR}/../../../bin
                 LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}
                 LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/src/bb
             DEPENDS ${COMPILE_NAME} ${OUTPUT_PATH}
             WORKING_DIRECTORY ${OUTPUT_PATH})
+        endif()
     else()
         add_custom_command(OUTPUT ${HEADER} ${STATIC_LIB}
             COMMAND ${CMAKE_SOURCE_DIR}/script/invoke.bat $<TARGET_FILE:${COMPILE_NAME}>
@@ -110,7 +121,11 @@ function(ion_register_test TEST_NAME EXEC_NAME)
     cmake_parse_arguments(IERT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     if (UNIX)
-        set(IERT_RUNTIME_ENVS "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/bb:${CMAKE_BINARY_DIR}/test")
+        if(APPLE)
+            set(IERT_RUNTIME_ENVS "DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/bb:${CMAKE_BINARY_DIR}/test")
+        else()
+            set(IERT_RUNTIME_ENVS "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/bb:${CMAKE_BINARY_DIR}/test")
+        endif()
     else()
         set(IERT_RUNTIME_ENVS "PATH=${CMAKE_BINARY_DIR}/src/bb/$<$<CONFIG:Release>:Release>$<$<CONFIG:Debug>:Debug>\\\;${CMAKE_BINARY_DIR}/test/$<$<CONFIG:Release>:Release>$<$<CONFIG:Debug>:Debug>")
     endif()

diff --git a/example/u3v_camera1_opencv/u3v_camera1_opencv.cc b/example/u3v_camera1_opencv/u3v_camera1_opencv.cc
@@ -24,6 +24,8 @@ double exposure = 400;
 
 #ifdef _WIN32
     #define MODULE_NAME "ion-bb.dll"
+#elif __APPLE__
+    #define MODULE_NAME "libion-bb.dylib"
 #else
     #define MODULE_NAME "libion-bb.so"
 #endif

diff --git a/example/u3v_camera1_opencv/u3v_camera1_opencv.py b/example/u3v_camera1_opencv/u3v_camera1_opencv.py
@@ -2,15 +2,17 @@
 import numpy as np
 import cv2
 
-import os
+from sys import platform
 
 feature_gain_key = 'Gain'
 feature_exposure_key = 'ExposureTime'
 num_bit_shift = 0
 
-if os.name == 'nt':
+if platform == "win32":
     module_name = 'ion-bb.dll'
-elif os.name == 'posix':
+elif platform == "darwin":
+    module_name = 'libion-bb.dylib'
+else:
     module_name = 'libion-bb.so'
 
 if __name__ == "__main__":

diff --git a/example/u3v_camera2_opencv/u3v_camera2_opencv.cc b/example/u3v_camera2_opencv/u3v_camera2_opencv.cc
@@ -24,6 +24,8 @@ double exposure = 400;
 
 #ifdef _WIN32
     #define MODULE_NAME "ion-bb.dll"
+#elif __APPLE__
+    #define MODULE_NAME "libion-bb.dylib"
 #else
     #define MODULE_NAME "libion-bb.so"
 #endif

diff --git a/example/u3v_camera2_opencv/u3v_camera2_opencv.py b/example/u3v_camera2_opencv/u3v_camera2_opencv.py
@@ -2,15 +2,17 @@
 import numpy as np
 import cv2
 
-import os
+from sys import platform
 
 feature_gain_key = 'Gain'
 feature_exposure_key = 'ExposureTime'
 num_bit_shift = 0
 
-if os.name == 'nt':
+if platform == "win32":
     module_name = 'ion-bb.dll'
-elif os.name == 'posix':
+elif platform == "darwin":
+    module_name = 'libion-bb.dylib'
+else:
     module_name = 'libion-bb.so'
 
 if __name__ == "__main__":

diff --git a/src/bb/base/httplib.h b/src/bb/base/httplib.h
@@ -1858,7 +1858,7 @@ socket_t create_socket(const char *host, int port, int socket_flags,
 #endif
     if (sock == INVALID_SOCKET) { continue; }
 
-#ifndef _WIN32
+#ifdef __unix__
     if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) { continue; }
 #endif
 
@@ -3772,7 +3772,7 @@ inline Server::Server()
     : new_task_queue(
           [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }),
       svr_sock_(INVALID_SOCKET), is_running_(false) {
-#ifndef _WIN32
+#ifdef __unix__
   signal(SIGPIPE, SIG_IGN);
 #endif
 }
@@ -4353,7 +4353,7 @@ inline bool Server::listen_internal() {
     std::unique_ptr<TaskQueue> task_queue(new_task_queue());
 
     while (svr_sock_ != INVALID_SOCKET) {
-#ifndef _WIN32
+#ifdef __unix__
       if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) {
 #endif
         auto val = detail::select_read(svr_sock_, idle_interval_sec_,
@@ -4362,7 +4362,7 @@ inline bool Server::listen_internal() {
           task_queue->on_idle();
           continue;
         }
-#ifndef _WIN32
+#ifdef __unix__
       }
 #endif
       socket_t sock = accept(svr_sock_, nullptr, nullptr);

diff --git a/src/bb/dnn/config.cmake b/src/bb/dnn/config.cmake
@@ -11,13 +11,22 @@ set(LINK_DIRS
     ${OpenCV_DIR}/lib)
 
 if (UNIX)
+if (APPLE)
+    set(LIBRARIES
+        dl
+        pthread
+        m
+        z
+        ${OpenCV_LIBRARIES})
+else()
     set(LIBRARIES
         rt
         dl
         pthread
         m
         z
         ${OpenCV_LIBRARIES})
+endif()
 else()
     set(LIBRARIES ${OpenCV_LIBRARIES})
 endif()
diff --git a/src/bb/dnn/httplib.h b/src/bb/dnn/httplib.h
@@ -1858,7 +1858,7 @@ socket_t create_socket(const char *host, int port, int socket_flags,
 #endif
     if (sock == INVALID_SOCKET) { continue; }
 
-#ifndef _WIN32
+#ifdef __unix__
     if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) { continue; }
 #endif
 
@@ -3772,7 +3772,7 @@ inline Server::Server()
     : new_task_queue(
           [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }),
       svr_sock_(INVALID_SOCKET), is_running_(false) {
-#ifndef _WIN32
+#ifdef __unix__
   signal(SIGPIPE, SIG_IGN);
 #endif
 }
@@ -4353,7 +4353,7 @@ inline bool Server::listen_internal() {
     std::unique_ptr<TaskQueue> task_queue(new_task_queue());
 
     while (svr_sock_ != INVALID_SOCKET) {
-#ifndef _WIN32
+#ifdef __unix__
       if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) {
 #endif
         auto val = detail::select_read(svr_sock_, idle_interval_sec_,
@@ -4362,7 +4362,7 @@ inline bool Server::listen_internal() {
           task_queue->on_idle();
           continue;
         }
-#ifndef _WIN32
+#ifdef __unix__
       }
 #endif
       socket_t sock = accept(svr_sock_, nullptr, nullptr);

diff --git a/src/bb/dnn/onnxruntime_c.h b/src/bb/dnn/onnxruntime_c.h
@@ -24,7 +24,7 @@ namespace dnn {
 #define ORT_API_VERSION 5
 
 // SAL2 Definitions
-#ifndef _WIN32
+#if defined(__unix__) || defined(__APPLE__)
 #define _In_
 #define _In_z_
 #define _In_opt_

diff --git a/src/bb/fpga/config.cmake b/src/bb/fpga/config.cmake
@@ -1,6 +1,12 @@
 if (UNIX)
+if (APPLE)
+    set(LIBRARIES
+        dl
+        pthread)
+else()
     set(LIBRARIES
         rt
         dl
         pthread)
 endif()
+endif()
diff --git a/src/bb/image-io/bb.h b/src/bb/image-io/bb.h
@@ -2,7 +2,7 @@
 #define ION_BB_IMAGE_IO_BB_H
 
 #include <ion/ion.h>
-#ifndef _WIN32
+#ifdef __unix__
 #include <linux/videodev2.h>
 #endif
 
@@ -60,7 +60,7 @@ const int BayerMap::bayer_map[4][4]{
     {1, 2, 0, 1}   // GBRG
 };
 
-#ifndef _WIN32
+#ifdef __unix__
 uint32_t make_pixel_format(BayerMap::Pattern bayer_pattern, int32_t bit_width)
 {
     uint32_t pix_format;
@@ -544,7 +544,7 @@ class GUIDisplay : public ion::BuildingBlock<GUIDisplay> {
     }
 };
 
-#ifndef _WIN32
+#ifdef __unix__
 class FBDisplay : public ion::BuildingBlock<FBDisplay> {
 public:
     GeneratorParam<std::string> gc_title{"gc_title", "FBDisplay"};
@@ -1195,7 +1195,7 @@ class BinaryLoader : public ion::BuildingBlock<BinaryLoader> {
 }  // namespace bb
 }  // namespace ion
 
-#ifndef _WIN32
+#ifdef __unix__
 ION_REGISTER_BUILDING_BLOCK(ion::bb::image_io::IMX219, image_io_imx219);
 ION_REGISTER_BUILDING_BLOCK(ion::bb::image_io::D435, image_io_d435);
 

diff --git a/src/bb/image-io/config.cmake b/src/bb/image-io/config.cmake
@@ -7,13 +7,22 @@ set(INCLUDE_DIRS
 set(LINK_DIRS
     ${OpenCV_DIR}/lib)
 
-set(LIBRARIES
-    rt
-    dl
-    pthread
-    m
-    z
-    ${OpenCV_LIBRARIES})
+if (APPLE)
+    set(LIBRARIES
+        dl
+        pthread
+        m
+        z
+        ${OpenCV_LIBRARIES})
+else()
+    set(LIBRARIES
+        rt
+        dl
+        pthread
+        m
+        z
+        ${OpenCV_LIBRARIES})
+endif()
 else()
     # NOTE: Tentatively OpenCV is not supported in Windows release
 endif()
diff --git a/src/bb/image-io/httplib.h b/src/bb/image-io/httplib.h
@@ -1858,7 +1858,7 @@ socket_t create_socket(const char *host, int port, int socket_flags,
 #endif
     if (sock == INVALID_SOCKET) { continue; }
 
-#ifndef _WIN32
+#ifdef __unix__
     if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) { continue; }
 #endif
 
@@ -3772,7 +3772,7 @@ inline Server::Server()
     : new_task_queue(
           [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }),
       svr_sock_(INVALID_SOCKET), is_running_(false) {
-#ifndef _WIN32
+#ifdef __unix__
   signal(SIGPIPE, SIG_IGN);
 #endif
 }
@@ -4353,7 +4353,7 @@ inline bool Server::listen_internal() {
     std::unique_ptr<TaskQueue> task_queue(new_task_queue());
 
     while (svr_sock_ != INVALID_SOCKET) {
-#ifndef _WIN32
+#ifdef __unix__
       if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) {
 #endif
         auto val = detail::select_read(svr_sock_, idle_interval_sec_,
@@ -4362,7 +4362,7 @@ inline bool Server::listen_internal() {
           task_queue->on_idle();
           continue;
         }
-#ifndef _WIN32
+#ifdef __unix__
       }
 #endif
       socket_t sock = accept(svr_sock_, nullptr, nullptr);

diff --git a/src/bb/image-io/rt.h b/src/bb/image-io/rt.h
@@ -30,7 +30,7 @@ class RegisterExtern {
 #include "rt_u3v.h"
 #include "rt_file.h"
 
-#ifndef _WIN32
+#ifdef __unix__
 #include "rt_display.h"
 #include "rt_realsense.h"
 #include "rt_v4l2.h"

diff --git a/src/bb/image-io/rt_common.h b/src/bb/image-io/rt_common.h
@@ -9,7 +9,7 @@
 #include <unordered_map>
 #include <vector>
 
-#ifndef _WIN32
+#ifdef __unix__
 #include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
 #endif
@@ -154,7 +154,7 @@ std::tuple<std::string, std::string> parse_url(const std::string &url) {
     return std::tuple<std::string, std::string>(host_name, path_name);
 }
 
-#ifndef _WIN32
+#ifdef __unix__
 cv::Mat get_image(const std::string &url) {
     if (url.empty()) {
         return {};

diff --git a/src/bb/image-io/rt_display.h b/src/bb/image-io/rt_display.h
@@ -3,7 +3,7 @@
 
 #include <stdexcept>
 
-#ifndef _WIN32
+#ifdef __unix__
 #include <fcntl.h>
 #include <linux/fb.h>
 #include <sys/ioctl.h>
@@ -17,7 +17,7 @@
 
 #include "rt_common.h"
 
-#ifndef _WIN32
+#ifdef __unix__
 namespace {
 
 class FBDev {

diff --git a/src/bb/image-io/rt_file.h b/src/bb/image-io/rt_file.h
@@ -17,12 +17,12 @@
 #include "rt_common.h"
 #include "httplib.h"
 
-#ifndef _WIN32
+#ifdef __unix__
 #include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
 #endif
 
-#ifndef _WIN32
+#ifdef __unix__
 extern "C" int ION_EXPORT ion_bb_image_io_color_data_loader(halide_buffer_t *session_id_buf, halide_buffer_t *url_buf, int32_t width, int32_t height, halide_buffer_t *out) {
 
     using namespace ion::bb::image_io;