Skip to content

Commit b17455c

Browse files
authored
make AdapterPaths and LoraAdapterPaths public (#1314)
Make `AdapterPaths` and `LoraAdapterPaths` public so `LocalModelPaths` can be constructed outside of `mistralrs-core`.
1 parent 7bff8bb commit b17455c

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

mistralrs-core/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@ pub use gguf::{GGUFArchitecture, GGUF_MULTI_FILE_DELIMITER};
8383
pub use mistralrs_quant::{IsqType, MULTI_LORA_DELIMITER};
8484
pub use paged_attention::{MemoryGpuConfig, PagedAttentionConfig};
8585
pub use pipeline::{
86-
chat_template::ChatTemplate, parse_isq_value, AnyMoeLoader, AnyMoePipeline,
86+
chat_template::ChatTemplate, parse_isq_value, AdapterPaths, AnyMoeLoader, AnyMoePipeline,
8787
AutoDeviceMapParams, DiffusionGenerationParams, DiffusionLoader, DiffusionLoaderBuilder,
8888
DiffusionLoaderType, DiffusionSpecificConfig, GGMLLoader, GGMLLoaderBuilder,
8989
GGMLSpecificConfig, GGUFLoader, GGUFLoaderBuilder, GGUFSpecificConfig, GemmaLoader,
9090
Idefics2Loader, IsqOrganization, LLaVALoader, LLaVANextLoader, LlamaLoader, Loader,
91-
LocalModelPaths, MistralLoader, MixtralLoader, ModelKind, ModelPaths, NormalLoader,
92-
NormalLoaderBuilder, NormalLoaderType, NormalSpecificConfig, Phi2Loader, Phi3Loader,
93-
Phi3VLoader, Qwen2Loader, SpeculativeConfig, SpeculativeLoader, SpeculativePipeline,
94-
Starcoder2Loader, TokenSource, VisionLoader, VisionLoaderBuilder, VisionLoaderType,
95-
VisionPromptPrefixer, VisionSpecificConfig, UQFF_MULTI_FILE_DELIMITER,
91+
LocalModelPaths, LoraAdapterPaths, MistralLoader, MixtralLoader, ModelKind, ModelPaths,
92+
NormalLoader, NormalLoaderBuilder, NormalLoaderType, NormalSpecificConfig, Phi2Loader,
93+
Phi3Loader, Phi3VLoader, Qwen2Loader, SpeculativeConfig, SpeculativeLoader,
94+
SpeculativePipeline, Starcoder2Loader, TokenSource, VisionLoader, VisionLoaderBuilder,
95+
VisionLoaderType, VisionPromptPrefixer, VisionSpecificConfig, UQFF_MULTI_FILE_DELIMITER,
9696
};
9797
pub use request::{
9898
ApproximateUserLocation, Constraint, DetokenizationRequest, ImageGenerationResponseFormat,

mistralrs-core/src/pipeline/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ pub use loaders::{
4545
};
4646
use mistralrs_quant::IsqType;
4747
pub use normal::{NormalLoader, NormalLoaderBuilder, NormalSpecificConfig};
48-
pub(crate) use paths::{
49-
get_chat_template, get_model_paths, get_xlora_paths, AdapterPaths, LoraAdapterPaths,
50-
};
48+
pub(crate) use paths::{get_chat_template, get_model_paths, get_xlora_paths};
49+
pub use paths::{AdapterPaths, LoraAdapterPaths};
5150
pub(crate) use processing::{
5251
apply_chat_template, BasicProcessor, MessagesAction, Processor, ProcessorCreator,
5352
};

0 commit comments

Comments
 (0)