Skip to content

Add OpenVino 2021.4 support; remove deprecated 2020.1, 2020.2 #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 19, 2021
Merged

Add OpenVino 2021.4 support; remove deprecated 2020.1, 2020.2 #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a65c574
Add OpenVino 2021.4 support; remove dperecated 2020.1, 2020.2
SzabolcsGergely Jul 1, 2021
6264ee4
Merge remote-tracking branch 'origin/develop' into HEAD
SzabolcsGergely Jul 16, 2021
853cead
Update FW with OpenVino FW fix
SzabolcsGergely Jul 19, 2021
8c9df92
Merge remote-tracking branch 'origin/develop' into HEAD
SzabolcsGergely Jul 19, 2021
7f8a675
Update core with latest develop
SzabolcsGergely Jul 19, 2021
14a6327
Update core to latest develop
SzabolcsGergely Jul 19, 2021
6d4cf2c
Merge remote-tracking branch 'origin/develop' into HEAD
SzabolcsGergely Jul 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion depthai-core
Open in desktop
Submodule depthai-core updated 8 files
+1 −1 cmake/Depthai/DepthaiDeviceSideConfig.cmake
+1 −1 include/depthai/openvino/OpenVINO.hpp
+1 −1 include/depthai/pipeline/Pipeline.hpp
+11 −15 src/openvino/OpenVINO.cpp
+20 −29 src/utility/Resources.cpp
+1 −1 src/utility/Resources.hpp
+9 −0 tests/CMakeLists.txt
+9 −0 tests/src/openvino_blob_test.cpp
2 changes: 1 addition & 1 deletion docs/source/components/pipeline.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
###############
Expand Down
9 changes: 4 additions & 5 deletions src/openvino/OpenVINOBindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>(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()
;

Expand Down