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.