ci: unpin the wasi-nn tasks from an older Ubuntu

.github/workflows/main.yml

@@ -466,14 +466,17 @@ jobs:
     needs: determine
     if: needs.determine.outputs.run-full
     name: Test wasi-nn module
-    runs-on: ubuntu-20.04 # TODO: remove pin when fixed (#5408)
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
       - uses: ./.github/actions/install-rust
       - run: rustup target add wasm32-wasi
-      - uses: abrown/install-openvino-action@v3
+      - uses: abrown/install-openvino-action@50a2ab733ef4b504dd7de3ac45c36eae7f9bc228
+        with:
+          version: 2022.3.0
+          apt: true
       - run: ./ci/run-wasi-nn-example.sh
         env:
           RUST_BACKTRACE: 1

ci/run-wasi-nn-example.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-# The following script demonstrates how to execute a machine learning inference using the wasi-nn module optionally
-# compiled into Wasmtime. Calling it will download the necessary model and tensor files stored separately in $FIXTURE
-# into $TMP_DIR (optionally pass a directory with existing files as the first argument to re-try the script). Then,
-# it will compile the example code in crates/wasi-nn/tests/example into a Wasm file that is subsequently
-# executed with the Wasmtime CLI.
+# The following script demonstrates how to execute a machine learning inference using the wasi-nn
+# module optionally compiled into Wasmtime. Calling it will download the necessary model and tensor
+# files stored separately in $FIXTURE into $TMP_DIR (optionally pass a directory with existing files
+# as the first argument to re-try the script). Then, it will compile the example code in
+# crates/wasi-nn/tests/example into a Wasm file that is subsequently executed with the Wasmtime CLI.
 set -e
 WASMTIME_DIR=$(dirname "$0" | xargs dirname)
 FIXTURE=https://github.com/intel/openvino-rs/raw/main/crates/openvino/tests/fixtures/mobilenet
@@ -18,12 +18,8 @@ else
     REMOVE_TMP_DIR=0
 fi
 
-# Inform the environment of OpenVINO library locations. Then we use OPENVINO_INSTALL_DIR below to avoid building all of
-# OpenVINO from source (quite slow).
-source /opt/intel/openvino_2022/setupvars.sh
-
 # Build Wasmtime with wasi-nn enabled; we attempt this first to avoid extra work if the build fails.
-OPENVINO_INSTALL_DIR=/opt/intel/openvino_2022 cargo build -p wasmtime-cli --features wasi-nn
+cargo build -p wasmtime-cli --features wasi-nn
 
 # Download all necessary test fixtures to the temporary directory.
 wget --no-clobber $FIXTURE/mobilenet.bin --output-document=$TMP_DIR/model.bin

crates/wasi-nn/Cargo.toml

@@ -17,7 +17,7 @@ anyhow = { workspace = true }
 wiggle = { workspace = true }
 
 # These dependencies are necessary for the wasi-nn implementation:
-openvino = { version = "0.4.2", features = ["runtime-linking"] }
+openvino = { version = "0.5.0", features = ["runtime-linking"] }
 thiserror = { workspace = true }
 
 [build-dependencies]

crates/wasi-nn/src/openvino.rs

@@ -119,7 +119,7 @@ impl BackendExecutionContext for OpenvinoExecutionContext {
 
     fn get_output(&mut self, index: u32, destination: &mut [u8]) -> Result<u32, BackendError> {
         let output_name = self.0.get_output_name(index as usize)?;
-        let mut blob = self.1.get_blob(&output_name)?;
+        let blob = self.1.get_blob(&output_name)?;
         let blob_size = blob.byte_len()?;
         if blob_size > destination.len() {
             return Err(BackendError::NotEnoughMemory(blob_size));

supply-chain/audits.toml

@@ -596,6 +596,11 @@ notes = """
 I am the author of most of these changes.
 """
 
+[[audits.openvino]]
+who = "Andrew Brown <andrew.brown@intel.com>"
+criteria = "safe-to-deploy"
+delta = "0.4.2 -> 0.5.0"
+
 [[audits.openvino-finder]]
 who = "Matthew Tamayo-Rios <matthew@geekbeast.com>"
 criteria = "safe-to-deploy"
@@ -604,6 +609,11 @@ notes = """
 Only updates to Cargo file for versioning.
 """
 
+[[audits.openvino-finder]]
+who = "Andrew Brown <andrew.brown@intel.com>"
+criteria = "safe-to-deploy"
+delta = "0.4.2 -> 0.5.0"
+
 [[audits.openvino-sys]]
 who = "Matthew Tamayo-Rios <matthew@geekbeast.com>"
 criteria = "safe-to-deploy"
@@ -612,6 +622,11 @@ notes = """
 Only updates to tests to use new rust functions for mut pointers.
 """
 
+[[audits.openvino-sys]]
+who = "Andrew Brown <andrew.brown@intel.com>"
+criteria = "safe-to-deploy"
+delta = "0.4.2 -> 0.5.0"
+
 [[audits.peeking_take_while]]
 who = "Nick Fitzgerald <fitzgen@gmail.com>"
 criteria = "safe-to-deploy"