diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml index 6592f4b..a97ed4c 100644 --- a/.github/workflows/rust-ci.yml +++ b/.github/workflows/rust-ci.yml @@ -22,8 +22,8 @@ jobs: - "" - "vision" - "vlm" - - "ort-download-binaries,ort-api-24" - - "ort-load-dynamic,ort-api-24" + - "ort-download-binaries,ort-api-27" + - "ort-load-dynamic,ort-api-27" - "video" - "viewer" - "annotator" @@ -49,7 +49,7 @@ jobs: - name: Clippy run: | if [ "${{ matrix.feature }}" = "all-features" ]; then - cargo clippy --no-default-features --features "all-models,video,viewer,annotator,ort-download-binaries,ort-load-dynamic,ort-api-24" --all-targets -- -D warnings + cargo clippy --no-default-features --features "all-models,video,viewer,annotator,ort-download-binaries,ort-load-dynamic,ort-api-27" --all-targets -- -D warnings elif [ "${{ matrix.feature }}" = "" ]; then cargo clippy --no-default-features --all-targets -- -D warnings else @@ -74,7 +74,7 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Check - run: cargo check --no-default-features --features "all-models,video,viewer,annotator,ort-download-binaries,ort-load-dynamic,ort-api-24" --all-targets + run: cargo check --no-default-features --features "all-models,video,viewer,annotator,ort-download-binaries,ort-load-dynamic,ort-api-27" --all-targets test: name: cargo-test @@ -94,7 +94,7 @@ jobs: uses: dtolnay/rust-toolchain@nightly - name: Test - run: cargo +nightly test --no-default-features --features "all-models,video,viewer,annotator,ort-download-binaries,ort-load-dynamic,ort-api-24" --all-targets + run: cargo +nightly test --no-default-features --features "all-models,video,viewer,annotator,ort-download-binaries,ort-load-dynamic,ort-api-27" --all-targets build-linux: needs: test @@ -120,4 +120,4 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Build - run: cargo build --no-default-features --features "all-models,video,viewer,annotator,ort-download-binaries,ort-load-dynamic,ort-api-24" \ No newline at end of file + run: cargo build --no-default-features --features "all-models,video,viewer,annotator,ort-download-binaries,ort-load-dynamic,ort-api-27" diff --git a/Cargo.toml b/Cargo.toml index eae6725..453ad19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,10 +40,11 @@ fast_image_resize = { version = "5.5.0", default-features = false, features = [" minifb = { version = "0.28.0", optional = true } video-rs = { version = "0.11.0", features = ["ndarray"], optional = true } ndarray-npy = { version = "0.10", optional = true } -ort = { version = "=2.0.0-rc.12", default-features = false, features = [ +ort = { git = "https://github.com/pykeio/ort", rev = "31c8f1443bb579bfddb82705288347697e468fb3", default-features = false, features = [ "tls-rustls", "copy-dylibs", "half", + "ndarray", "std", ] } cudarc = { version = "0.19", optional = true, default-features = false, features = [ @@ -75,7 +76,7 @@ strip = true [features] -default = ["ort-download-binaries", "vision", "annotator", "ort-api-24"] +default = ["ort-download-binaries", "vision", "annotator", "ort-api-27"] # ONNXRuntime loading strategies ort-download-binaries = ["ort/download-binaries"] @@ -90,6 +91,9 @@ ort-api-21 = ["ort/api-21"] ort-api-22 = ["ort/api-22"] ort-api-23 = ["ort/api-23"] ort-api-24 = ["ort/api-24"] +ort-api-25 = ["ort/api-25"] +ort-api-26 = ["ort/api-26"] +ort-api-27 = ["ort/api-27"] # Cuda features (Internal use) cuda-runtime = ["dep:cudarc"] @@ -324,4 +328,4 @@ required-features = ["vision", "annotator"] [[example]] name = "gaze-estimation" path = "examples/gaze-estimation/main.rs" -required-features = ["vision", "annotator", "video"] \ No newline at end of file +required-features = ["vision", "annotator", "video"] diff --git a/docs/cargo-features/ort.md b/docs/cargo-features/ort.md index c2a53a0..638e85f 100644 --- a/docs/cargo-features/ort.md +++ b/docs/cargo-features/ort.md @@ -10,7 +10,7 @@ ONNX Runtime configuration and API version management. ### API Version Selection -This library supports ONNX Runtime versions 1.17 through 1.24 via API version features. +This library supports ONNX Runtime versions 1.17 through 1.27 via API version features. | Feature | ONNX Runtime | Requirements | |---------|--------------|--------------| @@ -21,11 +21,14 @@ This library supports ONNX Runtime versions 1.17 through 1.24 via API version fe | `ort-api-21` | v1.21 | - | | `ort-api-22` | v1.22 | - | | `ort-api-23` | v1.23 | - | -| `ort-api-24` | v1.24 | **Default** - Latest features | +| `ort-api-24` | v1.24 | - | +| `ort-api-25` | v1.25 | - | +| `ort-api-26` | v1.26 | - | +| `ort-api-27` | v1.27 | **Default** - Latest features | !!! tip "API Version Selection" ```toml - # Default uses api-24 (latest) + # Default uses api-27 (latest) usls = { version = "0.2", features = ["vision"] } # Specify API version explicitly @@ -34,4 +37,4 @@ This library supports ONNX Runtime versions 1.17 through 1.24 via API version fe !!! note "Version Compatibility" - Each API version includes all features from previous versions - - Check [ORT multiversion docs](https://ort.pyke.io/setup/multiversion) for minimum version requirements \ No newline at end of file + - Check [ORT multiversion docs](https://ort.pyke.io/setup/multiversion) for minimum version requirements diff --git a/src/ort/dtype.rs b/src/ort/dtype.rs index 589c773..fd8a7f1 100644 --- a/src/ort/dtype.rs +++ b/src/ort/dtype.rs @@ -25,6 +25,7 @@ impl From for crate::DType { TensorElementType::Complex128 => Self::Complex128, TensorElementType::Bool => Self::Uint8, TensorElementType::String | TensorElementType::Undefined => Self::Auto, + _ => Self::Auto, } } }