Update Scripts/mainpaperspacev1.py

Scripts/mainpaperspacev1.py

@@ -51,7 +51,7 @@ def Deps(force_reinstall):
         call('tar -C / --zstd -xf pps.tar.zst', shell=True, stdout=open('/dev/null', 'w'))
         call("sed -i 's@~/.cache@/notebooks/cache@' /usr/local/lib/python3.9/dist-packages/transformers/utils/hub.py", shell=True)
         os.chdir('/notebooks')
-        call("git clone --depth 1 -q --branch updt https://github.com/TheLastBen/diffusers /diffusers", shell=True, stdout=open('/dev/null', 'w'))
+        call("git clone --depth 1 -q --branch main https://github.com/TheLastBen/diffusers /diffusers", shell=True, stdout=open('/dev/null', 'w'))
         if not os.path.exists('/notebooks/diffusers'):
             call('ln -s /diffusers /notebooks', shell=True)
         call("rm -r /deps", shell=True)
@@ -112,19 +112,21 @@ def downloadmodel_hf(Path_to_HuggingFace):
 
 
 
-def downloadmodel_pth(CKPT_Path):
+def downloadmodel_pth(CKPT_Path, safetensors):
+  
+  sftnsr=""
+  if safetensors:
+    sftnsr="--from_safetensors"
+
   import wget
   os.chdir('/notebooks')
   clear_output() 
   if os.path.exists(str(CKPT_Path)):
-    wget.download('https://github.com/TheLastBen/fast-stable-diffusion/raw/main/Dreambooth/refmdlz')
-    call('unzip -o -q refmdlz', shell=True)
-    call('rm -f refmdlz', shell=True)
-    wget.download('https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv1.py')
+    call('wget -q -O config.yaml https://github.com/CompVis/stable-diffusion/raw/main/configs/stable-diffusion/v1-inference.yaml', shell=True)
+    call('python /diffusers/scripts/convert_original_stable_diffusion_to_diffusers.py --checkpoint_path '+CKPT_Path+' --dump_path /models/stable-diffusion-custom --original_config_file config.yaml '+sftnsr, shell=True)
     clear_output()
-    call('python convertodiffv1.py '+CKPT_Path+' /models/stable-diffusion-custom --v1', shell=True)
-    call('rm convertodiffv1.py', shell=True)
-    call('rm -r refmdl', shell=True)
+
+    call('rm config.yaml', shell=True)
     if os.path.exists('/models/stable-diffusion-custom/unet/diffusion_pytorch_model.bin'):
       clear_output()
       done()
@@ -137,23 +139,28 @@ def downloadmodel_pth(CKPT_Path):
        time.sleep(5)
        
        
-def downloadmodel_lnk(CKPT_Link): 
+def downloadmodel_lnk(CKPT_Link, safetensors):
+
+    sftnsr=""
+    if not safetensors:
+      modelnm="model.ckpt"
+    else:
+      modelnm="model.safetensors"
+      sftnsr="--from_safetensors"
+
     import wget
     os.chdir('/notebooks')
-    call("gdown --fuzzy " +CKPT_Link+ " -O /models/model.ckpt", shell=True)
-    
-    if os.path.exists('/models/model.ckpt'):
-      if os.path.getsize("/models/model.ckpt") > 1810671599:
-        wget.download('https://github.com/TheLastBen/fast-stable-diffusion/raw/main/Dreambooth/refmdlz')
-        call('unzip -o -q refmdlz', shell=True)
-        call('rm -f refmdlz', shell=True)
-        wget.download('https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv1.py')
+    call("gdown --fuzzy " +CKPT_Link+ " -O /models/"+modelnm, shell=True)
+
+    if os.path.exists("/models/"+modelnm):
+      if os.path.getsize("/models/"+modelnm) > 1810671599:
+        call('wget -q -O config.yaml https://github.com/CompVis/stable-diffusion/raw/main/configs/stable-diffusion/v1-inference.yaml', shell=True)
+        call('python /diffusers/scripts/convert_original_stable_diffusion_to_diffusers.py --checkpoint_path '+modelnm+' --dump_path /models/stable-diffusion-custom --original_config_file config.yaml '+sftnsr, shell=True)
         clear_output()
-        call('python convertodiffv1.py /models/model.ckpt /models/stable-diffusion-custom --v1', shell=True)
-        call('rm convertodiffv1.py', shell=True)
-        call('rm -r refmdl', shell=True)
+        
+        call('rm config.yaml', shell=True)
         if os.path.exists('/models/stable-diffusion-custom/unet/diffusion_pytorch_model.bin'):
-          call('rm /models/model.ckpt', shell=True)
+          call('rm /models/'+modelnm, shell=True)
           clear_output()
           done()
         else:
@@ -161,7 +168,7 @@ def downloadmodel_lnk(CKPT_Link):
             print('Conversion error')
             time.sleep(5)
       else:
-        while os.path.getsize('/models/model.ckpt') < 1810671599:
+        while os.path.getsize("/models/"+modelnm) < 1810671599:
            print('Wrong link, check that the link is valid')
            time.sleep(5)
 
@@ -172,10 +179,10 @@ def dl(Path_to_HuggingFace, CKPT_Path, CKPT_Link):
       downloadmodel_hf(Path_to_HuggingFace)
       MODEL_NAME="/models/stable-diffusion-custom"
     elif CKPT_Path !="":
-      downloadmodel_pth(CKPT_Path)
+      downloadmodel_pth(CKPT_Path, safetensors)
       MODEL_NAME="/models/stable-diffusion-custom"
     elif CKPT_Link !="":
-      downloadmodel_lnk(CKPT_Link)
+      downloadmodel_lnk(CKPT_Link, safetensors)
       MODEL_NAME="/models/stable-diffusion-custom"
     else:
       MODEL_NAME="/datasets/stable-diffusion-diffusers/stable-diffusion-v1-5"
@@ -262,14 +269,11 @@ def sess(Session_Name, Session_Link_optional, MODEL_NAME):
 
     elif os.path.exists(MDLPTH):
       print('Session found, loading the trained model ...')
-      wget.download('https://github.com/TheLastBen/fast-stable-diffusion/raw/main/Dreambooth/refmdlz')
-      call('unzip -o -q refmdlz', shell=True, stdout=open('/dev/null', 'w'))
-      call('rm -f refmdlz', shell=True, stdout=open('/dev/null', 'w'))
-      wget.download('https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv1.py')
-      call('python convertodiffv1.py '+MDLPTH+' '+OUTPUT_DIR+' --v1', shell=True)
-      call('rm convertodiffv1.py', shell=True)
-      call('rm -r refmdl', shell=True)
+      call('wget -q -O config.yaml https://github.com/CompVis/stable-diffusion/raw/main/configs/stable-diffusion/v1-inference.yaml', shell=True)
+      call('python /diffusers/scripts/convert_original_stable_diffusion_to_diffusers.py --checkpoint_path '+MDLPTH+' --dump_path '+OUTPUT_DIR+' --original_config_file config.yaml', shell=True)
+      clear_output()
 
+      call('rm config.yaml', shell=True)
       if os.path.exists(OUTPUT_DIR+'/unet/diffusion_pytorch_model.bin'):
         resume=True
         clear_output()
@@ -333,8 +337,6 @@ def uplder(Remove_existing_instance_images, Crop_images, Crop_size, IMAGES_FOLDE
        done()
     
     
-
-
 def upld(Remove_existing_instance_images, Crop_images, Crop_size, IMAGES_FOLDER_OPTIONAL, INSTANCE_DIR, CAPTIONS_DIR, uploader, ren):
 
 
@@ -615,8 +617,9 @@ def dbtrain(Resume_Training, UNet_Training_Steps, UNet_Learning_Rate, Text_Encod
         --lr_scheduler="linear" \
         --lr_warmup_steps=0 \
         --max_train_steps='+str(Training_Steps), shell=True)
-        
-    def train_only_unet(stp, stpsv, SESSION_DIR, MODELT_NAME, INSTANCE_DIR, OUTPUT_DIR, Text_Encoder_Training_Steps, PT, Seed, Resolution, Style, extrnlcptn, precision, Training_Steps):
+
+
+    def train_only_unet(stp, stpsv, SESSION_DIR, MODELT_NAME, INSTANCE_DIR, OUTPUT_DIR, Text_Encoder_Training_Steps, PT, Seed, Resolution, extrnlcptn, precision, Training_Steps):
         clear_output()
         if resuming=="Yes":
           print('Resuming Training...')
@@ -675,7 +678,7 @@ def dbtrain(Resume_Training, UNet_Training_Steps, UNet_Learning_Rate, Text_Encod
           time.sleep(8)
       
     if UNet_Training_Steps!=0:
-      train_only_unet(stp, stpsv, SESSION_DIR, MODELT_NAME, INSTANCE_DIR, OUTPUT_DIR, Text_Encoder_Training_Steps, PT, Seed, Resolution, Style, extrnlcptn, precision, Training_Steps=UNet_Training_Steps)
+      train_only_unet(stp, stpsv, SESSION_DIR, MODELT_NAME, INSTANCE_DIR, OUTPUT_DIR, Text_Encoder_Training_Steps, PT, Seed, Resolution, extrnlcptn, precision, Training_Steps=UNet_Training_Steps)
 
     if UNet_Training_Steps==0 and Text_Encoder_Concept_Training_Steps==0 and Text_Encoder_Training_Steps==0 :
       print('Nothing to do')