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.

benchmark/configure.py

@@ -24,6 +24,9 @@ def setUseRequestedDevice(context,
         device_found = False
         # Try to enable first non-display card.
         for device in cpref.devices:
+            if device.type != device_type:
+                device.use = False
+                continue
             if isDisplayDevice(device):
                 device.use = False
             elif not device_found or not device_single:
@@ -31,7 +34,7 @@ def setUseRequestedDevice(context,
                 device_found = True
                 device.use = True
             else:
-                # Keep disanling rest of GPUs.
+                # Keep disabling rest of GPUs.
                 device.use = False
         if not device_found:
             # Only display devices, enable first of them.

benchmark/foundation/stats.py

@@ -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]+)?)")

benchmark/foundation/system_info.py

@@ -1,6 +1,5 @@
 import json
 import platform
-import psutil
 import subprocess
 import sys
 
@@ -77,6 +76,7 @@ def getNumPhysicalCPUs():
 
 
 def gatherSystemInfo(ctx):
+    import psutil
     system_info = {}
     system_info['bitness'] = platform.architecture()[0]
     system_info['machine'] = platform.machine()

benchmark/foundation/util.py

@@ -1,4 +1,3 @@
-import dateutil
 import foundation
 from foundation import progress
 import os
@@ -134,6 +133,7 @@ def blenderCommitUnixTimestamp(commit_date, commit_time):
     """
     Convert commit build time and time to unix timestamp
     """
+    import dateutil
     date_time = commit_date + " " + commit_time
     return dateutil.parser.parse(date_time)
 

benchmark/main.py

@@ -32,7 +32,7 @@ def configureArgumentParser():
     parser.add_argument('-n', '--device-name',
                         help="Device name to render on",
                         default="")
-    parser.add_argument('-s', '--device-single',
+    parser.add_argument('-e', '--device-single',
                         help="Use single device when multiple matches",
                         action='store_true',
                         default=False)