Pull upstream changes, fix conflict

2025-06-05 21:59:24 +02:00 · 2023-06-04 09:06:31 +02:00
parent 974328ed22 0ac2800601
commit eace95cc72
15 changed files with 85 additions and 69 deletions
--- a/modeling/inference_models/generic_hf_torch/class.py
+++ b/modeling/inference_models/generic_hf_torch/class.py
@@ -251,7 +251,7 @@ class model_backend(HFTorchInferenceModel):

        
        if utils.koboldai_vars.hascuda:
-            if self.usegpu:
+            if self.usegpu or self.nobreakmodel:
                # Use just VRAM
                self.model = self.model.half().to(utils.koboldai_vars.gpu_device)
            elif self.breakmodel: