Jelajahi Sumber

Some minor update

jcsyshc 1 tahun lalu
induk
melakukan
f2c20e8dcf

+ 3 - 2
CMakeLists.txt

@@ -142,7 +142,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE GLM_ENABLE_EXPERIMENTAL)
 if (WIN32)
     set(IMGUI_DIR C:/BuildEssentials/Library/imgui-1.89.5)
 else ()
-    set(IMGUI_DIR /home/tpx/src/imgui-1.90)
+    set(IMGUI_DIR /home/tpx/src/imgui-1.90.9)
 endif ()
 set(IMGUI_BACKENDS_DIR ${IMGUI_DIR}/backends)
 target_include_directories(${PROJECT_NAME} PRIVATE ${IMGUI_DIR} ${IMGUI_BACKENDS_DIR})
@@ -255,6 +255,7 @@ target_link_libraries(${PROJECT_NAME} ${CRYPTOPP_LIB})
 # xxHash config
 pkg_search_module(XXHASH REQUIRED libxxhash)
 target_include_directories(${PROJECT_NAME} PRIVATE ${XXHASH_INCLUDE_DIRS})
+target_link_directories(${PROJECT_NAME} PRIVATE /home/tpx/usr/lib)
 target_link_libraries(${PROJECT_NAME} ${XXHASH_LIBRARIES})
 
 # NvEnc config
@@ -263,7 +264,7 @@ if (WIN32)
     set(NVENC_LIB_DIR ${NVCODEC_DIR}/Lib/x64)
     find_library(NVENC_LIB nvencodeapi HINTS ${NVENC_LIB_DIR})
 else ()
-    set(NVCODEC_DIR /home/tpx/src/Video_Codec_SDK_12.0.16)
+    set(NVCODEC_DIR /home/tpx/src/Video_Codec_SDK_12.2.72)
     find_library(NVENC_LIB nvidia-encode)
 endif ()
 set(NVCODEC_INCLUDE_DIR ${NVCODEC_DIR}/Interface)

+ 1 - 1
data/config_endo_guide_oldhead.yaml

@@ -29,7 +29,7 @@ augment_list:
 #    transform_var: head_in_tracker_denoised
 #    model: /home/tpx/data/OldHead/model2.stl
 
-probe_model: /home/tpx/project/RemoteAR3/data/models/Probe.stl
+probe_model: /home/tpx/data/Probe.stl
 
 registration_list:
   - name: Head

+ 1 - 1
data/sophiar_config_endo_guide_oldhead.json

@@ -222,7 +222,7 @@
       "type": "ndi_interface",
       "name": "ndi",
       "init_config": {
-        "address_type": "ethernet",
+        "address_type": "serial",
         "ip": "10.0.0.5",
         "tcp_port": 8765,
         "com_port": "/dev/ttyUSB0",

+ 1 - 0
src/core/meta_helper.hpp

@@ -5,6 +5,7 @@
 #include <boost/container/flat_map.hpp>
 #include <boost/container/static_vector.hpp>
 
+#include <memory>
 #include <optional>
 #include <unordered_map>
 

+ 1 - 1
src/image_process/cuda_impl/CMakeLists.txt

@@ -14,7 +14,7 @@ add_library(${PROJECT_NAME}
 find_package(CUDAToolkit REQUIRED)
 target_link_directories(${PROJECT_NAME} PRIVATE /usr/local/cuda/lib64)
 target_link_libraries(${PROJECT_NAME} CUDA::cudart CUDA::cuda_driver)
-set_target_properties(${PROJECT_NAME} PROPERTIES CUDA_ARCHITECTURES "75;86")
+set_target_properties(${PROJECT_NAME} PROPERTIES CUDA_ARCHITECTURES "61;75;86")
 
 # glm config
 find_package(glm REQUIRED)

+ 1 - 1
src/image_process/impl/camera_calibrator.cpp

@@ -313,7 +313,7 @@ namespace camera_calibrator_impl {
     hand_eye_calib::camera_calib_ransac() {
         static constexpr auto max_iter = 32; // TODO: make configurable
         static constexpr auto calib_img_num = 10;
-        static constexpr auto accept_threshold = 0.4f; // pix
+        static constexpr auto accept_threshold = 1.0f; // pix
         static constexpr auto valid_ratio = 0.8f; // percentage
 
         auto rd = std::random_device();

+ 1 - 1
src/image_process_v3/cuda_impl/CMakeLists.txt

@@ -11,7 +11,7 @@ add_library(${PROJECT_NAME}
 find_package(CUDAToolkit REQUIRED)
 target_link_directories(${PROJECT_NAME} PRIVATE /usr/local/cuda/lib64)
 target_link_libraries(${PROJECT_NAME} CUDA::cudart CUDA::cuda_driver)
-set_target_properties(${PROJECT_NAME} PROPERTIES CUDA_ARCHITECTURES "75;86")
+set_target_properties(${PROJECT_NAME} PROPERTIES CUDA_ARCHITECTURES "61;75;86")
 
 # spdlog config
 find_package(spdlog REQUIRED)

+ 5 - 5
src/impl/apps/endo_guide/endo_guide.cpp

@@ -154,11 +154,11 @@ app_endo_guide::app_endo_guide(const create_config &_conf) {
         post(*main_conf.asio_ctx, [=, this] { stereo_aug->resize(size); });
     });
 
-    auto sim_info = camera_calibrator::simulate_info_type{
-            .data_path = "/home/tpx/project/DepthGuide/cmake-build-debug/calib_data.txt",
-            .img_size = cv::Size(1920, 1080),
-    };
-    cam_calib->simulate_process(sim_info);
+    // auto sim_info = camera_calibrator::simulate_info_type{
+    //         .data_path = "/home/tpx/project/DepthGuide/cmake-build-debug/calib_data.txt",
+    //         .img_size = cv::Size(1920, 1080),
+    // };
+    // cam_calib->simulate_process(sim_info);
 
     auto reg_conf = registration_config{
             .conn = sophiar_conn.get(),

+ 1 - 0
src/network_v3/receiver_base.hpp

@@ -7,6 +7,7 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 
+#include <fstream>
 #include <functional>
 
 enum receiver_type {