update

.gitignore

@@ -1,2 +1,3 @@
 experiments/*
-trash/*
+trash/*
+scripts/*

app.py

@@ -101,7 +101,7 @@ def reload_custom_diffusion_weight_list() -> dict:
     return gr.update(choices=find_weight_files())
 
 
-def create_inference_demo(func: inference_fn, device=args.device) -> gr.Blocks:
+def create_inference_demo(func: inference_fn, device) -> gr.Blocks:
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -115,10 +115,10 @@ def create_inference_demo(func: inference_fn, device=args.device) -> gr.Blocks:
                     label='Prompt',
                     max_lines=1,
                     placeholder='Example: "cat <R> stone"')
-                placeholder_string = gr.Textbox(
-                    label='Placeholder String',
-                    max_lines=1,
-                    placeholder='Example: "<R>"')
+                # placeholder_string = gr.Textbox(
+                #     label='Placeholder String',
+                #     max_lines=1,
+                #     placeholder='Example: "<R>"')
 
                 with gr.Accordion('Other Parameters', open=False):
                     guidance_scale = gr.Slider(label='Classifier-Free Guidance Scale',
@@ -149,7 +149,7 @@ def create_inference_demo(func: inference_fn, device=args.device) -> gr.Blocks:
                       inputs=[
                           model_id,
                           prompt,
-                          placeholder_string,
+                        #   placeholder_string,
                           num_samples,
                           guidance_scale,
                           device
@@ -160,7 +160,7 @@ def create_inference_demo(func: inference_fn, device=args.device) -> gr.Blocks:
                         inputs=[
                             model_id,
                             prompt,
-                            placeholder_string,
+                            # placeholder_string,
                             num_samples,
                             guidance_scale,
                             device
@@ -186,7 +186,7 @@ with gr.Blocks(css='style.css') as demo:
 
     with gr.Tabs():
         with gr.TabItem('Test'):
-            create_inference_demo(inference_fn, args.device)
+            create_inference_demo(inference_fn, device=args.device)
 
 demo.launch(
     enable_queue=args.enable_queue,

inference.py

@@ -44,7 +44,7 @@ def make_image_grid(imgs, rows, cols):
 def inference_fn(
         model_id,
         prompt,
-        placeholder_string,
+        # placeholder_string,
         num_samples,
         guidance_scale,
         device
@@ -72,7 +72,9 @@ def inference_fn(
 
     for prompt in prompt_list:
         # insert relation prompt <R>
-        prompt = prompt.lower().replace("<r>", "<R>").format(placeholder_string)
+        # prompt = prompt.lower().replace("<r>", "<R>").format(placeholder_string)
+        prompt = prompt.lower().replace("<r>", "<R>").format("<R>")
+
 
         # make sub-folder
         image_folder = os.path.join(image_root_folder, prompt, 'samples')