Upgrade to OpenVINO 2021.4 (#29)

* Update CI to use OpenVINO 2021.4 * Choose OpenVINO 2021.4 libraries by default Also, relax the doc tests to allow more versions.
intel · Jul 13, 2021 · 917a28a · 917a28a
1 parent 37fbe63
commit 917a28a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu18, ubuntu20]
-        version: [2020.4, 2021.1, 2021.2, 2021.3]
+        version: [2020.4, 2021.1, 2021.2, 2021.3, 2021.4]
         exclude:
         - os: ubuntu20
           version: 2020.4

diff --git a/crates/openvino-finder/src/lib.rs b/crates/openvino-finder/src/lib.rs
@@ -102,7 +102,7 @@ cfg_if! {
 cfg_if! {
     if #[cfg(any(target_os = "linux", target_os = "macos"))] {
         const DEFAULT_INSTALLATION_DIRECTORIES: &'static [&'static str] =
-            &["/opt/intel/openvino", "/opt/intel/openvino_2021"];
+            &["/opt/intel/openvino_2021", "/opt/intel/openvino"];
     } else if #[cfg(target_os = "windows")] {
         const DEFAULT_INSTALLATION_DIRECTORIES: &'static [&'static str] = &[
             "C:\\Program Files (x86)\\Intel\\openvino",

diff --git a/crates/openvino-sys/src/lib.rs b/crates/openvino-sys/src/lib.rs
@@ -13,7 +13,7 @@
 //! # use std::ffi::CStr;
 //! openvino_sys::library::load().expect("to have an OpenVINO library available");
 //! let version = unsafe { CStr::from_ptr(openvino_sys::ie_c_api_version().api_version) };
-//! assert!(version.to_string_lossy().starts_with("2.1"));
+//! assert!(version.to_string_lossy().starts_with("2"));
 //! ```
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]

diff --git a/crates/openvino/src/lib.rs b/crates/openvino/src/lib.rs
@@ -6,7 +6,7 @@
 //!
 //! Check the loaded version of OpenVINO:
 //! ```
-//! assert!(openvino::version().starts_with("2.1"))
+//! assert!(openvino::version().starts_with("2"))
 //! ```
 //!
 //! Most interaction with OpenVINO begins with instantiating a [Core]: