one more cleanup

Author: whitepau

DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/anr/src/intensity_sigma_lut.hpp

@@ -1,7 +1,6 @@
 #ifndef __INTENSITY_SIGMA_LUT_HPP__
 #define __INTENSITY_SIGMA_LUT_HPP__
 
-#include <cmath>
 #include <sycl/sycl.hpp>
 #include <sycl/ext/intel/fpga_extensions.hpp>
 #include <type_traits>

DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/anr/src/qfp_exp_lut.hpp

@@ -1,8 +1,6 @@
 #ifndef __QFP_EXP_LUT_HPP__
 #define __QFP_EXP_LUT_HPP__
 
-#include <cmath>
-
 #include "qfp.hpp"
 
 // Included from DirectProgramming/C++SYCL_FPGA/include/

DirectProgramming/C++SYCL_FPGA/Tutorials/Features/ac_fixed/src/ac_fixed.cpp

@@ -75,7 +75,7 @@ void TestCalculateWithFloat(queue &q, const float &x, float &ret) {
     h.single_task<CalculateWithFloat>([=] {
       float sin_x = sinf(x[0]);
       float cos_x = cosf(x[0]);
-      res[0] = sqrtf(sin_x * sin_x + cos_x * cos_x);
+      res[0] = sycl::sqrtf(sin_x * sin_x + cos_x * cos_x);
     });
   });
 }

DirectProgramming/C++SYCL_FPGA/Tutorials/Features/experimental/device_global/src/device_global.cpp

@@ -3,8 +3,6 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <cmath>
-
 #include <iostream>
 #include <sycl/ext/intel/fpga_extensions.hpp>
 #include <sycl/sycl.hpp>
@@ -15,13 +13,13 @@ constexpr size_t kNumIterations = 4;
 constexpr unsigned kNumWeightIncrements = 3;
 constexpr unsigned kVectorSize = 4;
 
-namespace exp = sycl::ext::oneapi::experimental;
+namespace syclexp = sycl::ext::oneapi::experimental;
 
-using WeightsDeviceGlobalProperties =
-    decltype(exp::properties(exp::device_image_scope, exp::host_access_write));
+using WeightsDeviceGlobalProperties = decltype(syclexp::properties(
+    syclexp::device_image_scope, syclexp::host_access_write));
 
 // globally declared weights for the calculation
-exp::device_global<int[kVectorSize], WeightsDeviceGlobalProperties> weights;
+syclexp::device_global<int[kVectorSize], WeightsDeviceGlobalProperties> weights;
 
 // Forward declare the kernel name in the global scope.
 // This FPGA best practice reduces name mangling in the optimization reports.
@@ -30,7 +28,6 @@ class Kernel;
 // Launch a kernel that does a weighted vector add
 // result = a + (weights * b)
 void WeightedVectorAdd(sycl::queue q, int *a, int *b, int *result) {
-
   q.single_task<Kernel>([=]() [[intel::kernel_args_restrict]] {
     for (auto i = 0; i < kVectorSize; i++) {
       result[i] = a[i] + (weights[i] * b[i]);
@@ -47,7 +44,7 @@ int main() {
     auto selector = sycl::ext::intel::fpga_simulator_selector_v;
 #elif FPGA_HARDWARE
     auto selector = sycl::ext::intel::fpga_selector_v;
-#else // #if FPGA_EMULATOR
+#else  // #if FPGA_EMULATOR
     auto selector = sycl::ext::intel::fpga_emulator_selector_v;
 #endif
 

DirectProgramming/C++SYCL_FPGA/Tutorials/Features/private_copies/src/private_copies.cpp

@@ -3,7 +3,6 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <cmath>
 
 #include <array>
 #include <iomanip>