Skip to content

chore(deps): bump ort rc.10 → rc.13 and ndarray 0.16 → 0.17 (supersedes #150 and #152) - #195

Open
Teagan42 wants to merge 1 commit into
mainfrom
deps/ort-rc13-ndarray-0.17
Open

chore(deps): bump ort rc.10 → rc.13 and ndarray 0.16 → 0.17 (supersedes #150 and #152)#195
Teagan42 wants to merge 1 commit into
mainfrom
deps/ort-rc13-ndarray-0.17

Conversation

@Teagan42

Copy link
Copy Markdown
Contributor

Summary

Consolidates the two dependency bumps that had to move together:

Individually they don't build: `ort` rc.13's `Tensor::from_array` is generic over `OwnedTensorArrayData`, whose impl for owned arrays lives on ndarray 0.17. Bumping ort alone (#150) fails to compile `conduit-vad`; bumping ndarray alone (#152) fails the same way from the other direction.

Doing them together compiles and tests clean.

Code change

One arm of `conduit-vad::onnx` needed fixing: `Session::builder()` in ort rc.13 parameterises each builder step's error type by builder state, so chaining with `and_then` on a single `Result` no longer type-checks. Rewriting the chain through `?` in a closure keeps behaviour identical.

`Tensor::from_array` call sites in `conduit-vad` are unchanged — they pick up ndarray 0.17's trait impl automatically.

Test plan

  • `cargo check --workspace` — clean
  • `cargo test -p conduit-vad --features onnx` — 6/6 pass
  • `cargo test -p conduit-wake --features onnx` — 6/6 pass
  • `cargo fmt --all --check` — clean
  • `cargo clippy -p conduit-vad --features onnx -- -D warnings` — clean

Closes #150. Closes #152.

Supersedes #150 (patch-and-minor group) and #152 (ndarray). These
two dependency bumps had to move together: ort rc.13's Tensor API is
generic over the OwnedTensorArrayData trait that only ndarray 0.17
implements, and ort rc.13 is what's needed for base64 0.23.1 (the
other member of the patch-and-minor group) to resolve cleanly.

Code changes in conduit-vad/src/onnx.rs:
- Session::builder() chain rewritten. ort rc.13 parameterises the
  builder-step error type by builder state, so chaining with and_then
  on a single Result<SessionBuilder> no longer type-checks. Threading
  each step through ? in a closure keeps behaviour identical.
- Tensor::from_array calls unchanged: they now pick up the ndarray
  0.17 trait impl automatically.

Test plan:
- cargo check --workspace: clean.
- cargo test -p conduit-vad --features onnx: 6/6 pass.
- cargo test -p conduit-wake --features onnx: 6/6 pass.
- cargo fmt --all --check: clean.
- cargo clippy -p conduit-vad --features onnx -- -D warnings: clean.

Closes #150. Closes #152.
@github-code-quality

Copy link
Copy Markdown
Contributor

Code Coverage Overview

Languages: Rust

Rust / code-coverage/llvm-cov

The overall coverage in commit 8092588 in the deps/ort-rc13-ndarra... branch remains at 89%, unchanged from commit 7380638 in the main branch.

Show a code coverage summary of the most impacted files.
File main 7380638 deps/ort-rc13-ndarra... 8092588 +/-
crates/conduit-...enai/src/tts.rs 99% 97% -2%
crates/conduit-vad/src/onnx.rs 34% 33% -1%

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants