updated makefiles and README (#1630)

Signed-off-by: ShwethaSelma <shwethasshetty27@gmail.com>

Author: ShwethaSelma

DirectProgramming/C++SYCL/StructuredGrids/guided_HSOpticalflow_SYCLMigration/02_sycl_dpct_migrated/CMakeLists.txt

@@ -5,5 +5,4 @@ include_directories(${CMAKE_SOURCE_DIR}/02_sycl_dpct_migrated/Common/)
 add_executable (02_sycl_dpct_migrated src/main.cpp src/flowGold.cpp src/flowSYCL.cpp)
 target_link_libraries(02_sycl_dpct_migrated sycl)
 
-add_custom_target (run_sdm_cpu cd ${CMAKE_SOURCE_DIR}/02_sycl_dpct_migrated/ && ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/02_sycl_dpct_migrated)
-add_custom_target (run_sdm_gpu SYCL_DEVICE_FILTER=gpu cd ${CMAKE_SOURCE_DIR}/02_sycl_dpct_migrated/ && ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/02_sycl_dpct_migrated)
+add_custom_target (run_sdm cd ${CMAKE_SOURCE_DIR}/02_sycl_dpct_migrated/ && ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/02_sycl_dpct_migrated)

DirectProgramming/C++SYCL/StructuredGrids/guided_HSOpticalflow_SYCLMigration/02_sycl_dpct_migrated/src/flowSYCL.cpp

@@ -44,6 +44,16 @@
 #include "upscaleKernel.hpp"
 #include "warpingKernel.hpp"
 
+// custom device selector to pick device that supports sycl::image
+int sycl_image_support(const sycl::device& d ) {
+  if(d.get_info<info::device::image_support>() == false){
+    std::cout << d.get_info<info::device::name>() << " ==> Image Support = NO\n"; 
+  } else {
+    std::cout << d.get_info<info::device::name>() << " ==> Image Support = YES\n";  
+  }
+  return d.get_info<info::device::image_support>();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief method logic
 ///
@@ -73,11 +83,11 @@ void ComputeFlowSYCL(const float *I0, const float *I1, int width, int height,
       }
     }
   };
-
-  dpct::device_ext &dev_ct1 = dpct::get_current_device();
-  sycl::queue &q_ct1 = dev_ct1.default_queue();
-
-  printf("Computing optical flow on GPU...\n");
+  
+  sycl::device preferred_device { sycl_image_support };
+  sycl::queue q_ct1(preferred_device, exception_handler, property::queue::in_order());
+  
+  printf("Computing optical flow on Device...\n");
   std::cout << "\nRunning on "
             << q_ct1.get_device().get_info<sycl::info::device::name>() << "\n";
 

DirectProgramming/C++SYCL/StructuredGrids/guided_HSOpticalflow_SYCLMigration/02_sycl_dpct_migrated/src/main.cpp

@@ -241,7 +241,7 @@ int main(int argc, char **argv) {
   auto SYCL_duration =
       std::chrono::duration_cast<float_ms>(stopSYCLTime - startSYCLTime)
           .count();
-  printf("Processing time on GPU: %f (ms)\n", SYCL_duration);
+  printf("Processing time on Device: %f (ms)\n", SYCL_duration);
 
   // compare results (L1 norm)
   bool status =

DirectProgramming/C++SYCL/StructuredGrids/guided_HSOpticalflow_SYCLMigration/03_sycl_migrated/CMakeLists.txt

@@ -5,5 +5,4 @@ include_directories(${CMAKE_SOURCE_DIR}/03_sycl_migrated/Common/)
 add_executable (03_sycl_migrated src/main.cpp src/flowGold.cpp src/flowSYCL.cpp)
 target_link_libraries(03_sycl_migrated sycl)
 
-add_custom_target (run_cpu cd ${CMAKE_SOURCE_DIR}/03_sycl_migrated/ && ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/03_sycl_migrated)
-add_custom_target (run_gpu SYCL_DEVICE_FILTER=gpu cd ${CMAKE_SOURCE_DIR}/03_sycl_migrated/ && ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/03_sycl_migrated)
+add_custom_target (run cd ${CMAKE_SOURCE_DIR}/03_sycl_migrated/ && ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/03_sycl_migrated)

DirectProgramming/C++SYCL/StructuredGrids/guided_HSOpticalflow_SYCLMigration/03_sycl_migrated/src/flowSYCL.cpp

@@ -43,6 +43,16 @@
 #include "upscaleKernel.hpp"
 #include "warpingKernel.hpp"
 
+// custom device selector to pick device that supports sycl::image
+int sycl_image_support(const sycl::device& d ) {
+  if(d.get_info<info::device::image_support>() == false){
+    std::cout << d.get_info<info::device::name>() << " ==> Image Support = NO\n"; 
+  } else {
+    std::cout << d.get_info<info::device::name>() << " ==> Image Support = YES\n";  
+  }
+  return d.get_info<info::device::image_support>();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief method logic
 ///
@@ -72,9 +82,11 @@ void ComputeFlowSYCL(const float *I0, const float *I1, int width, int height,
       }
     }
   };
-
-  queue q{default_selector_v, exception_handler, property::queue::in_order()};
-  printf("Computing optical flow on GPU...\n");
+  
+  sycl::device preferred_device { sycl_image_support };
+  sycl::queue q(preferred_device, exception_handler, property::queue::in_order());
+  
+  printf("Computing optical flow on Device...\n");
   std::cout << "\nRunning on "
             << q.get_device().get_info<sycl::info::device::name>() << "\n";
 

DirectProgramming/C++SYCL/StructuredGrids/guided_HSOpticalflow_SYCLMigration/03_sycl_migrated/src/main.cpp

@@ -241,7 +241,7 @@ int main(int argc, char **argv) {
   auto SYCL_duration =
       std::chrono::duration_cast<float_ms>(stopSYCLTime - startSYCLTime)
           .count();
-  printf("Processing time on GPU: %f (ms)\n", SYCL_duration);
+  printf("Processing time on Device: %f (ms)\n", SYCL_duration);
 
   // compare results (L1 norm)
   bool status =

DirectProgramming/C++SYCL/StructuredGrids/guided_HSOpticalflow_SYCLMigration/04_sycl_migrated_optimized/CMakeLists.txt

@@ -5,5 +5,4 @@ include_directories(${CMAKE_SOURCE_DIR}/04_sycl_migrated_optimized/Common/)
 add_executable (04_sycl_migrated_optimized src/main.cpp src/flowGold.cpp src/flowSYCL.cpp)
 target_link_libraries(04_sycl_migrated_optimized sycl)
 
-add_custom_target (run_smo_cpu cd ${CMAKE_SOURCE_DIR}/04_sycl_migrated_optimized/ && ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/04_sycl_migrated_optimized)
-add_custom_target (run_smo_gpu SYCL_DEVICE_FILTER=gpu cd ${CMAKE_SOURCE_DIR}/04_sycl_migrated_optimized/ && ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/04_sycl_migrated_optimized)
+add_custom_target (run_smo cd ${CMAKE_SOURCE_DIR}/04_sycl_migrated_optimized/ && ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/04_sycl_migrated_optimized)

DirectProgramming/C++SYCL/StructuredGrids/guided_HSOpticalflow_SYCLMigration/04_sycl_migrated_optimized/src/flowSYCL.cpp

@@ -43,6 +43,16 @@
 #include "upscaleKernel.hpp"
 #include "warpingKernel.hpp"
 
+// custom device selector to pick device that supports sycl::image
+int sycl_image_support(const sycl::device& d ) {
+  if(d.get_info<info::device::image_support>() == false){
+    std::cout << d.get_info<info::device::name>() << " ==> Image Support = NO\n"; 
+  } else {
+    std::cout << d.get_info<info::device::name>() << " ==> Image Support = YES\n";  
+  }
+  return d.get_info<info::device::image_support>();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief method logic
 ///
@@ -73,8 +83,10 @@ void ComputeFlowSYCL(const float *I0, const float *I1, int width, int height,
     }
   };
 
-  queue q{default_selector_v, exception_handler, property::queue::in_order()};
-  printf("Computing optical flow on GPU...\n");
+  sycl::device preferred_device { sycl_image_support };
+  sycl::queue q(preferred_device, exception_handler, property::queue::in_order());
+  
+  printf("Computing optical flow on Device...\n");
   std::cout << "\nRunning on "
             << q.get_device().get_info<sycl::info::device::name>() << "\n";
 

DirectProgramming/C++SYCL/StructuredGrids/guided_HSOpticalflow_SYCLMigration/04_sycl_migrated_optimized/src/main.cpp

@@ -241,7 +241,7 @@ int main(int argc, char **argv) {
   auto SYCL_duration =
       std::chrono::duration_cast<float_ms>(stopSYCLTime - startSYCLTime)
           .count();
-  printf("Processing time on GPU: %f (ms)\n", SYCL_duration);
+  printf("Processing time on Device: %f (ms)\n", SYCL_duration);
 
   // compare results (L1 norm)
   bool status =

DirectProgramming/C++SYCL/StructuredGrids/guided_HSOpticalflow_SYCLMigration/README.md

@@ -100,22 +100,37 @@ If you receive an error message, troubleshoot the problem using the **Diagnostic
 
 You can run the programs for CPU and GPU. The commands indicate the device target.
 
-1. Run `02_sycl_dpct_migrated` for CPU and GPU.
+1. Run `02_sycl_dpct_migrated` for GPU.
     ```
-    make run_sdm_cpu
-    make run_sdm_gpu
+    make run_sdm
+    ```
+   Run `02_sycl_dpct_migrated` for CPU.
+    ```
+    export SYCL_DEVICE_FILTER=cpu
+    make run_sdm
+    unset SYCL_DEVICE_FILTER
     ```
 
-2. Run `03_sycl_migrated` for CPU and GPU.
+2. Run `03_sycl_migrated` for GPU.
+    ```
+    make run
     ```
-    make run_cpu
-    make run_gpu
+   Run `03_sycl_migrated` for CPU.
+    ```
+    export SYCL_DEVICE_FILTER=cpu
+    make run
+    unset SYCL_DEVICE_FILTER
     ```
 
-3. Run `04_sycl_migrated_optimized` for CPU and GPU.
+3. Run `04_sycl_migrated_optimized` for GPU.
+    ```
+    make run_smo
+    ```
+   Run `04_sycl_migrated_optimized` for CPU.
     ```
-    make run_smo_cpu
-    make run_smo_gpu
+    export SYCL_DEVICE_FILTER=cpu
+    make run_smo
+    unset SYCL_DEVICE_FILTER
     ```
 
 ### Build and Run the `HSOpticalFlow` Sample in Intel® DevCloud