Merge pull request #2497 from IgorOchocki/fix_onsam_jira

Fix for ONSAM 1868 and 1869

Author: jimmytwei

DirectProgramming/C++SYCL/DenseLinearAlgebra/guided_jacobi_iterative_gpu_optimization/src/1_guided_jacobi_iterative_solver_cpu.cpp

@@ -48,8 +48,8 @@ void GenerateMatrix(std::vector<float> &input_matrix,
 
     for (int j = i * kSize; j < kSize * (i + 1); ++j) {
       input_matrix[j] = distr(engine);
-      input_matrix[j] = round(100. * input_matrix[j]) / 100.;
-      sum += fabs(input_matrix[j]);
+      input_matrix[j] = sycl::round(100. * input_matrix[j]) / 100.;
+      sum += sycl::fabs(input_matrix[j]);
     }
 
     oneapi::dpl::uniform_int_distribution<int> distr2(0, 100);
@@ -61,7 +61,7 @@ void GenerateMatrix(std::vector<float> &input_matrix,
       input_matrix[i * kSize + i] = -1 * (sum + 1);
 
     input_results[i] = distr(engine);
-    input_results[i] = round(100. * input_results[i]) / 100.;
+    input_results[i] = sycl::round(100. * input_results[i]) / 100.;
   }
 }
 // Function responsible for printing the matrix, called only for N < 10.
@@ -100,7 +100,7 @@ bool CheckIfEqual(Real *data, Real *old_output_data) {
   int correct_result = 0;
 
   for (int i = 0; i < kSize; ++i) {
-    if (fabs(data[i] - old_output_data[i]) < kCheckError) correct_result++;
+    if (sycl::fabs(data[i] - old_output_data[i]) < kCheckError) correct_result++;
   }
 
   return correct_result == kSize;
@@ -194,7 +194,7 @@ int main(int argc, char *argv[]) {
   // given. If the difference is less than the error rate for each of
   // the elements, then all values have been calculated correctly.
   for (int i = 0; i < kSize; ++i) {
-    Real diff = fabs(output_results[i] - input_results[i]);
+    Real diff = sycl::fabs(output_results[i] - input_results[i]);
     if (diff > kCalculationError) all_eq = false;
   }
 

DirectProgramming/C++SYCL/DenseLinearAlgebra/guided_jacobi_iterative_gpu_optimization/src/3_guided_jacobi_iterative_solver_multi_gpu.cpp

@@ -81,7 +81,7 @@ void GenerateMatrix(std::vector<float> &input_matrix,
         in_mat_acc[i * kSize + i] = -1 * (sum + 1);
 
       in_res_acc[i] = distr(engine);
-      in_res_acc[i] = round(100. * in_res_acc[i]) / 100.;
+      in_res_acc[i] = sycl::round(100. * in_res_acc[i]) / 100.;
     });
   });
   q[1].submit([&](handler &h) {

DirectProgramming/C++SYCL/StructuredGrids/iso2dfd_dpcpp/src/iso2dfd.cpp

@@ -149,7 +149,7 @@ bool WithinEpsilon(float* output, float* reference, const size_t dim_x,
   }
 
   err_file.close();
-  norm2 = 1/rsqrt(norm2);
+  norm2 = std::sqrt(norm2);
   if (error) printf("error (Euclidean norm): %.9e\n", norm2);
   return error;
 }
@@ -195,7 +195,8 @@ void Iso2dfdIterationCpu(float* next, float* prev, float* vel,
  *
  */
 void Iso2dfdIterationGlobal(id<2> it, float* next, float* prev,
-                               float* vel, const float dtDIVdxy, int n_rows,
+                               multi_ptr<const float, access::address_space::global_space, (sycl::access::decorated)2> vel, 
+                               const float dtDIVdxy, int n_rows,
                                int n_cols) {
   float value = 0.0;
 

DirectProgramming/C++SYCL/StructuredGrids/iso3dfd_dpcpp/src/iso3dfd_kernels.cpp

@@ -186,7 +186,8 @@ void Iso3dfdIterationSLM(sycl::nd_item<3> it, float *next, float *prev,
  *
  */
 void Iso3dfdIterationGlobal(sycl::nd_item<3> it, float *next, float *prev,
-                            float *vel, const float *coeff, int nx, int nxy,
+                            multi_ptr<const float, access::address_space::global_space, (sycl::access::decorated)2> vel,
+                            const float *coeff, int nx, int nxy,
                             int bx, int by, int z_offset, int full_end_z) {
   // We compute the start and the end position in the grid
   // for each work-item.

DirectProgramming/C++SYCL/StructuredGrids/iso3dfd_dpcpp/src/utils.cpp

@@ -159,7 +159,7 @@ bool WithinEpsilon(float* output, float* reference, const size_t dim_x,
   }
 
   error_file.close();
-  norm2 = 1/rsqrt(norm2);
+  norm2 = std::sqrt(norm2);
   if (error) std::cout << "error (Euclidean norm): " << norm2 << "\n";
   return error;
 }

DirectProgramming/C++SYCL/StructuredGrids/particle-diffusion/src/motionsim_kernel.cpp

@@ -55,8 +55,8 @@ template <typename AccRandom, typename AccGrid, bool HasFp64> class ParticleMoti
       // integer value from floating point value to get just the
       // decimal portion. Use this value to later determine if the
       // particle is inside or outside of the cell
-      float dX = sycl::abs(particle_X_a[p] - sycl::round(particle_X_a[p]));
-      float dY = sycl::abs(particle_Y_a[p] - sycl::round(particle_Y_a[p]));
+      float dX = std::abs(particle_X_a[p] - sycl::round(particle_X_a[p]));
+      float dY = std::abs(particle_Y_a[p] - sycl::round(particle_Y_a[p]));
       /* Grid point indices closest the particle, defined by the following:
       ------------------------------------------------------------------
       |               Condition               |         Result         |