From 3a337cfdeda3bd298e6d09da953f5d81eed8437e Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Fri, 14 Apr 2023 15:35:06 -0300 Subject: [PATCH] Use argparse defaults --- modules/shared.py | 1 + server.py | 15 ++++----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/modules/shared.py b/modules/shared.py index 1822d0f7..02306147 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -147,6 +147,7 @@ parser.add_argument('--auto-launch', action='store_true', default=False, help='O parser.add_argument("--gradio-auth-path", type=str, help='Set the gradio authentication file path. The file should contain one or more user:password pairs in this format: "u1:p1,u2:p2,u3:p3"', default=None) args = parser.parse_args() +args_defaults = parser.parse_args([]) # Deprecation warnings for parameters that have been renamed deprecated_dict = {} diff --git a/server.py b/server.py index d46ffc30..a4af1077 100644 --- a/server.py +++ b/server.py @@ -188,14 +188,7 @@ def download_model_wrapper(repo_id): def update_model_parameters(state, initial=False): elements = ui.list_model_elements() # the names of the parameters gpu_memories = [] - defaults = { - 'wbits': 0, - 'groupsize': -1, - 'cpu_memory': None, - 'gpu_memory': None, - 'model_type': None, - 'pre_layer': 0 - } + for i, element in enumerate(elements): if element not in state: continue @@ -205,14 +198,14 @@ def update_model_parameters(state, initial=False): gpu_memories.append(value) continue - if initial and eval(f"shared.args.{element}") != defaults[element]: + if initial and vars(shared.args)[element] != vars(shared.args_defaults)[element]: continue # Setting null defaults if element in ['wbits', 'groupsize', 'model_type'] and value == 'None': - value = defaults[element] + value = vars(shared.args_defaults)[element] elif element in ['cpu_memory'] and value == 0: - value = defaults[element] + value = vars(shared.args_defaults)[element] # Making some simple conversions if element in ['wbits', 'groupsize', 'pre_layer']: