From e6984f5eab647e8217d4609e688c42427f037f15 Mon Sep 17 00:00:00 2001 From: HailoRT-Automation <98901220+HailoRT-Automation@users.noreply.github.com> Date: Wed, 31 Jan 2024 18:22:00 +0200 Subject: [PATCH] v4.16.1 (#12) --- hailort/CMakeLists.txt | 2 +- hailort/libhailort/CMakeLists.txt | 2 +- .../bindings/gstreamer/CMakeLists.txt | 2 +- .../gstreamer/gst-hailo/gsthailonet2.cpp | 31 ++++++++++++++----- .../gstreamer/gst-hailo/gsthailonet2.hpp | 3 +- .../hailo_platform/pyhailort/pyhailort.py | 2 +- .../bindings/python/platform/setup.py | 2 +- .../bindings/python/src/CMakeLists.txt | 2 +- .../data_quantization_example/CMakeLists.txt | 2 +- .../c/infer_pipeline_example/CMakeLists.txt | 2 +- .../c/multi_device_example/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../power_measurement_example/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../c/raw_streams_example/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../c/vstreams_example/CMakeLists.txt | 2 +- .../cpp/async_infer_example/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../cpp/infer_pipeline_example/CMakeLists.txt | 2 +- .../cpp/multi_device_example/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../cpp/multi_process_example/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../power_measurement_example/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../cpp/raw_streams_example/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../cpp/vstreams_example/CMakeLists.txt | 2 +- hailort/libhailort/src/vdevice/vdevice.cpp | 7 +++-- .../src/vdevice/vdevice_internal.hpp | 1 + hailort/scripts/download_firmware_eth.cmd | 2 +- hailort/scripts/download_firmware_eth.sh | 2 +- hailort/scripts/download_hefs.cmd | 2 +- hailort/scripts/download_hefs.sh | 2 +- 39 files changed, 66 insertions(+), 46 deletions(-) diff --git a/hailort/CMakeLists.txt b/hailort/CMakeLists.txt index eb90050..2170e21 100644 --- a/hailort/CMakeLists.txt +++ b/hailort/CMakeLists.txt @@ -31,7 +31,7 @@ endif() # Set firmware version add_definitions( -DFIRMWARE_VERSION_MAJOR=4 ) add_definitions( -DFIRMWARE_VERSION_MINOR=16 ) -add_definitions( -DFIRMWARE_VERSION_REVISION=0 ) +add_definitions( -DFIRMWARE_VERSION_REVISION=1 ) if(HAILO_BUILD_SERVICE) add_definitions( -DHAILO_SUPPORT_MULTI_PROCESS ) endif() diff --git a/hailort/libhailort/CMakeLists.txt b/hailort/libhailort/CMakeLists.txt index d40ec84..20402c4 100644 --- a/hailort/libhailort/CMakeLists.txt +++ b/hailort/libhailort/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(HAILORT_MAJOR_VERSION 4) set(HAILORT_MINOR_VERSION 16) -set(HAILORT_REVISION_VERSION 0) +set(HAILORT_REVISION_VERSION 1) # Add the cmake folder so the modules there are found set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) diff --git a/hailort/libhailort/bindings/gstreamer/CMakeLists.txt b/hailort/libhailort/bindings/gstreamer/CMakeLists.txt index 6a278f2..ba871c3 100644 --- a/hailort/libhailort/bindings/gstreamer/CMakeLists.txt +++ b/hailort/libhailort/bindings/gstreamer/CMakeLists.txt @@ -8,7 +8,7 @@ if(NOT CMAKE_HOST_UNIX) message(FATAL_ERROR "Only unix hosts are supported, stopping build") endif() -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) # GST_PLUGIN_DEFINE needs PACKAGE to be defined set(GST_HAILO_PACKAGE_NAME "hailo") diff --git a/hailort/libhailort/bindings/gstreamer/gst-hailo/gsthailonet2.cpp b/hailort/libhailort/bindings/gstreamer/gst-hailo/gsthailonet2.cpp index 4eae2b0..3545fc1 100644 --- a/hailort/libhailort/bindings/gstreamer/gst-hailo/gsthailonet2.cpp +++ b/hailort/libhailort/bindings/gstreamer/gst-hailo/gsthailonet2.cpp @@ -50,6 +50,7 @@ enum PROP_NMS_IOU_THRESHOLD, PROP_NMS_MAX_PROPOSALS_PER_CLASS, PROP_INPUT_FROM_META, + PROP_NO_TRANSFORM, PROP_MULTI_PROCESS_SERVICE, // Deprecated @@ -269,20 +270,22 @@ static hailo_status gst_hailonet2_configure(GstHailoNet2 *self) // In RGB formats, Gstreamer is padding each row to 4. for (const auto &input_name : self->infer_model->get_input_names()) { - // TODO (HRT-12492): change transformations to be togglable - if (self->props.m_input_from_meta.get()) { - // do not apply transformations when taking input from meta - self->infer_model->input(input_name)->set_format_order(HAILO_FORMAT_ORDER_NHCW); + if(self->props.m_no_transform.get()) { + // In case transformation is disabled - format order will be the same as we get from the HW (stream info). + auto input_stream_infos = self->infer_model->hef().get_stream_info_by_name(input_name, HAILO_H2D_STREAM); + CHECK_EXPECTED_AS_STATUS(input_stream_infos); + self->infer_model->input(input_name)->set_format_order(input_stream_infos.value().format.order); } else if (self->infer_model->input(input_name)->format().order == HAILO_FORMAT_ORDER_NHWC) { self->infer_model->input(input_name)->set_format_order(HAILO_FORMAT_ORDER_RGB4); } } - if (self->props.m_input_from_meta.get()) { + if (self->props.m_no_transform.get()) { for (const auto &output_name : self->infer_model->get_output_names()) { - // TODO (HRT-12492): change transformations to be togglable - // do not apply transformations when taking output to meta - self->infer_model->output(output_name)->set_format_order(HAILO_FORMAT_ORDER_NHCW); + // In case transformation is disabled - format order will be the same as we get from the HW (stream info). + auto output_stream_infos = self->infer_model->hef().get_stream_info_by_name(output_name, HAILO_D2H_STREAM); + CHECK_EXPECTED_AS_STATUS(output_stream_infos); + self->infer_model->output(output_name)->set_format_order(output_stream_infos.value().format.order); } } @@ -567,6 +570,12 @@ static void gst_hailonet2_set_property(GObject *object, guint property_id, const } self->props.m_input_from_meta = g_value_get_boolean(value); break; + case PROP_NO_TRANSFORM: + if (self->is_configured) { + g_warning("The network was already configured so disabling the transformation will not take place!"); + } + self->props.m_no_transform = g_value_get_boolean(value); + break; case PROP_MULTI_PROCESS_SERVICE: if (self->is_configured) { g_warning("The network was already configured so changing the multi-process-service property will not take place!"); @@ -647,6 +656,9 @@ static void gst_hailonet2_get_property(GObject *object, guint property_id, GValu case PROP_INPUT_FROM_META: g_value_set_boolean(value, self->props.m_input_from_meta.get()); break; + case PROP_NO_TRANSFORM: + g_value_set_boolean(value, self->props.m_no_transform.get()); + break; case PROP_MULTI_PROCESS_SERVICE: g_value_set_boolean(value, self->props.m_multi_process_service.get()); break; @@ -746,6 +758,9 @@ static void gst_hailonet2_class_init(GstHailoNet2Class *klass) g_object_class_install_property(gobject_class, PROP_INPUT_FROM_META, g_param_spec_boolean("input-from-meta", "Enable input from meta", "Take network input from metadata instead of video frame.", false, (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); + g_object_class_install_property(gobject_class, PROP_NO_TRANSFORM, + g_param_spec_boolean("no-transform", "Disable transformations", "Format will remain the same as the HW format.", false, + (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); g_object_class_install_property(gobject_class, PROP_NMS_SCORE_THRESHOLD, g_param_spec_float("nms-score-threshold", "NMS score threshold", "Threshold used for filtering out candidates. Any box with score m_nms_iou_threshold; HailoElemProperty m_nms_max_proposals_per_class; HailoElemProperty m_input_from_meta; + HailoElemProperty m_no_transform; HailoElemProperty m_multi_process_service; // Deprecated diff --git a/hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/pyhailort.py b/hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/pyhailort.py index bbd7682..196f9f4 100644 --- a/hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/pyhailort.py +++ b/hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/pyhailort.py @@ -1488,7 +1488,7 @@ class HailoFormatFlags(_pyhailort.FormatFlags): SUPPORTED_PROTOCOL_VERSION = 2 SUPPORTED_FW_MAJOR = 4 SUPPORTED_FW_MINOR = 16 -SUPPORTED_FW_REVISION = 0 +SUPPORTED_FW_REVISION = 1 MEGA_MULTIPLIER = 1000.0 * 1000.0 diff --git a/hailort/libhailort/bindings/python/platform/setup.py b/hailort/libhailort/bindings/python/platform/setup.py index 52fa311..4132ad2 100644 --- a/hailort/libhailort/bindings/python/platform/setup.py +++ b/hailort/libhailort/bindings/python/platform/setup.py @@ -69,6 +69,6 @@ if __name__ == "__main__": "linux_aarch64", ], url="https://hailo.ai/", - version="4.16.0", + version="4.16.1", zip_safe=False, ) diff --git a/hailort/libhailort/bindings/python/src/CMakeLists.txt b/hailort/libhailort/bindings/python/src/CMakeLists.txt index bef9d2a..836c118 100644 --- a/hailort/libhailort/bindings/python/src/CMakeLists.txt +++ b/hailort/libhailort/bindings/python/src/CMakeLists.txt @@ -49,7 +49,7 @@ set_target_properties(_pyhailort PROPERTIES # VISIBILITY_INLINES_HIDDEN YES ) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) target_link_libraries(_pyhailort PRIVATE HailoRT::libhailort) if(WIN32) diff --git a/hailort/libhailort/examples/c/data_quantization_example/CMakeLists.txt b/hailort/libhailort/examples/c/data_quantization_example/CMakeLists.txt index 74737e1..3d3be16 100644 --- a/hailort/libhailort/examples/c/data_quantization_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/data_quantization_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(data_quantization_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/c/infer_pipeline_example/CMakeLists.txt b/hailort/libhailort/examples/c/infer_pipeline_example/CMakeLists.txt index 5fdc57a..04b389e 100644 --- a/hailort/libhailort/examples/c/infer_pipeline_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/infer_pipeline_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(infer_pipeline_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/c/multi_device_example/CMakeLists.txt b/hailort/libhailort/examples/c/multi_device_example/CMakeLists.txt index cf51c4c..1d92d10 100644 --- a/hailort/libhailort/examples/c/multi_device_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/multi_device_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(multi_device_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/c/multi_network_vstream_example/CMakeLists.txt b/hailort/libhailort/examples/c/multi_network_vstream_example/CMakeLists.txt index 09d444b..e5f5130 100644 --- a/hailort/libhailort/examples/c/multi_network_vstream_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/multi_network_vstream_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) find_package(Threads REQUIRED) set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(multi_network_vstream_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/c/notification_callback_example/CMakeLists.txt b/hailort/libhailort/examples/c/notification_callback_example/CMakeLists.txt index 6f5fdbe..2d62279 100644 --- a/hailort/libhailort/examples/c/notification_callback_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/notification_callback_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(notification_callback_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/c/power_measurement_example/CMakeLists.txt b/hailort/libhailort/examples/c/power_measurement_example/CMakeLists.txt index e4331d7..314f8da 100644 --- a/hailort/libhailort/examples/c/power_measurement_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/power_measurement_example/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0.0) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(power_measurement_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/c/raw_async_streams_single_thread_example/CMakeLists.txt b/hailort/libhailort/examples/c/raw_async_streams_single_thread_example/CMakeLists.txt index 962958f..137a2d4 100644 --- a/hailort/libhailort/examples/c/raw_async_streams_single_thread_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/raw_async_streams_single_thread_example/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0.0) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(raw_async_streams_single_thread_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/c/raw_streams_example/CMakeLists.txt b/hailort/libhailort/examples/c/raw_streams_example/CMakeLists.txt index 2586abf..d98dc87 100644 --- a/hailort/libhailort/examples/c/raw_streams_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/raw_streams_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(raw_streams_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/c/switch_network_groups_example/CMakeLists.txt b/hailort/libhailort/examples/c/switch_network_groups_example/CMakeLists.txt index a00d43e..4f4d7a2 100644 --- a/hailort/libhailort/examples/c/switch_network_groups_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/switch_network_groups_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(switch_network_groups_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/c/switch_network_groups_manually_example/CMakeLists.txt b/hailort/libhailort/examples/c/switch_network_groups_manually_example/CMakeLists.txt index 2eb0b1d..dc3c3d0 100644 --- a/hailort/libhailort/examples/c/switch_network_groups_manually_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/switch_network_groups_manually_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(switch_network_groups_manually_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/c/vstreams_example/CMakeLists.txt b/hailort/libhailort/examples/c/vstreams_example/CMakeLists.txt index 3eea54f..41f487e 100644 --- a/hailort/libhailort/examples/c/vstreams_example/CMakeLists.txt +++ b/hailort/libhailort/examples/c/vstreams_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) SET_SOURCE_FILES_PROPERTIES(vstreams_example.c PROPERTIES LANGUAGE C) diff --git a/hailort/libhailort/examples/cpp/async_infer_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/async_infer_example/CMakeLists.txt index 9335a99..1495056 100644 --- a/hailort/libhailort/examples/cpp/async_infer_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/async_infer_example/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0.0) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_async_infer_example async_infer_example.cpp) target_link_libraries(cpp_async_infer_example PRIVATE HailoRT::libhailort) diff --git a/hailort/libhailort/examples/cpp/async_infer_functionality_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/async_infer_functionality_example/CMakeLists.txt index bbc6736..ca59931 100644 --- a/hailort/libhailort/examples/cpp/async_infer_functionality_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/async_infer_functionality_example/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0.0) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_async_infer_functionality_example async_infer_functionality_example.cpp) target_link_libraries(cpp_async_infer_functionality_example PRIVATE HailoRT::libhailort) diff --git a/hailort/libhailort/examples/cpp/infer_pipeline_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/infer_pipeline_example/CMakeLists.txt index 1ffe855..bd6ef4d 100644 --- a/hailort/libhailort/examples/cpp/infer_pipeline_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/infer_pipeline_example/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0.0) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_infer_pipeline_example infer_pipeline_example.cpp) target_link_libraries(cpp_infer_pipeline_example PRIVATE HailoRT::libhailort) diff --git a/hailort/libhailort/examples/cpp/multi_device_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/multi_device_example/CMakeLists.txt index 13cf2f3..cf7b652 100644 --- a/hailort/libhailort/examples/cpp/multi_device_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/multi_device_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_multi_device_example multi_device_example.cpp) target_link_libraries(cpp_multi_device_example PRIVATE HailoRT::libhailort Threads::Threads) diff --git a/hailort/libhailort/examples/cpp/multi_network_vstream_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/multi_network_vstream_example/CMakeLists.txt index d5c93a4..96b1349 100644 --- a/hailort/libhailort/examples/cpp/multi_network_vstream_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/multi_network_vstream_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) find_package(Threads REQUIRED) set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_multi_network_vstream_example multi_network_vstream_example.cpp) target_link_libraries(cpp_multi_network_vstream_example PRIVATE HailoRT::libhailort Threads::Threads) diff --git a/hailort/libhailort/examples/cpp/multi_process_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/multi_process_example/CMakeLists.txt index 100fb66..c24a4e8 100644 --- a/hailort/libhailort/examples/cpp/multi_process_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/multi_process_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_multi_process_example multi_process_example.cpp) target_link_libraries(cpp_multi_process_example PRIVATE HailoRT::libhailort Threads::Threads) diff --git a/hailort/libhailort/examples/cpp/notification_callback_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/notification_callback_example/CMakeLists.txt index d123da9..31f4cf9 100644 --- a/hailort/libhailort/examples/cpp/notification_callback_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/notification_callback_example/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0.0) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_notification_callback_example notification_callback_example.cpp) target_link_libraries(cpp_notification_callback_example PRIVATE HailoRT::libhailort) diff --git a/hailort/libhailort/examples/cpp/power_measurement_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/power_measurement_example/CMakeLists.txt index b6ebeb0..4493ef1 100644 --- a/hailort/libhailort/examples/cpp/power_measurement_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/power_measurement_example/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0.0) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_power_measurement_example power_measurement_example.cpp) target_link_libraries(cpp_power_measurement_example PRIVATE HailoRT::libhailort) diff --git a/hailort/libhailort/examples/cpp/raw_async_streams_multi_thread_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/raw_async_streams_multi_thread_example/CMakeLists.txt index 428d8c1..adb93ba 100644 --- a/hailort/libhailort/examples/cpp/raw_async_streams_multi_thread_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/raw_async_streams_multi_thread_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_raw_async_streams_multi_thread_example raw_async_streams_multi_thread_example.cpp) target_link_libraries(cpp_raw_async_streams_multi_thread_example PRIVATE HailoRT::libhailort Threads::Threads) diff --git a/hailort/libhailort/examples/cpp/raw_async_streams_single_thread_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/raw_async_streams_single_thread_example/CMakeLists.txt index 3d20fcc..bde7dba 100644 --- a/hailort/libhailort/examples/cpp/raw_async_streams_single_thread_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/raw_async_streams_single_thread_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_raw_async_streams_single_thread_example raw_async_streams_single_thread_example.cpp) target_link_libraries(cpp_raw_async_streams_single_thread_example PRIVATE HailoRT::libhailort Threads::Threads) diff --git a/hailort/libhailort/examples/cpp/raw_streams_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/raw_streams_example/CMakeLists.txt index 1debea8..b426240 100644 --- a/hailort/libhailort/examples/cpp/raw_streams_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/raw_streams_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_raw_streams_example raw_streams_example.cpp) target_link_libraries(cpp_raw_streams_example PRIVATE HailoRT::libhailort Threads::Threads) diff --git a/hailort/libhailort/examples/cpp/switch_network_groups_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/switch_network_groups_example/CMakeLists.txt index 4dea0c1..8fed362 100644 --- a/hailort/libhailort/examples/cpp/switch_network_groups_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/switch_network_groups_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_switch_network_groups_example switch_network_groups_example.cpp) target_link_libraries(cpp_switch_network_groups_example PRIVATE HailoRT::libhailort Threads::Threads) diff --git a/hailort/libhailort/examples/cpp/switch_network_groups_manually_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/switch_network_groups_manually_example/CMakeLists.txt index fd319e3..ec95769 100644 --- a/hailort/libhailort/examples/cpp/switch_network_groups_manually_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/switch_network_groups_manually_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) find_package(Threads REQUIRED) set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_switch_network_groups_manually_example switch_network_groups_manually_example.cpp) target_link_libraries(cpp_switch_network_groups_manually_example PRIVATE HailoRT::libhailort Threads::Threads) diff --git a/hailort/libhailort/examples/cpp/vstreams_example/CMakeLists.txt b/hailort/libhailort/examples/cpp/vstreams_example/CMakeLists.txt index ee7a669..8ef9e3a 100644 --- a/hailort/libhailort/examples/cpp/vstreams_example/CMakeLists.txt +++ b/hailort/libhailort/examples/cpp/vstreams_example/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(HailoRT 4.16.0 EXACT REQUIRED) +find_package(HailoRT 4.16.1 EXACT REQUIRED) add_executable(cpp_vstreams_example vstreams_example.cpp) target_link_libraries(cpp_vstreams_example PRIVATE HailoRT::libhailort Threads::Threads) diff --git a/hailort/libhailort/src/vdevice/vdevice.cpp b/hailort/libhailort/src/vdevice/vdevice.cpp index 1b54131..f6bc795 100644 --- a/hailort/libhailort/src/vdevice/vdevice.cpp +++ b/hailort/libhailort/src/vdevice/vdevice.cpp @@ -223,7 +223,8 @@ VDeviceClient::VDeviceClient(std::unique_ptr client, VDeviceId m_client(std::move(client)), m_identifier(std::move(identifier)), m_devices(std::move(devices)), - m_is_listener_thread_running(false) + m_is_listener_thread_running(false), + m_should_use_listener_thread(false) {} VDeviceClient::~VDeviceClient() @@ -288,6 +289,7 @@ hailo_status VDeviceClient::after_fork_in_parent() hailo_status VDeviceClient::after_fork_in_child() { HailoRtRpcClientUtils::get_instance().after_fork_in_child(); + auto listener_status = start_listener_thread(m_identifier); CHECK_SUCCESS(listener_status); @@ -347,6 +349,7 @@ Expected VDeviceClient::configure(Hef &hef, // Init listener thread only in case configure happens with async api if ((configure_params.size() > 0) && configure_params.begin()->second.stream_params_by_name.begin()->second.flags == HAILO_STREAM_FLAGS_ASYNC) { + m_should_use_listener_thread = true; auto init_status = start_listener_thread(m_identifier); CHECK_SUCCESS_AS_EXPECTED(init_status); } @@ -356,7 +359,7 @@ Expected VDeviceClient::configure(Hef &hef, hailo_status VDeviceClient::start_listener_thread(VDeviceIdentifier identifier) { - if (m_is_listener_thread_running) { + if (!m_should_use_listener_thread || m_is_listener_thread_running) { return HAILO_SUCCESS; } diff --git a/hailort/libhailort/src/vdevice/vdevice_internal.hpp b/hailort/libhailort/src/vdevice/vdevice_internal.hpp index 4e5ed9e..071d794 100644 --- a/hailort/libhailort/src/vdevice/vdevice_internal.hpp +++ b/hailort/libhailort/src/vdevice/vdevice_internal.hpp @@ -179,6 +179,7 @@ private: AsyncThreadPtr m_cb_listener_thread; std::atomic_bool m_is_listener_thread_running; + std::atomic_bool m_should_use_listener_thread; // True only on async inference }; #endif // HAILO_SUPPORT_MULTI_PROCESS diff --git a/hailort/scripts/download_firmware_eth.cmd b/hailort/scripts/download_firmware_eth.cmd index 9c33925..be29d84 100644 --- a/hailort/scripts/download_firmware_eth.cmd +++ b/hailort/scripts/download_firmware_eth.cmd @@ -2,7 +2,7 @@ @ECHO OFF set BASE_URI=https://hailo-hailort.s3.eu-west-2.amazonaws.com -set HRT_VERSION=4.16.0 +set HRT_VERSION=4.16.1 set FW_DIR=Hailo8/%HRT_VERSION%/FW set FW=hailo8_fw.%HRT_VERSION%_eth.bin diff --git a/hailort/scripts/download_firmware_eth.sh b/hailort/scripts/download_firmware_eth.sh index 572d3b6..4c07f61 100755 --- a/hailort/scripts/download_firmware_eth.sh +++ b/hailort/scripts/download_firmware_eth.sh @@ -2,7 +2,7 @@ set -e readonly BASE_URI="https://hailo-hailort.s3.eu-west-2.amazonaws.com" -readonly HRT_VERSION=4.16.0 +readonly HRT_VERSION=4.16.1 readonly FW_AWS_DIR="Hailo8/${HRT_VERSION}/FW" readonly FW="hailo8_fw.${HRT_VERSION}_eth.bin" diff --git a/hailort/scripts/download_hefs.cmd b/hailort/scripts/download_hefs.cmd index 3fb8cac..ac90510 100644 --- a/hailort/scripts/download_hefs.cmd +++ b/hailort/scripts/download_hefs.cmd @@ -1,7 +1,7 @@ :: cmd @ECHO OFF set BASE_URI=https://hailo-hailort.s3.eu-west-2.amazonaws.com -set HRT_VERSION=4.16.0 +set HRT_VERSION=4.16.1 set REMOTE_HEF_DIR=Hailo8/%HRT_VERSION%/HEFS set LOCAL_EXAMPLES_HEF_DIR=..\libhailort\examples\hefs set LOCAL_TUTORIALS_HEF_DIR=..\libhailort\bindings\python\platform\hailo_tutorials\hefs diff --git a/hailort/scripts/download_hefs.sh b/hailort/scripts/download_hefs.sh index 47d3b93..8dd4a80 100755 --- a/hailort/scripts/download_hefs.sh +++ b/hailort/scripts/download_hefs.sh @@ -2,7 +2,7 @@ set -e readonly BASE_URI="https://hailo-hailort.s3.eu-west-2.amazonaws.com" -readonly HRT_VERSION=4.16.0 +readonly HRT_VERSION=4.16.1 readonly REMOTE_HEF_DIR="Hailo8/${HRT_VERSION}/HEFS" readonly LOCAL_EXAMPLES_HEF_DIR="../libhailort/examples/hefs" readonly LOCAL_TUTORIALS_HEF_DIR="../libhailort/bindings/python/platform/hailo_tutorials/hefs" -- 2.34.1