brett/Zordon
1
0
Fork 0
mirror of https://github.com/blw1138/Zordon.git synced 2025-12-17 08:48:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

More worker cleanups and improvements

Browse Source
This commit is contained in:
Brett Williams
2022-10-31 00:03:27 -07:00
parent a36f6d3128
commit b244a258e2
4 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
utilities/blender_worker.py
View File

@@ -22,13 +22,10 @@ class BlenderRenderWorker(BaseRenderWorker):
self.export_format = self.args.get('export_format', None) or 'JPEG' self.export_format = self.args.get('export_format', None) or 'JPEG'
self.camera = self.args.get('camera', None) self.camera = self.args.get('camera', None)
self.render_all_frames = self.args.get('render_all_frames', False) self.render_all_frames = self.args.get('render_all_frames', False)
self.frame = 0 #todo: remove this attribute self.frame_to_render = 0
# Stats # Stats
self.memory_use = None self.__frame_percent_complete = 0.0
self.time_elapsed = None
self.time_remaining = None
self.frame_percent_complete = 0.0
# Scene Info # Scene Info
self.scene_info = get_scene_info(input_path) self.scene_info = get_scene_info(input_path)
@@ -51,7 +48,10 @@ class BlenderRenderWorker(BaseRenderWorker):
def _generate_subprocess(self): def _generate_subprocess(self):
cmd = [self.renderer_path(), '-b', self.input_path] cmd = [self.renderer_path()]
if self.args.get('background', True): # optionally run render not in background
cmd.append('-b')
cmd.append(self.input_path)
if self.camera: if self.camera:
cmd.extend(['--python-expr', f"import bpy;bpy.context.scene.camera = bpy.data.objects['{self.camera}'];"]) cmd.extend(['--python-expr', f"import bpy;bpy.context.scene.camera = bpy.data.objects['{self.camera}'];"])
@@ -59,7 +59,7 @@ class BlenderRenderWorker(BaseRenderWorker):
cmd.extend(['-E', self.engine, '-o', self.output_path, '-F', self.export_format]) cmd.extend(['-E', self.engine, '-o', self.output_path, '-F', self.export_format])
# all frames or single # all frames or single
cmd.extend(['-a'] if self.render_all_frames else ['-f', str(self.frame)]) cmd.extend(['-a'] if self.render_all_frames else ['-f', str(self.frame_to_render)])
return cmd return cmd
@@ -70,14 +70,14 @@ class BlenderRenderWorker(BaseRenderWorker):
found = pattern.search(line) found = pattern.search(line)
if found: if found:
stats = found.groupdict() stats = found.groupdict()
self.memory_use = stats['memory'] memory_use = stats['memory']
self.time_elapsed = stats['time'] time_elapsed = stats['time']
self.time_remaining = stats['remaining'] or 'Unknown' time_remaining = stats['remaining'] or 'Unknown'
sample_string = line.split('|')[-1].strip() sample_string = line.split('|')[-1].strip()
if "sample" in sample_string.lower(): if "sample" in sample_string.lower():
samples = re.sub(r'[^\d/]', '', sample_string) samples = re.sub(r'[^\d/]', '', sample_string)
self.frame_percent_complete = int(samples.split('/')[0]) / int(samples.split('/')[-1]) self.__frame_percent_complete = int(samples.split('/')[0]) / int(samples.split('/')[-1])
# Calculate rough percent based on cycles # Calculate rough percent based on cycles
# EEVEE # EEVEE
@@ -93,8 +93,8 @@ class BlenderRenderWorker(BaseRenderWorker):
if int(stats['frame']) > self.current_frame: if int(stats['frame']) > self.current_frame:
self.current_frame = int(stats['frame']) self.current_frame = int(stats['frame'])
logger.debug( logger.debug(
'Frame:{0} | Mem:{1} | Time:{2} | Remaining:{3}'.format(self.current_frame, self.memory_use, 'Frame:{0} | Mem:{1} | Time:{2} | Remaining:{3}'.format(self.current_frame, memory_use,
self.time_elapsed, self.time_remaining)) time_elapsed, time_remaining))
elif 'error' in line.lower(): elif 'error' in line.lower():
logger.error(line) logger.error(line)
self.errors.append(line) self.errors.append(line)
@@ -115,10 +115,10 @@ class BlenderRenderWorker(BaseRenderWorker):
def percent_complete(self): def percent_complete(self):
if self.total_frames <= 1: if self.total_frames <= 1:
return self.frame_percent_complete return self.__frame_percent_complete
else: else:
whole_frame_percent = (self.current_frame - 1) / self.total_frames whole_frame_percent = (self.current_frame - 1) / self.total_frames
adjusted_frame_percent = self.frame_percent_complete / self.total_frames adjusted_frame_percent = self.__frame_percent_complete / self.total_frames
total_percent = whole_frame_percent + adjusted_frame_percent total_percent = whole_frame_percent + adjusted_frame_percent
return max(total_percent, 0) return max(total_percent, 0)

2
utilities/ffmpeg_worker.py
View File

@@ -57,7 +57,7 @@ class FFMPEGRenderWorker(BaseRenderWorker):
if found: if found:
stats = found.groupdict() stats = found.groupdict()
self.current_frame = stats['current_frame'] self.current_frame = stats['current_frame']
self.time_elapsed = stats['time_elapsed'] time_elapsed = stats['time_elapsed']
elif "not found" in line: elif "not found" in line:
self.errors.append(line) self.errors.append(line)

22
utilities/render_worker.py
View File

@@ -68,9 +68,9 @@ class BaseRenderWorker(object):
self.maximum_attempts = 1 self.maximum_attempts = 1
# Threads and processes # Threads and processes
self.thread = threading.Thread(target=self.run, args=()) self.__thread = threading.Thread(target=self.run, args=())
self.thread.daemon = True self.__thread.daemon = True
self.process = None self.__process = None
self.is_finished = False self.is_finished = False
self.last_output = None self.last_output = None
@@ -112,7 +112,7 @@ class BaseRenderWorker(object):
self.status = RenderStatus.RUNNING self.status = RenderStatus.RUNNING
logger.info('Starting {0} {1} Render for {2}'.format(self.renderer, self.version(), self.input_path)) logger.info('Starting {0} {1} Render for {2}'.format(self.renderer, self.version(), self.input_path))
self.thread.start() self.__thread.start()
def run(self): def run(self):
@@ -135,7 +135,7 @@ class BaseRenderWorker(object):
# Start process and get updates # Start process and get updates
subprocess_cmds = self._generate_subprocess() subprocess_cmds = self._generate_subprocess()
logger.debug("Renderer commands generated - {}".format(" ".join(subprocess_cmds))) logger.debug("Renderer commands generated - {}".format(" ".join(subprocess_cmds)))
self.process = subprocess.Popen(subprocess_cmds, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, self.__process = subprocess.Popen(subprocess_cmds, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
universal_newlines=False) universal_newlines=False)
self.start_time = datetime.now() self.start_time = datetime.now()
@@ -144,7 +144,7 @@ class BaseRenderWorker(object):
f.write("{3} - Starting {0} {1} Render for {2}\n".format(self.renderer, self.version(), self.input_path, f.write("{3} - Starting {0} {1} Render for {2}\n".format(self.renderer, self.version(), self.input_path,
self.start_time.isoformat())) self.start_time.isoformat()))
f.write(f"Running command: {' '.join(subprocess_cmds)}\n") f.write(f"Running command: {' '.join(subprocess_cmds)}\n")
for c in io.TextIOWrapper(self.process.stdout, encoding="utf-8"): # or another encoding for c in io.TextIOWrapper(self.__process.stdout, encoding="utf-8"): # or another encoding
f.write(c) f.write(c)
logger.debug(f"{self.renderer}Worker: {c.strip()}") logger.debug(f"{self.renderer}Worker: {c.strip()}")
self.last_output = c.strip() self.last_output = c.strip()
@@ -152,7 +152,7 @@ class BaseRenderWorker(object):
f.write('\n') f.write('\n')
# Check return codes # Check return codes
return_code = self.process.wait() return_code = self.__process.wait()
self.end_time = datetime.now() self.end_time = datetime.now()
# Return early if job was cancelled # Return early if job was cancelled
if self.status is RenderStatus.CANCELLED: if self.status is RenderStatus.CANCELLED:
@@ -180,16 +180,16 @@ class BaseRenderWorker(object):
self.is_finished = True self.is_finished = True
def is_running(self): def is_running(self):
if self.thread: if self.__thread:
return self.thread.is_alive() return self.__thread.is_alive()
return False return False
def stop(self): def stop(self):
if self.process: if self.__process:
try: try:
self.status = RenderStatus.CANCELLED self.status = RenderStatus.CANCELLED
self.maximum_attempts = 0 self.maximum_attempts = 0
process = psutil.Process(self.process.pid) process = psutil.Process(self.__process.pid)
for proc in process.children(recursive=True): for proc in process.children(recursive=True):
proc.kill() proc.kill()
process.kill() process.kill()

3
utilities/scripts/get_blender_info.py
View File

@@ -13,7 +13,8 @@ data = {'cameras': cameras,
'frame_start': bpy.data.scenes[0].frame_start, 'frame_start': bpy.data.scenes[0].frame_start,
'frame_end': bpy.data.scenes[0].frame_end, 'frame_end': bpy.data.scenes[0].frame_end,
'resolution_x': bpy.data.scenes[0].render.resolution_x, 'resolution_x': bpy.data.scenes[0].render.resolution_x,
'resolution_y': bpy.data.scenes[0].render.resolution_y} 'resolution_y': bpy.data.scenes[0].render.resolution_y,
'fps': bpy.data.scenes[0].render.fps}
data_string = json.dumps(data) data_string = json.dumps(data)
print("SCENE_DATA:" + data_string) print("SCENE_DATA:" + data_string)