MogensR commited on
Commit
a54098c
·
1 Parent(s): 459d6d2

Update model_loader.py

Browse files
Files changed (1) hide show
  1. model_loader.py +10 -27
model_loader.py CHANGED
@@ -308,7 +308,7 @@ def load_all_models(self, progress_callback: Optional[callable] = None, cancel_e
308
 
309
  matanyone_time = time.time() - matanyone_start
310
  self.loading_stats['matanyone_load_time'] = matanyone_time
311
- logger.info(f"MatAnyone loaded in {matanyone_time:.2f}s")
312
 
313
  # Final setup
314
  total_time = time.time() - start_time
@@ -499,20 +499,12 @@ def _load_matanyone_model(self, progress_callback: Optional[callable] = None):
499
  # ============================================================================ #
500
 
501
  def _load_matanyone_strategy_1(self):
502
- """MatAnyone loading strategy 1: Direct model import"""
503
- from matanyone.model.matanyone import MatAnyOne
504
- from matanyone.inference.inference_core import InferenceCore
505
-
506
- cfg = OmegaConf.create({
507
- 'model': {'name': 'MatAnyOne'},
508
- 'device': str(self.device),
509
- 'fp16': True if self.device.type == 'cuda' else False
510
- })
511
-
512
- net = MatAnyOne(cfg)
513
- core = InferenceCore(net, cfg)
514
 
515
- return net, core
 
 
516
 
517
  def _load_matanyone_strategy_2(self):
518
  """MatAnyone loading strategy 2: Alternative import paths"""
@@ -550,20 +542,11 @@ def _load_matanyone_strategy_3(self):
550
  return model, engine
551
 
552
  def _load_matanyone_strategy_4(self):
553
- """MatAnyone loading strategy 4: Hugging Face Hub approach"""
554
- from huggingface_hub import hf_hub_download
555
- from matanyone import load_model_from_hub
556
-
557
- # Try to load from Hugging Face
558
- model_path = hf_hub_download(
559
- repo_id="PeiqingYang/MatAnyone",
560
- filename="pytorch_model.bin",
561
- cache_dir=self.checkpoints_dir
562
- )
563
-
564
- model = load_model_from_hub(model_path, device=self.device)
565
 
566
- return model, model # Return same object for both
 
567
 
568
  # ============================================================================ #
569
  # MODEL MANAGEMENT AND CLEANUP
 
308
 
309
  matanyone_time = time.time() - matanyone_start
310
  self.loading_stats['matanyone_load_time'] = matanyone_time
311
+ logger.info(f"MatAnyone loaded in {matanyone_time:.1f}s")
312
 
313
  # Final setup
314
  total_time = time.time() - start_time
 
499
  # ============================================================================ #
500
 
501
  def _load_matanyone_strategy_1(self):
502
+ """MatAnyone loading strategy 1: Official HuggingFace InferenceCore"""
503
+ from matanyone import InferenceCore
 
 
 
 
 
 
 
 
 
 
504
 
505
+ # Initialize with the official model repo
506
+ processor = InferenceCore("PeiqingYang/MatAnyone")
507
+ return processor, processor
508
 
509
  def _load_matanyone_strategy_2(self):
510
  """MatAnyone loading strategy 2: Alternative import paths"""
 
542
  return model, engine
543
 
544
  def _load_matanyone_strategy_4(self):
545
+ """MatAnyone loading strategy 4: Direct model class"""
546
+ from matanyone.model.matanyone import MatAnyone
 
 
 
 
 
 
 
 
 
 
547
 
548
+ model = MatAnyone.from_pretrained("not-lain/matanyone")
549
+ return model, model
550
 
551
  # ============================================================================ #
552
  # MODEL MANAGEMENT AND CLEANUP