Improved CommandLineParser with setting OpenCL

Author: smistad

source/FAST/Algorithms/ImageComparison/SSIM.hpp

@@ -14,8 +14,7 @@ namespace fast {
  * Multi-channel images and 3D images are supported. In this case an SSIM value is calculated per channel, and the
  * final SSIM value is the average of all channel SSIM values.
  *
- * No image cropping is performed when calculating SSIM, out of bounds pixels are handled using mirrored repeat.
- * Note that other SSIM implementations may crop the image which can result in different SSIM values.
+ * No image cropping is performed when calculating SSIM, out of bounds pixels in the Gaussian window are handled using mirrored repeat.
  *
  * Inputs:
  * - 0: Image
@@ -36,8 +35,8 @@ class FAST_EXPORT StructuralSimilarityIndexMeasure : public ProcessObject {
          * @brief Create instance
          * @param maxValue Maximum possible intensity value
          * @param minValue Minimum possible intensity value
-         * @param windowSize Size of Gaussian window
-         * @param stdDev Standard deviation of Gaussian window
+         * @param windowSize Size of Gaussian window (in pixels) for each dimension
+         * @param stdDev Standard deviation of Gaussian window (in pixels) for each dimension
          * @param k1 Algorithm constant
          * @param k2 Algorithm constant
          * @return instance
@@ -55,7 +54,15 @@ class FAST_EXPORT StructuralSimilarityIndexMeasure : public ProcessObject {
          * @return
          */
         float get() const;
+        /**
+         * @brief Set standard deviation of Gaussian window
+         * @param stdDev Standard deviation for each dimension
+         */
         void setStandardDeviation(Vector3f stdDev);
+        /**
+         * @brief Set size (in pixels) of Gaussian window
+         * @param size Size for each dimension
+         */
         void setWindowSize(Vector3i size);
     private:
         StructuralSimilarityIndexMeasure() {};

source/FAST/DeviceManager.cpp

@@ -275,7 +275,11 @@ bool DeviceManager::deviceHasOpenGLInteropCapability(const cl::Device &device, c
     // Get the cl_device_id of the device
     cl_device_id deviceID = device();
     // Get the platform of device
+#if CL_HPP_TARGET_OPENCL_VERSION >= 300
+    cl_platform_id platformId = device.getInfo<CL_DEVICE_PLATFORM>()();
+#else
     cl_platform_id platformId = device.getInfo<CL_DEVICE_PLATFORM>();
+#endif
     // Get all devices that are capable of OpenGL interop with this platform
     // Create properties for CL-GL context
 #ifdef FAST_MODULE_VISUALIZATION

source/FAST/Tools/CommandLineParser.cpp

@@ -34,6 +34,7 @@ void CommandLineParser::parse(const int argc, char ** const argv) {
 
             std::string value = argv[i + 1];
             trim(value);
+            value = stringToLower(value);
             if(value == "intel") {
                 DeviceManager::setDefaultPlatform(DEVICE_PLATFORM_INTEL);
             } else if(value == "nvidia") {
@@ -42,6 +43,10 @@ void CommandLineParser::parse(const int argc, char ** const argv) {
                 DeviceManager::setDefaultPlatform(DEVICE_PLATFORM_AMD);
             } else if(value == "pocl") {
                 DeviceManager::setDefaultPlatform(DEVICE_PLATFORM_POCL);
+            } else if(value == "mesa") {
+                DeviceManager::setDefaultPlatform(DEVICE_PLATFORM_MESA);
+            } else if(value == "openclon12") {
+                DeviceManager::setDefaultPlatform(DEVICE_PLATFORM_OPENCL_ON_12);
             }
             ++i;
             ++currentPosition;