From a65c574c5c72b6d6cd335625eb818a26b9ce4682 Mon Sep 17 00:00:00 2001 From: SzabolcsGergely Date: Fri, 2 Jul 2021 01:23:25 +0300 Subject: [PATCH 1/4] Add OpenVino 2021.4 support; remove dperecated 2020.1, 2020.2 --- depthai-core | 2 +- docs/source/components/pipeline.rst | 2 +- src/openvino/OpenVINOBindings.cpp | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/depthai-core b/depthai-core index 3759e196c..a6c2c400f 160000 --- a/depthai-core +++ b/depthai-core @@ -1 +1 @@ -Subproject commit 3759e196c8a937860fbc6521138d6c8c41c305a7 +Subproject commit a6c2c400fd37ddbd83b76f9b894693966632b60f diff --git a/docs/source/components/pipeline.rst b/docs/source/components/pipeline.rst index 2aadc2c3d..2e1390c97 100644 --- a/docs/source/components/pipeline.rst +++ b/docs/source/components/pipeline.rst @@ -43,7 +43,7 @@ The reason behind this is that OpenVINO doesn't provide version inside the blob. pipeline = depthai.Pipeline() # Set the correct version: - pipeline.setOpenVINOVersion(depthai.OpenVINO.Version.VERSION_2020_1) + pipeline.setOpenVINOVersion(depthai.OpenVINO.Version.VERSION_2021_4) How to place it ############### diff --git a/src/openvino/OpenVINOBindings.cpp b/src/openvino/OpenVINOBindings.cpp index 6ad3346ac..eca2a0b04 100644 --- a/src/openvino/OpenVINOBindings.cpp +++ b/src/openvino/OpenVINOBindings.cpp @@ -19,19 +19,18 @@ void OpenVINOBindings::bind(pybind11::module& m){ ; // not strongly typed enum OpenVINO::Version - // previous step defined class 'OpenVINO' (variable 'openvino') + // previous step defined class 'OpenVINO' (variable 'openvino') // which is used in defining the following enum (its scope) - // and that the values are available directly under OpenVINO.VERSION_2020_1, ... + // and that the values are available directly under OpenVINO.VERSION_2021_4, ... // they are exported - // By default, pybind creates strong typed enums, eg: OpenVINO::Version::VERSION_2020_1 + // By default, pybind creates strong typed enums, eg: OpenVINO::Version::VERSION_2021_4 py::enum_(openvino, "Version", DOC(dai, OpenVINO, Version)) - .value("VERSION_2020_1", OpenVINO::Version::VERSION_2020_1) - .value("VERSION_2020_2", OpenVINO::Version::VERSION_2020_2) .value("VERSION_2020_3", OpenVINO::Version::VERSION_2020_3) .value("VERSION_2020_4", OpenVINO::Version::VERSION_2020_4) .value("VERSION_2021_1", OpenVINO::Version::VERSION_2021_1) .value("VERSION_2021_2", OpenVINO::Version::VERSION_2021_2) .value("VERSION_2021_3", OpenVINO::Version::VERSION_2021_3) + .value("VERSION_2021_4", OpenVINO::Version::VERSION_2021_4) .export_values() ; From 853cead950fdf9c083f51c4fc58c17d01eea2d5a Mon Sep 17 00:00:00 2001 From: SzabolcsGergely Date: Mon, 19 Jul 2021 06:16:41 +0300 Subject: [PATCH 2/4] Update FW with OpenVino FW fix --- depthai-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depthai-core b/depthai-core index d631ce96b..e8d077e4a 160000 --- a/depthai-core +++ b/depthai-core @@ -1 +1 @@ -Subproject commit d631ce96b3ccb319fb5f2ee3cd8dcd7c44395679 +Subproject commit e8d077e4a3e537ff55f48504dd49efb8144a6e70 From 7f8a6754333ff9e23a31604ff5967e78911f6c49 Mon Sep 17 00:00:00 2001 From: SzabolcsGergely Date: Mon, 19 Jul 2021 07:50:29 +0300 Subject: [PATCH 3/4] Update core with latest develop --- depthai-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depthai-core b/depthai-core index cbc04cd6d..a2a1f7ee6 160000 --- a/depthai-core +++ b/depthai-core @@ -1 +1 @@ -Subproject commit cbc04cd6d03086bcfea6947a37eb5d75a071bf6e +Subproject commit a2a1f7ee6902efbe2c1bdc6e8afa5e4b3003afe0 From 14a63277c5286858a85c4de0f6cc3cceac62e14a Mon Sep 17 00:00:00 2001 From: SzabolcsGergely Date: Mon, 19 Jul 2021 07:58:46 +0300 Subject: [PATCH 4/4] Update core to latest develop --- depthai-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depthai-core b/depthai-core index a2a1f7ee6..70ad1005c 160000 --- a/depthai-core +++ b/depthai-core @@ -1 +1 @@ -Subproject commit a2a1f7ee6902efbe2c1bdc6e8afa5e4b3003afe0 +Subproject commit 70ad1005cdfaf6a12b5627f75d177d6f37081c6a