dagloop5 commited on
Commit
d01a956
·
verified ·
1 Parent(s): 817abe5

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +14 -13
app.py CHANGED
@@ -525,7 +525,7 @@ def apply_prepared_lora_state_to_pipeline():
525
  print("[LoRA] Prepared LoRA state already active; skipping.")
526
  return True
527
 
528
- existing_transformer = get_transformer()
529
  with torch.no_grad():
530
  missing, unexpected = existing_transformer.load_state_dict(PENDING_LORA_STATE, strict=False)
531
  if missing or unexpected:
@@ -562,18 +562,19 @@ _spatial_upsampler = _orig_spatial_upsampler_factory()
562
  _text_encoder = _orig_text_encoder_factory()
563
  _embeddings_processor = _orig_gemma_embeddings_factory()
564
 
565
- # Do NOT build the transformer here.
566
- # Build it lazily only when generation or LoRA application actually needs it.
567
- _transformer = None
568
-
569
- def get_transformer():
570
- global _transformer
571
- if _transformer is None:
572
- _transformer = _orig_transformer_factory()
573
- return _transformer
 
574
 
575
- # Replace ledger methods with lightweight getters.
576
- ledger.transformer = get_transformer
577
  ledger.video_encoder = lambda: _video_encoder
578
  ledger.video_decoder = lambda: _video_decoder
579
  ledger.audio_encoder = lambda: _audio_encoder
@@ -583,7 +584,7 @@ ledger.spatial_upsampler = lambda: _spatial_upsampler
583
  ledger.text_encoder = lambda: _text_encoder
584
  ledger.gemma_embeddings_processor = lambda: _embeddings_processor
585
 
586
- print("All non-transformer models preloaded; transformer will be built lazily.")
587
  # ---- REPLACE PRELOAD BLOCK END ----
588
 
589
  print("=" * 80)
 
525
  print("[LoRA] Prepared LoRA state already active; skipping.")
526
  return True
527
 
528
+ existing_transformer = _transformer
529
  with torch.no_grad():
530
  missing, unexpected = existing_transformer.load_state_dict(PENDING_LORA_STATE, strict=False)
531
  if missing or unexpected:
 
562
  _text_encoder = _orig_text_encoder_factory()
563
  _embeddings_processor = _orig_gemma_embeddings_factory()
564
 
565
+ # Call the original factories once to create the cached instances we will serve by default.
566
+ _transformer = _orig_transformer_factory()
567
+ _video_encoder = _orig_video_encoder_factory()
568
+ _video_decoder = _orig_video_decoder_factory()
569
+ _audio_encoder = _orig_audio_encoder_factory()
570
+ _audio_decoder = _orig_audio_decoder_factory()
571
+ _vocoder = _orig_vocoder_factory()
572
+ _spatial_upsampler = _orig_spatial_upsampler_factory()
573
+ _text_encoder = _orig_text_encoder_factory()
574
+ _embeddings_processor = _orig_gemma_embeddings_factory()
575
 
576
+ # Replace ledger methods with lightweight lambdas that return the cached instances.
577
+ ledger.transformer = lambda: _transformer
578
  ledger.video_encoder = lambda: _video_encoder
579
  ledger.video_decoder = lambda: _video_decoder
580
  ledger.audio_encoder = lambda: _audio_encoder
 
584
  ledger.text_encoder = lambda: _text_encoder
585
  ledger.gemma_embeddings_processor = lambda: _embeddings_processor
586
 
587
+ print("All models preloaded (including Gemma text encoder and audio encoder)!")
588
  # ---- REPLACE PRELOAD BLOCK END ----
589
 
590
  print("=" * 80)