From 9712da61e89b828925b6e6993a94be2c13a9c09f Mon Sep 17 00:00:00 2001 From: Eric Buehler <65165915+EricLBuehler@users.noreply.github.com> Date: Tue, 4 Jun 2024 22:14:54 -0400 Subject: [PATCH] Patch incorrect unwrap and bump version (#383) * Patch incorrect unwrap * Bump version to 0.1.15 --- Cargo.toml | 2 +- mistralrs-bench/Cargo.toml | 2 +- mistralrs-pyo3/Cargo.toml | 2 +- mistralrs-pyo3/Cargo_template.toml | 2 +- mistralrs-pyo3/pyproject.toml | 2 +- mistralrs-pyo3/pyproject_template.toml | 2 +- mistralrs-pyo3/src/lib.rs | 21 ++++++++++++--------- mistralrs-server/Cargo.toml | 2 +- mistralrs/Cargo.toml | 2 +- 9 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fd7e341f3..f5d322a42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.1.14" +version = "0.1.15" edition = "2021" description = "Fast and easy LLM serving." homepage = "https://github.com/EricLBuehler/mistral.rs" diff --git a/mistralrs-bench/Cargo.toml b/mistralrs-bench/Cargo.toml index 66eb1a2b8..0c4ebdb80 100644 --- a/mistralrs-bench/Cargo.toml +++ b/mistralrs-bench/Cargo.toml @@ -17,7 +17,7 @@ candle-core.workspace = true serde.workspace = true serde_json.workspace = true clap.workspace = true -mistralrs-core = { version = "0.1.14", path = "../mistralrs-core" } +mistralrs-core = { version = "0.1.15", path = "../mistralrs-core" } tracing.workspace = true either.workspace = true tokio.workspace = true diff --git a/mistralrs-pyo3/Cargo.toml b/mistralrs-pyo3/Cargo.toml index 7b61427c7..aed0a877a 100644 --- a/mistralrs-pyo3/Cargo.toml +++ b/mistralrs-pyo3/Cargo.toml @@ -17,7 +17,7 @@ doc = false [dependencies] pyo3.workspace = true -mistralrs-core = { version = "0.1.14", path = "../mistralrs-core", features = ["pyo3_macros"] } +mistralrs-core = { version = "0.1.15", path = "../mistralrs-core", features = ["pyo3_macros"] } serde.workspace = true serde_json.workspace = true candle-core.workspace = true diff --git a/mistralrs-pyo3/Cargo_template.toml b/mistralrs-pyo3/Cargo_template.toml index 3b3cb48b7..683239db7 100644 --- a/mistralrs-pyo3/Cargo_template.toml +++ b/mistralrs-pyo3/Cargo_template.toml @@ -17,7 +17,7 @@ doc = false [dependencies] pyo3.workspace = true -mistralrs-core = { version = "0.1.14", path = "../mistralrs-core", features=["pyo3_macros","$feature_name"] } +mistralrs-core = { version = "0.1.15", path = "../mistralrs-core", features=["pyo3_macros","$feature_name"] } serde.workspace = true serde_json.workspace = true candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.5.0", features=["$feature_name"] } diff --git a/mistralrs-pyo3/pyproject.toml b/mistralrs-pyo3/pyproject.toml index 094b9dcd2..8b8339cfc 100644 --- a/mistralrs-pyo3/pyproject.toml +++ b/mistralrs-pyo3/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "mistralrs" -version = "0.1.14" +version = "0.1.15" requires-python = ">=3.8" classifiers = [ "Programming Language :: Rust", diff --git a/mistralrs-pyo3/pyproject_template.toml b/mistralrs-pyo3/pyproject_template.toml index 7ba27d1a1..2ec480ef4 100644 --- a/mistralrs-pyo3/pyproject_template.toml +++ b/mistralrs-pyo3/pyproject_template.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "$name" -version = "0.1.14" +version = "0.1.15" requires-python = ">=3.8" classifiers = [ "Programming Language :: Rust", diff --git a/mistralrs-pyo3/src/lib.rs b/mistralrs-pyo3/src/lib.rs index dd6918dd2..1c9ff3916 100644 --- a/mistralrs-pyo3/src/lib.rs +++ b/mistralrs-pyo3/src/lib.rs @@ -177,9 +177,10 @@ fn parse_which( chat_template, tok_model_id, quantized_model_id, - quantized_filename - .map_left(|file| vec![file]) - .unwrap_right(), + match quantized_filename { + Either::Left(l) => vec![l], + Either::Right(r) => r, + }, ) .build(), Which::XLoraGGUF { @@ -197,9 +198,10 @@ fn parse_which( chat_template, tok_model_id, quantized_model_id, - quantized_filename - .map_left(|file| vec![file]) - .unwrap_right(), + match quantized_filename { + Either::Left(l) => vec![l], + Either::Right(r) => r, + }, ) .with_xlora( xlora_model_id, @@ -226,9 +228,10 @@ fn parse_which( chat_template, tok_model_id, quantized_model_id, - quantized_filename - .map_left(|file| vec![file]) - .unwrap_right(), + match quantized_filename { + Either::Left(l) => vec![l], + Either::Right(r) => r, + }, ) .with_lora( adapters_model_id, diff --git a/mistralrs-server/Cargo.toml b/mistralrs-server/Cargo.toml index 6a07e9a14..7616238f3 100644 --- a/mistralrs-server/Cargo.toml +++ b/mistralrs-server/Cargo.toml @@ -22,7 +22,7 @@ axum = { version = "0.7.4", features = ["tokio"] } tower-http = { version = "0.5.1", features = ["cors"]} utoipa = { version = "4.2", features = ["axum_extras"] } utoipa-swagger-ui = { version = "7.1.0", features = ["axum"]} -mistralrs-core = { version = "0.1.14", path = "../mistralrs-core" } +mistralrs-core = { version = "0.1.15", path = "../mistralrs-core" } dyn-fmt = "0.4.0" indexmap.workspace = true accelerate-src = { workspace = true, optional = true } diff --git a/mistralrs/Cargo.toml b/mistralrs/Cargo.toml index a282d05f5..fa1246106 100644 --- a/mistralrs/Cargo.toml +++ b/mistralrs/Cargo.toml @@ -12,7 +12,7 @@ license.workspace = true homepage.workspace = true [dependencies] -mistralrs-core = { version = "0.1.14", path = "../mistralrs-core" } +mistralrs-core = { version = "0.1.15", path = "../mistralrs-core" } anyhow.workspace = true tokio.workspace = true candle-core.workspace = true