Merge pull request #2472 from bmaltais/2471-v2412-tensorboard-not-sta…

…rting

Fix issue with tensorboard

kohya_gui/basic_caption_gui.py

@@ -85,7 +85,7 @@ def caption_images(
         log.info(f"Executing command: {command_to_run}")
 
         # Set the environment variable for the Python path
-        env = setup_environment(scriptdir=scriptdir)
+        env = setup_environment()
 
         # Run the command in the sd-scripts folder context
         subprocess.run(run_cmd, env=env, shell=False)

kohya_gui/blip_caption_gui.py

@@ -87,7 +87,7 @@ def caption_images(
     )
 
     # Set up the environment
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Reconstruct the safe command string for display
     command_to_run = " ".join(run_cmd)

kohya_gui/class_tensorboard.py

@@ -73,7 +73,7 @@ def start_tensorboard(self, logging_dir=None):
 
         self.log.info("Starting TensorBoard on port {}".format(self.tensorboard_port))
         try:
-            env = setup_environment(scriptdir=scriptdir)
+            env = setup_environment()
             self.tensorboard_proc = subprocess.Popen(run_cmd, env=env)
         except Exception as e:
             self.log.error("Failed to start Tensorboard:", e)

kohya_gui/common_gui.py

@@ -1485,7 +1485,7 @@ def validate_args_setting(input_string):
         )
         return False
 
-def setup_environment(scriptdir: str):
+def setup_environment():
     env = os.environ.copy()
     env["PYTHONPATH"] = (
         fr"{scriptdir}{os.pathsep}{scriptdir}/sd-scripts{os.pathsep}{env.get('PYTHONPATH', '')}"

kohya_gui/convert_lcm_gui.py

@@ -62,7 +62,7 @@ def convert_lcm(
         run_cmd.append("--ssd-1b")
 
     # Set up the environment
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Reconstruct the safe command string for display
     command_to_run = " ".join(run_cmd)

kohya_gui/convert_model_gui.py

@@ -99,7 +99,7 @@ def convert_model(
     # Log the command
     log.info(" ".join(run_cmd))
 
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Run the command
     subprocess.run(run_cmd, env=env, shell=False)

kohya_gui/dreambooth_gui.py

@@ -899,7 +899,7 @@ def train_model(
 
         # log.info(run_cmd)
 
-        env = setup_environment(scriptdir=scriptdir)
+        env = setup_environment()
 
         # Run the command
 

kohya_gui/extract_lora_from_dylora_gui.py

@@ -59,7 +59,7 @@ def extract_dylora(
         str(unit),
     ]
 
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Reconstruct the safe command string for display
     command_to_run = " ".join(run_cmd)

kohya_gui/extract_lora_gui.py

@@ -109,7 +109,7 @@ def extract_lora(
         run_cmd.append("--load_tuned_model_to")
         run_cmd.append(load_tuned_model_to)
 
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Reconstruct the safe command string for display
     command_to_run = " ".join(run_cmd)

kohya_gui/extract_lycoris_locon_gui.py

@@ -123,7 +123,7 @@ def extract_lycoris_locon(
     run_cmd.append(fr"{db_model}")
     run_cmd.append(fr"{output_name}")
 
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Reconstruct the safe command string for display
     command_to_run = " ".join(run_cmd)

kohya_gui/finetune_gui.py

@@ -639,7 +639,7 @@ def train_model(
             log.info(" ".join(run_cmd))
 
             # Prepare environment variables
-            env = setup_environment(scriptdir=scriptdir)
+            env = setup_environment()
 
         # create images buckets
         if generate_image_buckets:
@@ -677,7 +677,7 @@ def train_model(
             log.info(" ".join(run_cmd))
 
             # Copy and modify environment variables
-            env = setup_environment(scriptdir=scriptdir)
+            env = setup_environment()
 
             # Execute the command if not just for printing
             if not print_only:
@@ -953,7 +953,7 @@ def train_model(
 
         # log.info(run_cmd)
 
-        env = setup_environment(scriptdir=scriptdir)
+        env = setup_environment()
 
         # Run the command
         executor.execute_command(run_cmd=run_cmd, env=env)

kohya_gui/git_caption_gui.py

@@ -58,7 +58,7 @@ def caption_images(
     # Add the directory containing the training data
     run_cmd.append(fr"{train_data_dir}")
 
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Reconstruct the safe command string for display
     command_to_run = " ".join(run_cmd)

kohya_gui/group_images_gui.py

@@ -51,7 +51,7 @@ def group_images(
             run_cmd.append("--caption_ext")
             run_cmd.append(caption_ext)
 
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Reconstruct the safe command string for display
     command_to_run = " ".join(run_cmd)

kohya_gui/lora_gui.py

@@ -1282,7 +1282,7 @@ def train_model(
         )
 
         # log.info(run_cmd)
-        env = setup_environment(scriptdir=scriptdir)
+        env = setup_environment()
 
         # Run the command
 

kohya_gui/merge_lora_gui.py

@@ -451,7 +451,7 @@ def merge_lora(
                 map(str, valid_ratios)
             )  # Convert ratios to strings and include them as separate arguments
 
-        env = setup_environment(scriptdir=scriptdir)
+        env = setup_environment()
 
         # Reconstruct the safe command string for display
         command_to_run = " ".join(run_cmd)

kohya_gui/merge_lycoris_gui.py

@@ -59,7 +59,7 @@ def merge_lycoris(
         run_cmd.append("--is_v2")
 
     # Copy and update the environment variables
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Reconstruct the safe command string for display
     command_to_run = " ".join(run_cmd)

kohya_gui/resize_lora_gui.py

@@ -90,7 +90,7 @@ def resize_lora(
     if verbose:
         run_cmd.append("--verbose")
 
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Reconstruct the safe command string for display
     command_to_run = " ".join(run_cmd)

kohya_gui/svd_merge_lora_gui.py

@@ -95,7 +95,7 @@ def add_model(model_path, ratio):
     # Log the command
     log.info(" ".join(run_cmd))
 
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Run the command
     subprocess.run(run_cmd, env=env)

kohya_gui/textual_inversion_gui.py

@@ -916,7 +916,7 @@ def train_model(
             exclusion=["file_path", "save_as", "headless", "print_only"],
         )
 
-        env = setup_environment(scriptdir=scriptdir)
+        env = setup_environment()
 
         # Run the command
 

kohya_gui/verify_lora_gui.py

@@ -46,7 +46,7 @@ def verify_lora(
     log.info(f"Executing command: {command_to_run}")
 
     # Set the environment variable for the Python path
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Run the command using subprocess.Popen for asynchronous handling
     process = subprocess.Popen(

kohya_gui/wd14_caption_gui.py

@@ -117,7 +117,7 @@ def caption_images(
     # Add the directory containing the training data
     run_cmd.append(rf"{train_data_dir}")
 
-    env = setup_environment(scriptdir=scriptdir)
+    env = setup_environment()
 
     # Reconstruct the safe command string for display
     command_to_run = " ".join(run_cmd)