Various fixes

- Do not enable CPU device together with OpenCL/CUDA when device name is not
  specified.
- Adopt output log parser fr the changed path tracing message.
- Solve issue with using same short name of command line argument for single
  device specification.
- Reshuffle include statements so it's kind of possible to use bundle python.
  Still need to work this properly, but that's for later.
This commit is contained in:
2017-11-01 16:07:46 +01:00
parent efd39a9e86
commit c41658857a
5 changed files with 8 additions and 5 deletions

View File

@@ -7,7 +7,7 @@ class Stats:
def __init__(self):
# Pepare some regex for parsing
self.re_path_tracing = re.compile(
".*Path Tracing Tile ([0-9]+)/([0-9]+)" +
".*Rendered ([0-9]+)/([0-9]+) Tiles" +
"(, Sample ([0-9]+)\/([0-9]+))?$")
self.re_total_render_time = re.compile(
".*Total render time: ([0-9]+(\.[0-9]+)?)")