xingcheng
/
disco-diffusion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add original simple turbo blending

Browse Source
pull/14/head
Adam Letts 3 years ago
parent 9e3d032e50
commit b350675b76
2 changed files with 60 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      Disco_Diffusion.ipynb
  2. 41
      disco.py

43
Disco_Diffusion.ipynb
Unescape View File

@ -1111,16 +1111,20 @@
" sampling_mode=args.sampling_mode, midas_weight=args.midas_weight)\n",
" next_step_pil.save('prevFrameScaled.png')\n",
"\n",
" ### Turbo mode - skip some diffusions to save time \n",
" if turbo_mode == True and frame_num > 10 and frame_num % int(turbo_steps) != 0:\n",
" print('turbo mode is on this frame: skipping clip diffusion steps')\n",
" filename = f'{args.batch_name}({args.batchNum})_{frame_num:04}.png'\n",
" next_step_pil.save(f'{batchFolder}/{filename}') #save it as this frame\n",
" next_step_pil.save(f'{img_filepath}') # save it also as prev_frame for next iteration\n",
" continue\n",
" elif turbo_mode == True:\n",
" print('turbo mode is OFF this frame')\n",
" #else: no turbo\n",
" ### Turbo mode - skip some diffusions to save time\n",
" turbo_blend = False # default to normal frame saving later\n",
" if turbo_mode and frame_num > 10: #preroll is 10 frames\n",
" if frame_num % int(turbo_steps) != 0:\n",
" print('turbo skip this frame: skipping clip diffusion steps')\n",
" filename = f'{args.batch_name}({args.batchNum})_{frame_num:04}.png'\n",
" next_step_pil.save(f'{batchFolder}/{filename}') #save it as this frame. done.\n",
" next_step_pil.save(f'{img_filepath}') # save it also as prev_frame to feed next iteration\n",
" turbo_blend = False # default to normal-frame-saving later\n",
" continue\n",
" else:\n",
" if turbo_frame_blend:\n",
" turbo_blend = True # blend frames for smoothness..\n",
" print('clip/diff this frame - generate clip diff image')\n",
"\n",
" init_image = 'prevFrameScaled.png'\n",
" init_scale = args.frames_scale\n",
@ -1393,6 +1397,17 @@
" image.save(f'{unsharpenFolder}/{filename}')\n",
" 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",
" # Mix new image with prevFrameScaled\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",
" 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",
" # display.clear_output()\n",
"\n",
@ -1474,6 +1489,7 @@
" 'extract_nth_frame':extract_nth_frame,\n",
" 'turbo_mode':turbo_mode,\n",
" 'turbo_steps':turbo_steps,\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",
@ -2521,11 +2537,12 @@
"#======= TURBO MODE\n",
"#@markdown ---\n",
"#@markdown ####**Turbo Mode (3D anim only):**\n",
"#@markdown (Starts after frame 10,) skips diffusion steps and just uses MIDAS depth map to warp images for skipped frames.\n",
"#@markdown Speeds up rendering by 2x-4x, and may improve image coherence between frames.\n",
"#@markdown (Starts after frame 10,) skips diffusion steps and just uses depth map to warp images for skipped frames.\n",
"#@markdown Speeds up rendering by 2x-4x, and may improve image coherence between frames. frame_blend_mode smooths abrupt texture changes across 2 frames.\n",
"\n",
"turbo_mode = True #@param {type:\"boolean\"}\n",
"turbo_steps = \"3\" #@param [\"2\",\"3\",\"4\"] {type:'string'}\n",
"turbo_steps = \"3\" #@param [\"2\",\"3\",\"4\",\"5\",\"6\"] {type:\"string\"}\n",
"turbo_frame_blend = True #@param {type:\"boolean\"}\n",
"#@markdown ---\n",
"\n",
"#@markdown ####**Coherency Settings:**\n",

41
disco.py
Unescape View File

@ -1019,15 +1019,19 @@ def do_run():
next_step_pil.save('prevFrameScaled.png')
### Turbo mode - skip some diffusions to save time
if turbo_mode == True and frame_num > 10 and frame_num % int(turbo_steps) != 0:
print('turbo mode is on this frame: skipping clip diffusion steps')
filename = f'{args.batch_name}({args.batchNum})_{frame_num:04}.png'
next_step_pil.save(f'{batchFolder}/{filename}') #save it as this frame
next_step_pil.save(f'{img_filepath}') # save it also as prev_frame for next iteration
continue
elif turbo_mode == True:
print('turbo mode is OFF this frame')
#else: no turbo
turbo_blend = False # default to normal frame saving later
if turbo_mode and frame_num > 10: #preroll is 10 frames
if frame_num % int(turbo_steps) != 0:
print('turbo skip this frame: skipping clip diffusion steps')
filename = f'{args.batch_name}({args.batchNum})_{frame_num:04}.png'
next_step_pil.save(f'{batchFolder}/{filename}') #save it as this frame. done.
next_step_pil.save(f'{img_filepath}') # save it also as prev_frame to feed next iteration
turbo_blend = False # default to normal-frame-saving later
continue
else:
if turbo_frame_blend:
turbo_blend = True # blend frames for smoothness..
print('clip/diff this frame - generate clip diff image')
init_image = 'prevFrameScaled.png'
init_scale = args.frames_scale
@ -1300,6 +1304,17 @@ def do_run():
image.save(f'{unsharpenFolder}/{filename}')
else:
image.save(f'{batchFolder}/{filename}')
if args.animation_mode == "3D":
# If turbo_blend, save a blended image
if turbo_mode and turbo_blend:
# Mix new image with prevFrameScaled
newFrame = cv2.imread('prevFrame.png') # This is already updated..
prev_frame_warped = cv2.imread('prevFrameScaled.png')
blendedImage = cv2.addWeighted(newFrame, 0.5, prev_frame_warped, 0.5, 0.0)
cv2.imwrite(f'{batchFolder}/{filename}',blendedImage)
turbo_blend = False # reset to false
else:
image.save(f'{batchFolder}/{filename}')
# if frame_num != args.max_frames-1:
# display.clear_output()
@ -1381,6 +1396,7 @@ def save_settings():
'extract_nth_frame':extract_nth_frame,
'turbo_mode':turbo_mode,
'turbo_steps':turbo_steps,
'turbo_frame_blend':turbo_frame_blend,
}
# print('Settings:', setting_list)
with open(f"{batchFolder}/{batch_name}({batchNum})_settings.txt", "w+") as f: #save settings
@ -2377,11 +2393,12 @@ sampling_mode = 'bicubic'#@param {type:"string"}
#======= TURBO MODE
#@markdown ---
#@markdown ####**Turbo Mode (3D anim only):**
#@markdown (Starts after frame 10,) skips diffusion steps and just uses MIDAS depth map to warp images for skipped frames.
#@markdown Speeds up rendering by 2x-4x, and may improve image coherence between frames.
#@markdown (Starts after frame 10,) skips diffusion steps and just uses depth map to warp images for skipped frames.
#@markdown Speeds up rendering by 2x-4x, and may improve image coherence between frames. frame_blend_mode smooths abrupt texture changes across 2 frames.
turbo_mode = True #@param {type:"boolean"}
turbo_steps = "3" #@param ["2","3","4"] {type:'string'}
turbo_steps = "3" #@param ["2","3","4","5","6"] {type:"string"}
turbo_frame_blend = True #@param {type:"boolean"}
#@markdown ---
#@markdown ####**Coherency Settings:**

Write Preview
Loading…
Cancel
Save