fix: validate that gpu_memory_limit and max_memory are not both set

src/axolotl/utils/config.py

@@ -462,6 +462,11 @@ def validate_config(cfg):
             "lora_modules_to_save not properly set yet adding new tokens. Please add `embed_tokens` and `lm_head` to `lora_modules_to_save`."
         )
 
+    if cfg.max_memory is not None and cfg.gpu_memory_limit is not None:
+        raise ValueError(
+            "max_memory and gpu_memory_limit are mutually exclusive and cannot be used together."
+        )
+
     # TODO
     # MPT 7b
     # https://github.com/facebookresearch/bitsandbytes/issues/25

src/axolotl/utils/models.py

@@ -302,7 +302,7 @@ def load_model(
     max_memory = cfg.max_memory
     device_map = cfg.device_map
 
-    if cfg.gpu_memory_limit and max_memory is None:
+    if cfg.gpu_memory_limit:
         gpu_memory_limit = (
             str(cfg.gpu_memory_limit) + "GiB"
             if isinstance(cfg.gpu_memory_limit, int)