ros2/hailort
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v4.12.1

Browse Source
This commit is contained in:
HailoRT-Automation
2023-02-15 15:21:29 +02:00
committed by GitHub
parent 5c346eddad
commit d24971447a
31 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hailort/CMakeLists.txt
View File

@@ -23,7 +23,7 @@ endif()
# Set firmware version
add_definitions( -DFIRMWARE_VERSION_MAJOR=4 )
add_definitions( -DFIRMWARE_VERSION_MINOR=12 )
add_definitions( -DFIRMWARE_VERSION_REVISION=0 )
add_definitions( -DFIRMWARE_VERSION_REVISION=1 )
if(HAILO_BUILD_SERVICE)
add_definitions( -DHAILO_SUPPORT_MULTI_PROCESS )
endif()

2
hailort/libhailort/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0)
set(HAILORT_MAJOR_VERSION 4)
set(HAILORT_MINOR_VERSION 12)
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})

2
hailort/libhailort/bindings/gstreamer/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ if(NOT CMAKE_HOST_UNIX)
message(FATAL_ERROR "Only unix hosts are supported, stopping build")
endif()
find_package(HailoRT 4.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
# GST_PLUGIN_DEFINE needs PACKAGE to be defined
set(GST_HAILO_PACKAGE_NAME "hailo")

5
hailort/libhailort/bindings/gstreamer/gst-hailo/gsthailosend.cpp
View File

@@ -243,14 +243,15 @@ GstCaps *HailoSendImpl::get_caps(GstBaseTransform */*trans*/, GstPadDirection /*
("Input VStream %s has an unsupported format order! order = %d", m_input_vstream_infos[0].name, m_input_vstream_infos[0].format.order), (NULL));
return NULL;
}
/* filter against set allowed caps on the pad */
GstCaps *new_caps = gst_caps_new_simple("video/x-raw",
"format", G_TYPE_STRING, format,
"width", G_TYPE_INT, m_input_vstream_infos[0].shape.width,
"height", G_TYPE_INT, get_height_by_order(m_input_vstream_infos[0]),
NULL);
return gst_caps_intersect(caps, new_caps);
auto result = gst_caps_intersect(caps, new_caps);
gst_caps_unref(new_caps);
return result;
}
void HailoSendImpl::set_input_vstream_infos(std::vector<hailo_vstream_info_t> &&input_vstream_infos)

2
hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/pyhailort.py
View File

@@ -1236,7 +1236,7 @@ class HailoFormatFlags(_pyhailort.FormatFlags):
SUPPORTED_PROTOCOL_VERSION = 2
SUPPORTED_FW_MAJOR = 4
SUPPORTED_FW_MINOR = 12
SUPPORTED_FW_REVISION = 0
SUPPORTED_FW_REVISION = 1
MEGA_MULTIPLIER = 1000.0 * 1000.0

2
hailort/libhailort/bindings/python/platform/setup.py
View File

@@ -69,6 +69,6 @@ if __name__ == "__main__":
"linux_aarch64",
],
url="https://hailo.ai/",
version="4.12.0",
version="4.12.1",
zip_safe=False,
)

2
hailort/libhailort/examples/c/data_quantization_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
SET_SOURCE_FILES_PROPERTIES(data_quantization_example.c PROPERTIES LANGUAGE C)

2
hailort/libhailort/examples/c/infer_pipeline_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
SET_SOURCE_FILES_PROPERTIES(infer_pipeline_example.c PROPERTIES LANGUAGE C)

2
hailort/libhailort/examples/c/multi_device_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
SET_SOURCE_FILES_PROPERTIES(multi_device_example.c PROPERTIES LANGUAGE C)

2
hailort/libhailort/examples/c/multi_network_vstream_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
SET_SOURCE_FILES_PROPERTIES(multi_network_vstream_example.c PROPERTIES LANGUAGE C)

2
hailort/libhailort/examples/c/power_measurement_example/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.0.0)
find_package(HailoRT 4.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
SET_SOURCE_FILES_PROPERTIES(power_measurement_example.c PROPERTIES LANGUAGE C)

2
hailort/libhailort/examples/c/raw_streams_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
SET_SOURCE_FILES_PROPERTIES(raw_streams_example.c PROPERTIES LANGUAGE C)

2
hailort/libhailort/examples/c/switch_network_groups_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
SET_SOURCE_FILES_PROPERTIES(switch_network_groups_example.c PROPERTIES LANGUAGE C)

2
hailort/libhailort/examples/c/switch_network_groups_manually_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
SET_SOURCE_FILES_PROPERTIES(switch_network_groups_manually_example.c PROPERTIES LANGUAGE C)

2
hailort/libhailort/examples/c/vstreams_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
SET_SOURCE_FILES_PROPERTIES(vstreams_example.c PROPERTIES LANGUAGE C)

2
hailort/libhailort/examples/cpp/infer_pipeline_example/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.0.0)
find_package(HailoRT 4.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
add_executable(cpp_infer_pipeline_example infer_pipeline_example.cpp)
target_link_libraries(cpp_infer_pipeline_example PRIVATE HailoRT::libhailort)

2
hailort/libhailort/examples/cpp/multi_device_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.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)

2
hailort/libhailort/examples/cpp/multi_network_vstream_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.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)

2
hailort/libhailort/examples/cpp/multi_process_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.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)

2
hailort/libhailort/examples/cpp/power_measurement_example/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.0.0)
find_package(HailoRT 4.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
add_executable(cpp_power_measurement_example power_measurement_example.cpp)
target_link_libraries(cpp_power_measurement_example PRIVATE HailoRT::libhailort)

2
hailort/libhailort/examples/cpp/raw_streams_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.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)

2
hailort/libhailort/examples/cpp/switch_network_groups_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.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)

2
hailort/libhailort/examples/cpp/switch_network_groups_manually_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.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)

2
hailort/libhailort/examples/cpp/vstreams_example/CMakeLists.txt
View File

@@ -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.12.0 EXACT REQUIRED)
find_package(HailoRT 4.12.1 EXACT REQUIRED)
add_executable(cpp_vstreams_example vstreams_example.cpp)
target_link_libraries(cpp_vstreams_example PRIVATE HailoRT::libhailort Threads::Threads)

5
hailort/libhailort/src/vstream.cpp
View File

@@ -2239,6 +2239,7 @@ hailo_status VStreamsBuilderUtils::add_nms_fuse(OutputStreamPtrVector &output_st
for (uint32_t i = 0; i < output_streams.size(); ++i) {
const auto &curr_stream_info = output_streams[i]->get_info();
output_streams[i]->set_timeout(HAILO_INFINITE_TIMEOUT);
auto hw_read_elem = HwReadElement::create(output_streams[i],
PipelineObject::create_element_name("HwReadElement", curr_stream_info.name, curr_stream_info.index),
@@ -2252,6 +2253,7 @@ hailo_status VStreamsBuilderUtils::add_nms_fuse(OutputStreamPtrVector &output_st
vstreams_params, shutdown_event, pipeline_status);
CHECK_EXPECTED_AS_STATUS(nms_source_queue_elem);
elements.push_back(nms_source_queue_elem.value());
nms_source_queue_elem.value()->set_timeout(HAILO_INFINITE_TIMEOUT);
CHECK_SUCCESS(PipelinePad::link_pads(hw_read_elem.value(), nms_source_queue_elem.value()));
CHECK_SUCCESS(PipelinePad::link_pads(nms_source_queue_elem.value(), nms_elem.value(), 0, i));
}
@@ -2273,6 +2275,7 @@ hailo_status VStreamsBuilderUtils::add_nms_fuse(OutputStreamPtrVector &output_st
PipelineObject::create_element_name("PullQueueElement_nms", fused_layer_name, 0),
vstreams_params, shutdown_event, pipeline_status);
CHECK_EXPECTED_AS_STATUS(nms_queue_elem);
nms_queue_elem.value()->set_timeout(HAILO_INFINITE_TIMEOUT);
elements.push_back(nms_queue_elem.value());
CHECK_SUCCESS(PipelinePad::link_pads(nms_elem.value(), nms_queue_elem.value()));
@@ -2364,6 +2367,7 @@ hailo_status VStreamsBuilderUtils::add_nms_post_process(OutputStreamPtrVector &o
for (uint32_t i = 0; i < output_streams.size(); ++i) {
const auto &curr_stream_info = output_streams[i]->get_info();
output_streams[i]->set_timeout(HAILO_INFINITE_TIMEOUT);
auto should_transform = OutputTransformContext::is_transformation_required(curr_stream_info.hw_shape, curr_stream_info.format,
curr_stream_info.shape, nms_src_format, vstream_info->second.quant_info);
@@ -2388,6 +2392,7 @@ hailo_status VStreamsBuilderUtils::add_nms_post_process(OutputStreamPtrVector &o
PipelineObject::create_element_name("PullQueueElement_nms_source", curr_stream_info.name, curr_stream_info.index),
vstreams_params, shutdown_event, pipeline_status);
CHECK_EXPECTED_AS_STATUS(nms_source_queue_elem);
nms_source_queue_elem.value()->set_timeout(HAILO_INFINITE_TIMEOUT);
elements.push_back(nms_source_queue_elem.value());
CHECK_SUCCESS(PipelinePad::link_pads(hw_read_elem.value(), nms_source_queue_elem.value()));
CHECK_SUCCESS(PipelinePad::link_pads(nms_source_queue_elem.value(), nms_elem.value(), 0, i));

2
hailort/pre_build/external/CMakeLists.txt vendored
View File

@@ -18,7 +18,7 @@ endfunction()
git_clone(pybind11 https://github.com/pybind/pybind11.git 80dc998efced8ceb2be59756668a7e90e8bef917)
git_clone(Catch2 https://github.com/catchorg/Catch2.git c4e3767e265808590986d5db6ca1b5532a7f3d13)
git_clone(CLI11 https://github.com/hailo-ai/CLI11.git 635773b0a1d76a1744c122b98eda6702c909edb2)
git_clone(CLI11 https://github.com/hailo-ai/CLI11.git f1644f15f219303b7ad670732c21018a1e6f0e11)
git_clone(spdlog https://github.com/gabime/spdlog.git e2789531912a5c6ab28a90387f97c52963eec08a)
git_clone(protobuf https://github.com/protocolbuffers/protobuf.git 22d0e265de7d2b3d2e9a00d071313502e7d4cccf)
git_clone(readerwriterqueue https://github.com/cameron314/readerwriterqueue.git 435e36540e306cac40fcfeab8cc0a22d48464509)

2
hailort/scripts/download_firmware_eth.cmd
View File

@@ -2,7 +2,7 @@
@ECHO OFF
set BASE_URI=https://hailo-hailort.s3.eu-west-2.amazonaws.com
set HRT_VERSION=4.12.0
set HRT_VERSION=4.12.1
set FW_DIR=Hailo8/%HRT_VERSION%/FW
set FW=hailo8_fw.%HRT_VERSION%_eth.bin

2
hailort/scripts/download_firmware_eth.sh
View File

@@ -2,7 +2,7 @@
set -e
readonly BASE_URI="https://hailo-hailort.s3.eu-west-2.amazonaws.com"
readonly HRT_VERSION=4.12.0
readonly HRT_VERSION=4.12.1
readonly FW_AWS_DIR="Hailo8/${HRT_VERSION}/FW"
readonly FW="hailo8_fw.${HRT_VERSION}_eth.bin"

2
hailort/scripts/download_hefs.cmd
View File

@@ -1,7 +1,7 @@
:: cmd
@ECHO OFF
set BASE_URI=https://hailo-hailort.s3.eu-west-2.amazonaws.com
set HRT_VERSION=4.12.0
set HRT_VERSION=4.12.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\tutorials\hefs

2
hailort/scripts/download_hefs.sh
View File

@@ -2,7 +2,7 @@
set -e
readonly BASE_URI="https://hailo-hailort.s3.eu-west-2.amazonaws.com"
readonly HRT_VERSION=4.12.0
readonly HRT_VERSION=4.12.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/tutorials/hefs/"