Merge branch 'Iainmon:main' into main

Author: BrandynTucknott

bridge/include/bridge.h

@@ -40,6 +40,8 @@ bridge_tensor_t resize(bridge_tensor_t input,int height,int width);
 bridge_tensor_t imagenet_normalize(bridge_tensor_t input);
 
 
+bridge_tensor_t add_two_arrays(bridge_tensor_t a, bridge_tensor_t b);
+
 // bridge_tensor_t capture_webcam_bridge(int cam_index);
 
 int baz(void);
@@ -102,6 +104,11 @@ proto_bridge_simple(softsign);
 
 proto_bridge_simple(tanhshrink);
 
+void split_loop(int64_t idx, int64_t n);
+void split_loop_filler(int64_t n,int64_t* ret);
+
+void show_webcam(void);
+
 
 // bridge_tensor_t conv2d(
 //     bridge_tensor_t input,

bridge/include/bridge.h.pch

@@ -13,6 +13,11 @@
 #include <cstdlib>
 #include <vector>
 #include <cstdint>
+#include <chrono>
+#include <thread>
+
+#include <opencv2/opencv.hpp>
+
 
 #define def_bridge_simple(Name) \
     extern "C" bridge_tensor_t Name(bridge_tensor_t input) { \
@@ -264,6 +269,16 @@ extern "C" bridge_tensor_t imagenet_normalize(bridge_tensor_t input) {
     return torch_to_bridge(output);
 }
 
+
+extern "C" bridge_tensor_t add_two_arrays(bridge_tensor_t a, bridge_tensor_t b) {
+    torch::Tensor t_a = bridge_to_torch(a);
+    torch::Tensor t_b = bridge_to_torch(b);
+
+    torch::Tensor output = t_a + t_b;
+
+    return torch_to_bridge(output);
+}
+
 // extern "C" bridge_tensor_t capture_webcam_bridge(int cam_index) {
 //     torch::Tensor image = capture_webcam(cam_index);
 //     return torch_to_bridge(image);
@@ -371,3 +386,55 @@ extern "C" float sumArray(float* arr, int* sizes, int dim) {
     // auto t = torch::from_blob(arr, shape, torch::kFloat);
     // return t.sum().item<float>();
 }
+
+
+extern "C" void split_loop(int64_t idx, int64_t n) {
+    for (int i = 0; i < n; ++i) {
+        std::cout << "idx(" << idx << "," << n << ") = " << i << std::endl;
+        std::cout.flush();
+    }
+}
+
+extern "C" void split_loop_filler(int64_t n,int64_t* ret) {
+    for (int i = 0; i < n; ++i) {
+        *ret = i;
+        std::this_thread::sleep_for(std::chrono::seconds(0));
+    }
+}
+
+
+
+cv::VideoCapture open_camera(int cam_index) {
+    cv::VideoCapture cap(cam_index, cv::CAP_AVFOUNDATION);
+    if (!cap.isOpened()) {
+        std::cerr << "Could not open camera index " << cam_index << std::endl;
+        return cv::VideoCapture();
+    }
+    cap.set(cv::CAP_PROP_BUFFERSIZE, 1); // minimal internal buffering
+    cap.set(cv::CAP_PROP_FPS, 60);       // request higher FPS if possible
+    return cap;
+}
+
+
+extern "C" void show_webcam(void) {
+    cv::VideoCapture cap;
+    cap = open_camera(0);
+
+    cv::Mat frame_bgr;
+
+    while (true) {
+        if (!cap.read(frame_bgr) || frame_bgr.empty()) {
+            std::cerr << "[WARN] Empty frame, exiting" << std::endl;
+            break;
+        }
+
+        cv::imshow("webcam", frame_bgr);
+
+        if (cv::waitKey(1) == 27) { // ESC key
+            break;
+        }
+    }
+
+    cap.release();
+    cv::destroyAllWindows();
+}

bridge/lib/bridge.cpp

@@ -1,4 +1,4 @@
-# add_subdirectory(video)
+add_subdirectory(video)
 
 # add_subdirectory(webcam_filter)
 

demos/CMakeLists.txt

@@ -9,22 +9,19 @@ find_library(METAL Metal REQUIRED)
 find_library(FOUNDATION Foundation REQUIRED)
 
 
+
 add_executable(VidStreamer
-    ${CMAKE_CURRENT_SOURCE_DIR}/webcam_infer.cpp
-    # ${CMAKE_CURRENT_SOURCE_DIR}/cvutil.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/imageops.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/webcam-capture/webcam_infer.cpp
 )
 
 target_include_directories(VidStreamer
     PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
         ${LIBTORCH_DIR}/include
         ${LIBTORCH_DIR}/include/torch/csrc/api/include
 )
 
-target_link_directories(VidStreamer
-    PRIVATE
-        ${LIBTORCH_DIR}/lib
-)
+target_link_directories(VidStreamer PRIVATE ${LIBTORCH_DIR}/lib)
 
 target_link_libraries(VidStreamer
     PRIVATE 
@@ -37,17 +34,64 @@ target_link_libraries(VidStreamer
         ${ACCELERATE}
         ${METAL}
         ${FOUNDATION}
-        BridgeUtil
 )
 
 set_target_properties(VidStreamer PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
-
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   target_compile_options(VidStreamer PRIVATE -Ofast -flto -ffast-math)
   target_link_options(VidStreamer PRIVATE -flto)
 endif()
 
 
+
+
+
+
+
+add_executable(StyleTransfer
+    ${CMAKE_CURRENT_SOURCE_DIR}/style-transfer/style_transfer.cpp
+)
+
+target_include_directories(StyleTransfer
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${LIBTORCH_DIR}/include
+        ${LIBTORCH_DIR}/include/torch/csrc/api/include
+)
+
+target_link_directories(StyleTransfer PRIVATE ${LIBTORCH_DIR}/lib)
+
+target_link_libraries(StyleTransfer
+    PRIVATE 
+        -ltorch
+        -ltorch_cpu
+        -lc10
+        -ltorch_global_deps
+        ${OpenCV_LIBS}
+        # ${TORCH_LIBRARIES}
+        ${ACCELERATE}
+        ${METAL}
+        ${FOUNDATION}
+)
+
+set_target_properties(StyleTransfer PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+)
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  target_compile_options(StyleTransfer PRIVATE -Ofast -flto -ffast-math)
+  target_link_options(StyleTransfer PRIVATE -flto)
+endif()
+
+
+add_custom_command(
+    TARGET StyleTransfer
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${CMAKE_CURRENT_SOURCE_DIR}/style-transfer/models"
+            "$<TARGET_FILE_DIR:StyleTransfer>/style-transfer/models"
+    COMMENT "NOT! Copying ${PROJECT_ROOT_DIR}/examples/vgg/images to $<TARGET_FILE_DIR:vgg>/images"
+)