From 5fa73e031d4f911ac1280e2aa22a280b64978150 Mon Sep 17 00:00:00 2001 From: Adam Letts Date: Sun, 3 Apr 2022 01:26:49 -0400 Subject: [PATCH] Apply zippy's disco.py changes to the .ipynb --- Disco_Diffusion.ipynb | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Disco_Diffusion.ipynb b/Disco_Diffusion.ipynb index babfd64..12ff53f 100644 --- a/Disco_Diffusion.ipynb +++ b/Disco_Diffusion.ipynb @@ -1111,7 +1111,7 @@ "\n", " if args.animation_mode == \"3D\":\n", " if frame_num == 0:\n", - " turbo_blend = False\n", + " pass\n", " else:\n", " seed += 1 \n", " if resume_run and frame_num == start_frame:\n", @@ -1125,7 +1125,6 @@ " next_step_pil.save('prevFrameScaled.png')\n", "\n", " ### Turbo mode - skip some diffusions, use 3d morph for clarity and to save time\n", - " turbo_blend = False # default for non-turbo frame saving\n", " if turbo_mode:\n", " if frame_num == turbo_preroll: #start tracking oldframe\n", " next_step_pil.save('oldFrameScaled.png')#stash for later blending \n", @@ -1143,13 +1142,11 @@ " blendedImage = cv2.addWeighted(newWarpedImg, blend_factor, oldWarpedImg,1-blend_factor, 0.0)\n", " cv2.imwrite(f'{batchFolder}/{filename}',blendedImage)\n", " next_step_pil.save(f'{img_filepath}') # save it also as prev_frame to feed next iteration\n", - " turbo_blend = False\n", " continue\n", " else:\n", " #if not a skip frame, will run diffusion and need to blend.\n", " oldWarpedImg = cv2.imread('prevFrameScaled.png')\n", " cv2.imwrite(f'oldFrameScaled.png',oldWarpedImg)#swap in for blending later \n", - " turbo_blend = True # flag to blend frames after diff generated...\n", " print('clip/diff this frame - generate clip diff image')\n", "\n", " init_image = 'prevFrameScaled.png'\n", @@ -1425,14 +1422,14 @@ " else:\n", " image.save(f'{batchFolder}/{filename}')\n", " if args.animation_mode == \"3D\":\n", - " # If turbo_blend, save a blended image\n", - " if turbo_mode and turbo_blend:\n", + " # If turbo, save a blended image\n", + " if turbo_mode:\n", " # Mix new image with prevFrameScaled\n", + " blend_factor = (1)/int(turbo_steps)\n", " newFrame = cv2.imread('prevFrame.png') # This is already updated..\n", " prev_frame_warped = cv2.imread('prevFrameScaled.png')\n", - " blendedImage = cv2.addWeighted(newFrame, 0.5, prev_frame_warped, 0.5, 0.0)\n", + " blendedImage = cv2.addWeighted(newFrame, blend_factor, prev_frame_warped, (1-blend_factor), 0.0)\n", " cv2.imwrite(f'{batchFolder}/{filename}',blendedImage)\n", - " turbo_blend = False # reset to false\n", " else:\n", " image.save(f'{batchFolder}/{filename}')\n", " # if frame_num != args.max_frames-1:\n", @@ -1518,7 +1515,6 @@ " 'turbo_mode':turbo_mode,\n", " 'turbo_steps':turbo_steps,\n", " 'turbo_preroll':turbo_preroll,\n", - " 'turbo_frame_blend':turbo_frame_blend,\n", " }\n", " # print('Settings:', setting_list)\n", " with open(f\"{batchFolder}/{batch_name}({batchNum})_settings.txt\", \"w+\") as f: #save settings\n", @@ -2575,7 +2571,6 @@ "turbo_mode = False #@param {type:\"boolean\"}\n", "turbo_steps = \"3\" #@param [\"2\",\"3\",\"4\",\"5\",\"6\"] {type:\"string\"}\n", "turbo_preroll = 10 # frames\n", - "turbo_frame_blend = True #@param {type:\"boolean\"}\n", "\n", "#insist turbo be used only w 3d anim.\n", "if turbo_mode and animation_mode != '3D':\n", @@ -3242,7 +3237,8 @@ " # if view_video_in_cell:\n", " # mp4 = open(filepath,'rb').read()\n", " # data_url = \"data:video/mp4;base64,\" + b64encode(mp4).decode()\n", - " # display.HTML(f'')" + " # display.HTML(f'')\n", + " \n" ], "outputs": [], "execution_count": null