From 015029b5e086965b39db4e4eabf4c612dba7a2dd Mon Sep 17 00:00:00 2001 From: kozistr Date: Sun, 17 Nov 2024 16:20:12 +0900 Subject: [PATCH] update dependency --- Cargo.lock | 26 +++++++++++++++++--------- backends/ort/Cargo.toml | 4 ++-- backends/ort/src/lib.rs | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 837abcbb..38c868f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2311,14 +2311,16 @@ dependencies = [ [[package]] name = "ndarray" -version = "0.15.6" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841" dependencies = [ "matrixmultiply", "num-complex", "num-integer", "num-traits", + "portable-atomic", + "portable-atomic-util", "rawpointer", ] @@ -2774,24 +2776,21 @@ dependencies = [ [[package]] name = "ort" -version = "2.0.0-rc.4" +version = "2.0.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d83095ae3c1258738d70ae7a06195c94d966a8e546f0d3609dc90885fb61f5" +checksum = "11826e6118cc42fea0cb2b102f7d006c1bb339cb167f8badb5fb568616438234" dependencies = [ "half", - "js-sys", "ndarray", "ort-sys", - "thiserror", "tracing", - "web-sys", ] [[package]] name = "ort-sys" -version = "2.0.0-rc.4" +version = "2.0.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2f6427193c808010b126bef45ebd33f8dee43770223a1200f84d3734d6c656" +checksum = "c4780a8b8681e653b2bed85c7f0e2c6e8547224c3e983e5ad27bf0457e012407" dependencies = [ "flate2", "pkg-config", @@ -2901,6 +2900,15 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +[[package]] +name = "portable-atomic-util" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90a7d5beecc52a491b54d6dd05c7a45ba1801666a5baad9fdbfc6fef8d2d206c" +dependencies = [ + "portable-atomic", +] + [[package]] name = "powerfmt" version = "0.2.0" diff --git a/backends/ort/Cargo.toml b/backends/ort/Cargo.toml index 0d40fddd..40ccc560 100644 --- a/backends/ort/Cargo.toml +++ b/backends/ort/Cargo.toml @@ -8,9 +8,9 @@ homepage.workspace = true [dependencies] anyhow = { workspace = true } nohash-hasher = { workspace = true } -ndarray = "0.15.6" +ndarray = "0.16.1" num_cpus = { workspace = true } -ort = { version = "2.0.0-rc.4", default-features = false, features = ["download-binaries", "half", "onednn", "ndarray"] } +ort = { version = "2.0.0-rc.8", default-features = false, features = ["download-binaries", "half", "onednn", "ndarray"] } text-embeddings-backend-core = { path = "../core" } tracing = { workspace = true } thiserror = { workspace = true } diff --git a/backends/ort/src/lib.rs b/backends/ort/src/lib.rs index 08dbfa7e..ab38fcc1 100644 --- a/backends/ort/src/lib.rs +++ b/backends/ort/src/lib.rs @@ -246,7 +246,7 @@ impl Backend for OrtBackend { if has_raw_requests { // Reshape outputs let s = outputs.shape().to_vec(); - let outputs = outputs.into_shape((s[0] * s[1], s[2])).e()?; + let outputs = outputs.into_shape_with_order((s[0] * s[1], s[2])).e()?; // We need to remove the padding tokens only if batch_size > 1 and there are some // member of the batch that require pooling