API 2.0 and 2024.0 compatibility

.github/workflows/main.yml

@@ -21,13 +21,13 @@ jobs:
         # found ("dyld: Library not loaded; '@rpath/libopenvino.2310.dylib'"). See
         # https://github.com/abrown/openvino-rs/actions/runs/6423141936/job/17441022932#step:7:154
         os: [ubuntu-20.04, ubuntu-22.04, windows-latest]
-        version: [2022.3.0, 2023.1.0, 2023.2.0]
+        version: [2022.3.1, 2023.3.0, 2024.0.0]
         apt: [false]
         # We also spot-check that things work when installing from APT by adding to the matrix: see
         # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#expanding-or-adding-matrix-configurations
         include:
           - os: ubuntu-22.04
-            version: 2023.2.0
+            version: 2023.3.0
             apt: true
     env:
       RUST_LOG: debug
@@ -56,9 +56,6 @@ jobs:
     # path and Cargo links the binary to it in the `build.rs` script.
     - name: Check dynamic linking
       run: cargo test
-      # TODO: the finder does not yet know how to distinguish between `*.lib` (required here) and
-      # `*.dll` (required by runtime-linking).
-      if: ${{ !startsWith(runner.os, 'windows') }}
     # Finally, run the runtime-linking tests: the binddings do not link at build time, instead
     # as the tests are run.
     - name: Check runtime linking

.gitignore

@@ -1 +1,2 @@
+.idea/
 target

.gitmodules

@@ -1,4 +1,6 @@
 [submodule "crates/upstream"]
 	path = crates/openvino-sys/upstream
 	url = https://github.com/openvinotoolkit/openvino
-	depth = 1
+	update = none
+	fetchRecurseSubmodules = false
+	shallow = true

crates/openvino-finder/src/lib.rs

@@ -88,20 +88,46 @@ macro_rules! check_and_return {
 ///
 /// Panics if it cannot list the contents of a search directory.
 pub fn find(library_name: &str) -> Option<PathBuf> {
-    let file = format!(
+    let library = format!(
         "{}{}{}",
         env::consts::DLL_PREFIX,
         library_name,
         env::consts::DLL_SUFFIX
     );
-    log::info!("Attempting to find library: {}", file);
+    log::info!("Attempting to find library: {}", library);
+    find_library(&library)
+}
+
+/// Find the path to an OpenVINO link library.
+///
+/// Follows the same procedure as [find], but searches for "import" libraries.
+/// This differentiation is important on Windows, which requires ".lib" when linking:
+/// https://learn.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-creation#creating-an-import-library
+pub fn find_link(library_name: &str) -> Option<PathBuf> {
+    find_import_library(library_name)
+}
+
+#[cfg(not(target_os = "windows"))]
+#[inline(always)]
+fn find_import_library(library_name: &str) -> Option<PathBuf> {
+    find(library_name)
+}
+
+#[cfg(target_os = "windows")]
+#[inline(always)]
+fn find_import_library(library_name: &str) -> Option<PathBuf> {
+    let library = format!("{}.lib", library_name);
+    log::info!("Attempting to find link library: {}", library);
+    find_library(&library)
+}
 
+fn find_library(library: &str) -> Option<PathBuf> {
     // Search using the `OPENVINO_BUILD_DIR` environment variable; this may be set by users of the
     // `openvino-rs` library.
     if let Some(build_dir) = env::var_os(ENV_OPENVINO_BUILD_DIR) {
         let install_dir = PathBuf::from(build_dir);
         for lib_dir in KNOWN_BUILD_SUBDIRECTORIES {
-            let search_path = install_dir.join(lib_dir).join(&file);
+            let search_path = install_dir.join(lib_dir).join(&library);
             check_and_return!(search_path);
         }
     }
@@ -111,7 +137,7 @@ pub fn find(library_name: &str) -> Option<PathBuf> {
     if let Some(install_dir) = env::var_os(ENV_OPENVINO_INSTALL_DIR) {
         let install_dir = PathBuf::from(install_dir);
         for lib_dir in KNOWN_INSTALLATION_SUBDIRECTORIES {
-            let search_path = install_dir.join(lib_dir).join(&file);
+            let search_path = install_dir.join(lib_dir).join(&library);
             check_and_return!(search_path);
         }
     }
@@ -121,7 +147,7 @@ pub fn find(library_name: &str) -> Option<PathBuf> {
     if let Some(install_dir) = env::var_os(ENV_INTEL_OPENVINO_DIR) {
         let install_dir = PathBuf::from(install_dir);
         for lib_dir in KNOWN_INSTALLATION_SUBDIRECTORIES {
-            let search_path = install_dir.join(lib_dir).join(&file);
+            let search_path = install_dir.join(lib_dir).join(&library);
             check_and_return!(search_path);
         }
     }
@@ -130,7 +156,7 @@ pub fn find(library_name: &str) -> Option<PathBuf> {
     // `DYLD_LIBRARY_PATH` on MacOS).
     if let Some(path) = env::var_os(ENV_LIBRARY_PATH) {
         for lib_dir in env::split_paths(&path) {
-            let search_path = lib_dir.join(&file);
+            let search_path = lib_dir.join(&library);
             check_and_return!(search_path);
         }
     }
@@ -143,13 +169,13 @@ pub fn find(library_name: &str) -> Option<PathBuf> {
         .filter(|d| d.is_dir())
     {
         // Check if the file is located in the installation directory.
-        let search_path = install_dir.join(&file);
+        let search_path = install_dir.join(&library);
         check_and_return!(search_path);
 
         // Otherwise, check for version terminators: e.g., `libfoo.so.3.1.2`.
         let filenames = list_directory(&install_dir).expect("cannot list installation directory");
-        let versions = get_suffixes(filenames, &file);
-        if let Some(path) = build_latest_version(&install_dir, &file, versions) {
+        let versions = get_suffixes(filenames, &library);
+        if let Some(path) = build_latest_version(&install_dir, &library, versions) {
             check_and_return!(path);
         }
     }
@@ -161,7 +187,7 @@ pub fn find(library_name: &str) -> Option<PathBuf> {
         .filter(|d| d.is_dir())
     {
         for lib_dir in KNOWN_INSTALLATION_SUBDIRECTORIES {
-            let search_path = default_dir.join(lib_dir).join(&file);
+            let search_path = default_dir.join(lib_dir).join(&library);
             check_and_return!(search_path);
         }
     }
@@ -220,12 +246,14 @@ const KNOWN_INSTALLATION_SUBDIRECTORIES: &[&str] = &[
     "runtime/lib/intel64/Release",
     "runtime/lib/intel64",
     "runtime/3rdparty/tbb/lib",
+    "runtime/bin/intel64/Release",
     "runtime/bin/intel64",
     "runtime/3rdparty/tbb/bin",
 ];
 
 const KNOWN_BUILD_SUBDIRECTORIES: &[&str] = &[
     "bin/intel64/Debug/lib",
+    "bin/intel64/Debug",
     "bin/intel64/Release/lib",
     "temp/tbb/lib",
 ];

crates/openvino-sys/build.rs

@@ -139,7 +139,7 @@ fn add_dynamically_linked_library(library: &str) {
 fn find_libraries_in_existing_installation() -> Vec<PathBuf> {
     let mut dirs = vec![];
     for library in LIBRARIES {
-        if let Some(path) = openvino_finder::find(library) {
+        if let Some(path) = openvino_finder::find_link(library) {
             println!(
                 "cargo:warning=Found library to link against: {}",
                 path.display()