From 8295c0685ff23e6a53bebe613b6d485d0fbfd515 Mon Sep 17 00:00:00 2001 From: HailoRT-Automation Date: Wed, 6 Jul 2022 11:14:26 +0300 Subject: [PATCH] v4.8.1 --- hailort/CMakeLists.txt | 2 +- hailort/hailortcli/download_action_list_command.cpp | 10 +++++++--- hailort/libhailort/CMakeLists.txt | 2 +- hailort/libhailort/bindings/gstreamer/CMakeLists.txt | 2 +- .../hailo_platform/pyhailort/hailo_control_protocol.py | 2 +- hailort/libhailort/bindings/python/platform/setup.py | 2 +- hailort/libhailort/examples/CMakeLists.txt | 2 +- hailort/libhailort/src/network_group_scheduler.hpp | 1 + 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/hailort/CMakeLists.txt b/hailort/CMakeLists.txt index 63edd68..3b8206d 100644 --- a/hailort/CMakeLists.txt +++ b/hailort/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) # Set firmware version add_definitions( -DFIRMWARE_VERSION_MAJOR=4 ) add_definitions( -DFIRMWARE_VERSION_MINOR=8 ) -add_definitions( -DFIRMWARE_VERSION_REVISION=0 ) +add_definitions( -DFIRMWARE_VERSION_REVISION=1 ) message(STATUS "Building pre_build") include(${CMAKE_CURRENT_LIST_DIR}/libhailort/cmake/execute_cmake.cmake) diff --git a/hailort/hailortcli/download_action_list_command.cpp b/hailort/hailortcli/download_action_list_command.cpp index 6cb49ce..d88ca7c 100644 --- a/hailort/hailortcli/download_action_list_command.cpp +++ b/hailort/hailortcli/download_action_list_command.cpp @@ -15,6 +15,8 @@ #include #include +#define MHz (1000 * 1000) + constexpr int DownloadActionListCommand::INVALID_NUMERIC_VALUE; DownloadActionListCommand::DownloadActionListCommand(CLI::App &parent_app) : @@ -34,12 +36,14 @@ hailo_status DownloadActionListCommand::execute(Device &device, const std::strin auto curr_time = CliCommon::current_time_to_string(); CHECK_EXPECTED_AS_STATUS(curr_time); - // TODO: Get real clock rate (HRT-5998) - static const uint32_t CLOCK_CYCLE = 200; + auto extended_info = device.get_extended_device_information(); + CHECK_EXPECTED_AS_STATUS(extended_info); + const auto clock_cycle = extended_info->neural_network_core_clock_rate / MHz; + ordered_json action_list_json = { {"version", ACTION_LIST_FORMAT_VERSION()}, {"creation_time", curr_time.release()}, - {"clock_cycle_MHz", CLOCK_CYCLE}, + {"clock_cycle_MHz", clock_cycle}, {"hef", json({})} }; diff --git a/hailort/libhailort/CMakeLists.txt b/hailort/libhailort/CMakeLists.txt index aff9879..5a51f00 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 8) -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 c9fe743..87a0bc8 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.8.0 EXACT REQUIRED) +find_package(HailoRT 4.8.1 EXACT REQUIRED) # GST_PLUGIN_DEFINE needs PACKAGE to be defined set(GST_HAILO_PACKAGE_NAME "hailo") diff --git a/hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/hailo_control_protocol.py b/hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/hailo_control_protocol.py index 2754cc8..a85e698 100644 --- a/hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/hailo_control_protocol.py +++ b/hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/hailo_control_protocol.py @@ -13,7 +13,7 @@ import struct SUPPORTED_PROTOCOL_VERSION = 2 SUPPORTED_FW_MAJOR = 4 SUPPORTED_FW_MINOR = 8 -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 04502e9..c165824 100644 --- a/hailort/libhailort/bindings/python/platform/setup.py +++ b/hailort/libhailort/bindings/python/platform/setup.py @@ -68,6 +68,6 @@ if __name__ == "__main__": "linux_aarch64", ], url="https://hailo.ai/", - version="4.8.0", + version="4.8.1", zip_safe=False, ) diff --git a/hailort/libhailort/examples/CMakeLists.txt b/hailort/libhailort/examples/CMakeLists.txt index 06bc93b..40cb002 100644 --- a/hailort/libhailort/examples/CMakeLists.txt +++ b/hailort/libhailort/examples/CMakeLists.txt @@ -5,7 +5,7 @@ project(hailort-examples) find_package(Threads REQUIRED) set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(HailoRT 4.8.0 EXACT REQUIRED) +find_package(HailoRT 4.8.1 EXACT REQUIRED) add_library(example_base INTERFACE) target_link_libraries(example_base INTERFACE HailoRT::libhailort Threads::Threads) diff --git a/hailort/libhailort/src/network_group_scheduler.hpp b/hailort/libhailort/src/network_group_scheduler.hpp index c262ebb..b7b0b20 100644 --- a/hailort/libhailort/src/network_group_scheduler.hpp +++ b/hailort/libhailort/src/network_group_scheduler.hpp @@ -42,6 +42,7 @@ public: : m_algorithm(algorithm), m_before_read_write_mutex(), m_write_read_cv(), m_current_network_group(0), m_switching_network_group(true), m_has_current_ng_finished(true), m_next_network_group(0), m_forced_idle_state(false) { + m_should_stop = false; // Temp solution until we'll implement timeout as timers m_thread = std::thread([this] () { while (!m_should_stop.load()) { -- 2.34.1