From 91210ee2361344612698c06e2aa9731d5a474d0b Mon Sep 17 00:00:00 2001 From: Sean Sube Date: Tue, 14 Mar 2023 23:32:18 -0500 Subject: [PATCH] remove extra param, correct output path --- api/onnx_web/convert/diffusion/lora.py | 4 ++-- api/onnx_web/diffusers/load.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/onnx_web/convert/diffusion/lora.py b/api/onnx_web/convert/diffusion/lora.py index 32ea7990..7a643377 100644 --- a/api/onnx_web/convert/diffusion/lora.py +++ b/api/onnx_web/convert/diffusion/lora.py @@ -238,8 +238,8 @@ if __name__ == "__main__": logger.info("successfully loaded blended model: %s", [i.name for i in sess.get_inputs()]) else: convert_model_to_external_data(blend_model, all_tensors_to_one_file=True, location=f"lora-{args.type}.pb") - bare_model = write_external_data_tensors(blend_model, args.path) - dest_file = path.join(args.path, f"lora-{args.type}.onnx") + bare_model = write_external_data_tensors(blend_model, args.dest) + dest_file = path.join(args.dest, f"lora-{args.type}.onnx") with open(dest_file, "w+b") as model_file: model_file.write(bare_model.SerializeToString()) diff --git a/api/onnx_web/diffusers/load.py b/api/onnx_web/diffusers/load.py index ee1719c5..7ee12a06 100644 --- a/api/onnx_web/diffusers/load.py +++ b/api/onnx_web/diffusers/load.py @@ -248,7 +248,7 @@ def load_pipeline( logger.info("blending base model %s with LoRA models: %s", model, lora_models) # blend and load text encoder - blended_text_encoder = merge_lora(path.join(model, "text_encoder", "model.onnx"), lora_models, None, "text_encoder") + blended_text_encoder = merge_lora(path.join(model, "text_encoder", "model.onnx"), lora_models, "text_encoder") (text_encoder_model, text_encoder_data) = buffer_external_data_tensors(blended_text_encoder) text_encoder_names, text_encoder_values = zip(*text_encoder_data) text_encoder_opts = SessionOptions() @@ -262,7 +262,7 @@ def load_pipeline( ) # blend and load unet - blended_unet = merge_lora(path.join(model, "unet", "model.onnx"), lora_models, None, "unet") + blended_unet = merge_lora(path.join(model, "unet", "model.onnx"), lora_models, "unet") (unet_model, unet_data) = buffer_external_data_tensors(blended_unet) unet_names, unet_values = zip(*unet_data) unet_opts = SessionOptions()