Skip to content

Commit 2c382e0

Browse files
committed
Remove some usages of 'pub' in models (#708)
1 parent 98d001a commit 2c382e0

21 files changed

Lines changed: 58 additions & 58 deletions

File tree

mistralrs-core/src/models/gemma.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,9 @@ pub struct Model {
423423
norm: RmsNorm,
424424
lm_head: Arc<dyn QuantMethod>,
425425
hidden_size: usize,
426-
pub device: Device,
427-
pub cache: Cache,
428-
pub max_seq_len: usize,
426+
device: Device,
427+
cache: Cache,
428+
max_seq_len: usize,
429429
mapper: Box<dyn DeviceMapper + Send + Sync>,
430430
cfg: ModelConfigMetadata,
431431
}

mistralrs-core/src/models/gemma2.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,9 +470,9 @@ pub struct Model {
470470
norm: RmsNorm,
471471
lm_head: Arc<dyn QuantMethod>,
472472
hidden_size: usize,
473-
pub device: Device,
474-
pub cache: Cache,
475-
pub max_seq_len: usize,
473+
device: Device,
474+
cache: Cache,
475+
max_seq_len: usize,
476476
mapper: Box<dyn DeviceMapper + Send + Sync>,
477477
sliding_window: usize,
478478
final_logit_softcapping: Option<f64>,

mistralrs-core/src/models/llama.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,8 @@ pub struct Llama {
388388
blocks: Vec<Block>,
389389
ln_f: RmsNorm,
390390
lm_head: Arc<dyn QuantMethod>,
391-
pub kv_cache: crate::pipeline::Cache,
392-
pub device: Device,
391+
kv_cache: crate::pipeline::Cache,
392+
device: Device,
393393
mapper: Box<dyn DeviceMapper + Send + Sync>,
394394
cfg: ModelConfigMetadata,
395395
}

mistralrs-core/src/models/mistral.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,9 @@ pub struct Model {
411411
norm: RmsNorm,
412412
lm_head: Arc<dyn QuantMethod>,
413413
sliding_window: Option<usize>,
414-
pub device: Device,
415-
pub cache: Cache,
416-
pub max_seq_len: usize,
414+
device: Device,
415+
pub(crate) cache: Cache,
416+
max_seq_len: usize,
417417
mapper: Box<dyn DeviceMapper + Send + Sync>,
418418
cfg: ModelConfigMetadata,
419419
}

mistralrs-core/src/models/mixtral.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -460,9 +460,9 @@ pub struct Model {
460460
norm: RmsNorm,
461461
lm_head: Arc<dyn QuantMethod>,
462462
sliding_window: Option<usize>,
463-
pub device: Device,
464-
pub cache: Cache,
465-
pub max_seq_len: usize,
463+
device: Device,
464+
cache: Cache,
465+
max_seq_len: usize,
466466
mapper: Box<dyn DeviceMapper + Send + Sync>,
467467
cfg: ModelConfigMetadata,
468468
}

mistralrs-core/src/models/phi2.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,9 @@ pub struct Model {
405405
layers: Vec<DecoderLayer>,
406406
final_layernorm: LayerNorm,
407407
lm_head: Arc<dyn QuantMethod>,
408-
pub cache: Cache,
409-
pub device: Device,
410-
pub max_seq_len: usize,
408+
cache: Cache,
409+
device: Device,
410+
max_seq_len: usize,
411411
mapper: Box<dyn DeviceMapper + Send + Sync>,
412412
cfg: ModelConfigMetadata,
413413
}

mistralrs-core/src/models/phi3.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,9 @@ pub struct Model {
398398
layers: Vec<DecoderLayer>,
399399
norm: RmsNorm,
400400
lm_head: Arc<dyn QuantMethod>,
401-
pub device: Device,
402-
pub cache: Cache,
403-
pub max_seq_len: usize,
401+
device: Device,
402+
cache: Cache,
403+
max_seq_len: usize,
404404
mapper: Box<dyn DeviceMapper + Send + Sync>,
405405
sliding_window: Option<usize>,
406406
cfg: ModelConfigMetadata,

mistralrs-core/src/models/qwen2.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,9 @@ pub struct Model {
393393
norm: RmsNorm,
394394
lm_head: Arc<dyn QuantMethod>,
395395
sliding_window: usize,
396-
pub device: Device,
397-
pub cache: Cache,
398-
pub max_seq_len: usize,
396+
device: Device,
397+
cache: Cache,
398+
max_seq_len: usize,
399399
mapper: Box<dyn DeviceMapper + Send + Sync>,
400400
cfg: ModelConfigMetadata,
401401
}

mistralrs-core/src/models/starcoder2.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@ pub struct Model {
392392
norm: LayerNorm,
393393
lm_head: Arc<dyn QuantMethod>,
394394
sliding_window: Option<usize>,
395-
pub device: Device,
396-
pub cache: Cache,
397-
pub max_seq_len: usize,
395+
device: Device,
396+
cache: Cache,
397+
max_seq_len: usize,
398398
mapper: Box<dyn DeviceMapper + Send + Sync>,
399399
cfg: ModelConfigMetadata,
400400
}

mistralrs-core/src/utils/model_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub struct FileGGML {
2121

2222
#[derive(derive_more::From)]
2323
pub struct Device<'a> {
24-
pub device: &'a candle_core::Device,
24+
device: &'a candle_core::Device,
2525
pub mapper: DeviceMapMetadata,
2626
}
2727

0 commit comments

Comments
 (0)