Merge pull request #2508 from vidyalathabadde/fix_for_onsam_2013

Fix_for_onsam_2013

Author: jimmytwei

DirectProgramming/C++SYCL/SYCLMigration/guided_alignedTypes_SYCLMigration/02_sycl_migrated/include/dpct/dpct.hpp

@@ -25,7 +25,7 @@ template <int Arg> class dpct_kernel_scalar;
 #include "memory.hpp"
 #include "util.hpp"
 
-#include "bindless_images.hpp"
+//#include "bindless_images.hpp"
 
 #if defined(_MSC_VER)
 #define __dpct_align__(n) __declspec(align(n))

DirectProgramming/C++SYCL/SYCLMigration/guided_bandwidthTest_SYCLMigration/01_dpct_output/include/dpct/dpct.hpp

@@ -25,7 +25,7 @@ template <int Arg> class dpct_kernel_scalar;
 #include "memory.hpp"
 #include "util.hpp"
 
-#include "bindless_images.hpp"
+//#include "bindless_images.hpp"
 
 #if defined(_MSC_VER)
 #define __dpct_align__(n) __declspec(align(n))

DirectProgramming/C++SYCL/SYCLMigration/guided_bandwidthTest_SYCLMigration/02_sycl_migrated/include/dpct/dpct.hpp

@@ -25,7 +25,7 @@ template <int Arg> class dpct_kernel_scalar;
 #include "memory.hpp"
 #include "util.hpp"
 
-#include "bindless_images.hpp"
+//#include "bindless_images.hpp"
 
 #if defined(_MSC_VER)
 #define __dpct_align__(n) __declspec(align(n))

DirectProgramming/C++SYCL/SYCLMigration/guided_convolutionSeparable_SYCLMigration/01_dpct_output/include/dpct/dpct.hpp

@@ -25,7 +25,7 @@ template <int Arg> class dpct_kernel_scalar;
 #include "memory.hpp"
 #include "util.hpp"
 
-#include "bindless_images.hpp"
+//#include "bindless_images.hpp"
 
 #if defined(_MSC_VER)
 #define __dpct_align__(n) __declspec(align(n))

DirectProgramming/C++SYCL/SYCLMigration/guided_convolutionSeparable_SYCLMigration/02_sycl_migrated_optimized/include/dpct/dpct.hpp

@@ -25,7 +25,7 @@ template <int Arg> class dpct_kernel_scalar;
 #include "memory.hpp"
 #include "util.hpp"
 
-#include "bindless_images.hpp"
+//#include "bindless_images.hpp"
 
 #if defined(_MSC_VER)
 #define __dpct_align__(n) __declspec(align(n))

DirectProgramming/C++SYCL/SYCLMigration/guided_cudaOpenMP_SYCLMigration/01_dpct_output/include/dpct/dpct.hpp

@@ -25,7 +25,7 @@ template <int Arg> class dpct_kernel_scalar;
 #include "memory.hpp"
 #include "util.hpp"
 
-#include "bindless_images.hpp"
+//#include "bindless_images.hpp"
 
 #if defined(_MSC_VER)
 #define __dpct_align__(n) __declspec(align(n))

DirectProgramming/C++SYCL/SYCLMigration/guided_cudaOpenMP_SYCLMigration/02_sycl_migrated/include/dpct/dpct.hpp

@@ -25,7 +25,7 @@ template <int Arg> class dpct_kernel_scalar;
 #include "memory.hpp"
 #include "util.hpp"
 
-#include "bindless_images.hpp"
+//#include "bindless_images.hpp"
 
 #if defined(_MSC_VER)
 #define __dpct_align__(n) __declspec(align(n))

DirectProgramming/C++SYCL/SYCLMigration/guided_dwtHaar1D_SYCLMigration/01_dpct_output/Samples/5_Domain_Specific/dwtHaar1D/dwtHaar1D.dp.cpp

@@ -335,9 +335,9 @@ void runTest(int argc, char **argv) {
 
     // update block and grid size
     grid_size[2] =
-        (num_threads_total_left / 512) + (0 != (num_threads_total_left % 512))
+        (num_threads_total_left / 512) + ((0 != (num_threads_total_left % 512))
             ? 1
-            : 0;
+            : 0);
 
     if (grid_size[2] <= 1) {
       block_size[2] = num_threads_total_left;
@@ -352,7 +352,7 @@ void runTest(int argc, char **argv) {
 
   // post processing
   // write file for regression test
-  if (r_fname == NULL) {
+  if (r_fname[0] == '\0') {
     fprintf(stderr,
             "Cannot write the output file storing the result of the wavelet "
             "decomposition.\n%s",

DirectProgramming/C++SYCL/SYCLMigration/guided_dwtHaar1D_SYCLMigration/01_dpct_output/include/dpct/dpct.hpp

@@ -25,7 +25,7 @@ template <int Arg> class dpct_kernel_scalar;
 #include "memory.hpp"
 #include "util.hpp"
 
-#include "bindless_images.hpp"
+//#include "bindless_images.hpp"
 
 #if defined(_MSC_VER)
 #define __dpct_align__(n) __declspec(align(n))

DirectProgramming/C++SYCL/SYCLMigration/guided_dwtHaar1D_SYCLMigration/02_sycl_migrated/Samples/5_Domain_Specific/dwtHaar1D/dwtHaar1D.dp.cpp

@@ -320,9 +320,9 @@ void runTest(int argc, char **argv) {
 
     // update block and grid size
     grid_size[2] =
-        (num_threads_total_left / 512) + (0 != (num_threads_total_left % 512))
+        (num_threads_total_left / 512) + (0 != ((num_threads_total_left % 512))
             ? 1
-            : 0;
+            : 0);
 
     if (grid_size[2] <= 1) {
       block_size[2] = num_threads_total_left;
@@ -337,7 +337,7 @@ void runTest(int argc, char **argv) {
 
   // post processing
   // write file for regression test
-  if (r_fname == NULL) {
+  if (r_fname[0] == '\0') {
     fprintf(stderr,
             "Cannot write the output file storing the result of the wavelet "
             "decomposition.\n%s",