rename SimpleModelPaths -> LocalModelPaths

EricLBuehler · May 15, 2024 · 07ea5b3 · 07ea5b3
1 parent 67ba9ad
commit 07ea5b3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/mistralrs-core/src/lib.rs b/mistralrs-core/src/lib.rs
@@ -41,7 +41,7 @@ pub use pipeline::{
     GGMLLoader, GGMLLoaderBuilder, GGMLSpecificConfig, GGUFLoader, GGUFLoaderBuilder,
     GGUFSpecificConfig, GemmaLoader, LlamaLoader, Loader, MistralLoader, MixtralLoader, ModelKind,
     ModelPaths, NormalLoader, NormalLoaderBuilder, NormalLoaderType, NormalSpecificConfig, Phi2Loader,
-    Phi3Loader, Qwen2Loader, SimpleModelPaths, SpeculativeConfig, SpeculativeLoader, SpeculativePipeline,
+    Phi3Loader, Qwen2Loader, LocalModelPaths, SpeculativeConfig, SpeculativeLoader, SpeculativePipeline,
     TokenSource,
 };
 pub use request::{Constraint, NormalRequest, Request, RequestMessage};

diff --git a/mistralrs-core/src/pipeline/ggml.rs b/mistralrs-core/src/pipeline/ggml.rs
@@ -7,7 +7,7 @@ use crate::aici::bintokens::build_tok_trie;
 use crate::aici::toktree::TokTrie;
 use crate::pipeline::chat_template::calculate_eos_tokens;
 use crate::pipeline::Cache;
-use crate::pipeline::{ChatTemplate, SimpleModelPaths};
+use crate::pipeline::{ChatTemplate, LocalModelPaths};
 use crate::prefix_cacher::PrefixCacheManager;
 use crate::sequence::Sequence;
 use crate::utils::varbuilder_utils::{from_mmaped_safetensors, load_preload_adapters};
@@ -359,7 +359,7 @@ impl Loader for GGMLLoader {
         in_situ_quant: Option<GgmlDType>,
     ) -> Result<Arc<Mutex<dyn Pipeline + Send + Sync>>> {
         let paths: anyhow::Result<Box<dyn ModelPaths>> = get_paths!(
-            SimpleModelPaths,
+            LocalModelPaths,
             &token_source,
             revision,
             self,

diff --git a/mistralrs-core/src/pipeline/gguf.rs b/mistralrs-core/src/pipeline/gguf.rs
@@ -7,7 +7,7 @@ use crate::aici::bintokens::build_tok_trie;
 use crate::aici::toktree::TokTrie;
 use crate::pipeline::chat_template::calculate_eos_tokens;
 use crate::pipeline::Cache;
-use crate::pipeline::{ChatTemplate, SimpleModelPaths};
+use crate::pipeline::{ChatTemplate, LocalModelPaths};
 use crate::prefix_cacher::PrefixCacheManager;
 use crate::sequence::Sequence;
 use crate::utils::varbuilder_utils::{from_mmaped_safetensors, load_preload_adapters};
@@ -287,7 +287,7 @@ impl Loader for GGUFLoader {
         in_situ_quant: Option<GgmlDType>,
     ) -> Result<Arc<Mutex<dyn Pipeline + Send + Sync>>> {
         let paths: anyhow::Result<Box<dyn ModelPaths>> = get_paths!(
-            SimpleModelPaths,
+            LocalModelPaths,
             &token_source,
             revision,
             self,

diff --git a/mistralrs-core/src/pipeline/mod.rs b/mistralrs-core/src/pipeline/mod.rs
@@ -95,7 +95,7 @@ pub trait ModelPaths  {
 }
 
 #[derive(Clone)]
-pub struct SimpleModelPaths<P> {
+pub struct LocalModelPaths<P> {
     tokenizer_filename: P,
     config_filename: P,
     template_filename: P,
@@ -109,7 +109,7 @@ pub struct SimpleModelPaths<P> {
     lora_preload_adapter_info: Option<HashMap<String, (P, LoraConfig)>>,
 }
 
-impl<P> SimpleModelPaths<P> {
+impl<P> LocalModelPaths<P> {
     pub fn new(
         tokenizer_filename: P,
         config_filename: P,
@@ -140,7 +140,7 @@ impl<P> SimpleModelPaths<P> {
 }
 
 
-impl ModelPaths for SimpleModelPaths<PathBuf> {
+impl ModelPaths for LocalModelPaths<PathBuf> {
     fn get_config_filename(&self) -> &PathBuf {
         &self.config_filename
     }

diff --git a/mistralrs-core/src/pipeline/normal.rs b/mistralrs-core/src/pipeline/normal.rs
@@ -11,7 +11,7 @@ use crate::aici::bintokens::build_tok_trie;
 use crate::aici::toktree::TokTrie;
 use crate::pipeline::chat_template::calculate_eos_tokens;
 use crate::pipeline::Cache;
-use crate::pipeline::{ChatTemplate, SimpleModelPaths};
+use crate::pipeline::{ChatTemplate, LocalModelPaths};
 use crate::prefix_cacher::PrefixCacheManager;
 use crate::sequence::Sequence;
 use crate::utils::{tokens::get_token, varbuilder_utils::from_mmaped_safetensors};
@@ -181,7 +181,7 @@ impl Loader for NormalLoader {
         in_situ_quant: Option<GgmlDType>,
     ) -> Result<Arc<Mutex<dyn Pipeline + Send + Sync>>> {
         let paths: anyhow::Result<Box<dyn ModelPaths>> = get_paths!(
-            SimpleModelPaths,
+            LocalModelPaths,
             &token_source,
             revision,
             self,