do not use wasi-nn onnx feature if riskv or s390

Signed-off-by: David Justice <david@devigned.com>
bytecodealliance · Mar 12, 2024 · 5e80466 · 5e80466
1 parent 9311e3a
commit 5e80466
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -560,7 +560,7 @@ jobs:
         fi
 
     # Build and test all features
-    - run: ./ci/run-tests.sh --locked
+    - run: ./ci/run-tests.sh ${{ matrix.extra_features }} --locked
       env:
         RUST_BACKTRACE: 1
 

diff --git a/ci/build-test-matrix.js b/ci/build-test-matrix.js
@@ -39,42 +39,49 @@ const array = [
     "os": "ubuntu-latest",
     "name": "Test Linux x86_64",
     "filter": "linux-x64",
-    "isa": "x64"
+    "isa": "x64",
+    "extra_features": "--features wasmtime-wasi-nn/onnx"
   },
   {
     "os": "ubuntu-latest",
     "name": "Test MSRV on Linux x86_64",
     "filter": "linux-x64",
     "isa": "x64",
     "rust": "msrv",
+    "extra_features": "--features wasmtime-wasi-nn/onnx"
   },
   {
     "os": "ubuntu-latest",
     "name": "Test Linux x86_64 with MPK",
     "filter": "linux-x64",
-    "isa": "x64"
+    "isa": "x64",
+    "extra_features": "--features wasmtime-wasi-nn/onnx"
   },
   {
     "os": "macos-latest",
     "name": "Test macOS x86_64",
-    "filter": "macos-x64"
+    "filter": "macos-x64",
+    "extra_features": "--features wasmtime-wasi-nn/onnx"
   },
   {
     "os": "macos-14",
     "name": "Test macOS arm64",
     "filter": "macos-arm64",
-    "target": "aarch64-apple-darwin"
+    "target": "aarch64-apple-darwin",
+    "extra_features": "--features wasmtime-wasi-nn/onnx"
   },
   {
     "os": "windows-latest",
     "name": "Test Windows MSVC x86_64",
-    "filter": "windows-x64"
+    "filter": "windows-x64",
+    "extra_features": "--features wasmtime-wasi-nn/onnx"
   },
   {
     "os": "windows-latest",
     "target": "x86_64-pc-windows-gnu",
     "name": "Test Windows MinGW x86_64",
-    "filter": "mingw-x64"
+    "filter": "mingw-x64",
+    "extra_features": "--features wasmtime-wasi-nn/onnx"
   },
   {
     "os": "ubuntu-latest",
@@ -85,7 +92,8 @@ const array = [
     "qemu_target": "aarch64-linux-user",
     "name": "Test Linux arm64",
     "filter": "linux-arm64",
-    "isa": "aarch64"
+    "isa": "aarch64",
+    "extra_features": "--features wasmtime-wasi-nn/onnx"
   },
   {
     "os": "ubuntu-latest",
@@ -96,7 +104,8 @@ const array = [
     "qemu_target": "s390x-linux-user",
     "name": "Test Linux s390x",
     "filter": "linux-s390x",
-    "isa": "s390x"
+    "isa": "s390x",
+    "extra_features": ""
   },
   {
     "os": "ubuntu-latest",
@@ -108,6 +117,7 @@ const array = [
     "name": "Test Linux riscv64",
     "filter": "linux-riscv64",
     "isa": "riscv64",
+    "extra_features": ""
   }
 ];
 

diff --git a/ci/run-tests.sh b/ci/run-tests.sh
@@ -5,7 +5,6 @@ cargo test \
     --features wasi-http \
     --features component-model \
     --features serve \
-    --features wasmtime-wasi-nn/onnx \
     --workspace \
     --exclude test-programs \
     $@