Merge pull request #2467 from whitepau/cleanup-cmath-and-complex

jimmytwei · web-flow · commit f8cf7d732a46 · 2024-08-28T07:43:19.000-07:00
add &lt;cmath&gt; include where appropriate
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/anr/src/anr.hpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/anr/src/anr.hpp
@@ -14,7 +14,7 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include <math.h>
+#include <cmath>
 
 #include "anr_params.hpp"
 #include "column_stencil.hpp"
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/anr/src/main.cpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/anr/src/main.cpp
@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <array>
 #include <chrono>
+#include <cmath>
 #include <limits>
 #include <numeric>
 #include <sstream>
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/cholesky/src/cholesky_demo.cpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/cholesky/src/cholesky_demo.cpp
@@ -1,4 +1,4 @@
-#include <math.h>
+#include <cmath>
 
 #include <sycl/sycl.hpp>
 #include <list>
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/cholesky_inversion/src/cholesky_inversion_demo.cpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/cholesky_inversion/src/cholesky_inversion_demo.cpp
@@ -1,4 +1,4 @@
-#include <math.h>
+#include <cmath>
 
 #include <sycl/sycl.hpp>
 #include <list>
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/convolution2d/include/bmp_tools.hpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/convolution2d/include/bmp_tools.hpp
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <cmath>
 #include <fstream>
 #include <iostream>
 
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/crr/src/main.cpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/crr/src/main.cpp
@@ -92,6 +92,7 @@
 
 #include <sycl/sycl.hpp>
 #include <sycl/ext/intel/fpga_extensions.hpp>
+#include <cmath>
 #include <cstddef>
 #include <cstdlib>
 #include <fstream>
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/fft2d/src/fft2d_demo.cpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/fft2d/src/fft2d_demo.cpp
@@ -1,4 +1,4 @@
-#include <math.h>
+#include <cmath>
 
 #define _USE_MATH_DEFINES
 #include <cmath>
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/matmul/src/matmul_demo.cpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/matmul/src/matmul_demo.cpp
@@ -1,3 +1,4 @@
+#include <cmath>
 #include <iomanip>
 #include <iostream>
 
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/pca/src/golden_pca.hpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/pca/src/golden_pca.hpp
@@ -1,4 +1,4 @@
-#include <math.h>
+#include <cmath>
 
 #include <iomanip>
 #include <random>
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/pca/src/pca_demo.cpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/pca/src/pca_demo.cpp
@@ -1,3 +1,4 @@
+#include <cmath>
 #include <sycl/ext/intel/ac_types/ac_int.hpp>
 #include <sycl/ext/intel/fpga_extensions.hpp>
 #include <sycl/sycl.hpp>
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/qrd/src/qrd_demo.cpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/qrd/src/qrd_demo.cpp
@@ -1,4 +1,4 @@
-#include <math.h>
+#include <cmath>
 
 #include <sycl/sycl.hpp>
 #include <sycl/ext/intel/fpga_extensions.hpp>
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/qri/src/qri_demo.cpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/qri/src/qri_demo.cpp
@@ -1,4 +1,4 @@
-#include <math.h>
+#include <cmath>
 #include <sycl/sycl.hpp>
 #include <chrono>
 #include <iomanip>
diff --git a/DirectProgramming/C++SYCL_FPGA/Tutorials/Features/ac_fixed/src/ac_fixed.cpp b/DirectProgramming/C++SYCL_FPGA/Tutorials/Features/ac_fixed/src/ac_fixed.cpp
@@ -4,7 +4,7 @@
 #include <sycl/ext/intel/fpga_extensions.hpp>
 
 #include <iomanip>  // for std::setprecision
-#include <math.h>
+#include <cmath>
 
 #include "exception_handler.hpp"
 
@@ -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::sqrt(sin_x * sin_x + cos_x * cos_x);
     });
   });
 }
diff --git a/DirectProgramming/C++SYCL_FPGA/Tutorials/Features/experimental/device_global/src/device_global.cpp b/DirectProgramming/C++SYCL_FPGA/Tutorials/Features/experimental/device_global/src/device_global.cpp
@@ -3,8 +3,6 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <math.h>
-
 #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
 
diff --git a/DirectProgramming/C++SYCL_FPGA/Tutorials/Features/max_interleaving/src/max_interleaving.cpp b/DirectProgramming/C++SYCL_FPGA/Tutorials/Features/max_interleaving/src/max_interleaving.cpp
@@ -4,6 +4,7 @@
 // SPDX-License-Identifier: MIT
 // =============================================================
 #include <array>
+#include <cmath>
 #include <sycl/sycl.hpp>
 #include <sycl/ext/intel/fpga_extensions.hpp>
 #include <iomanip>
diff --git a/DirectProgramming/C++SYCL_FPGA/Tutorials/Features/private_copies/src/private_copies.cpp b/DirectProgramming/C++SYCL_FPGA/Tutorials/Features/private_copies/src/private_copies.cpp
@@ -3,7 +3,6 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <math.h>
 
 #include <array>
 #include <iomanip>
diff --git a/DirectProgramming/C++SYCL_FPGA/Tutorials/Features/speculated_iterations/src/speculated_iterations.cpp b/DirectProgramming/C++SYCL_FPGA/Tutorials/Features/speculated_iterations/src/speculated_iterations.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <string>
 #include <type_traits>
-#include <math.h>
+#include <cmath>
 
 #include "exception_handler.hpp"
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <math.h>`
	`1`	`+#include <cmath>`
`2`	`2`
`3`	`3`	`#include <sycl/sycl.hpp>`
`4`	`4`	`#include <list>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#include <cmath>`
`1`	`2`	`#include <iomanip>`
`2`	`3`	`#include <iostream>`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#include <cmath>`
`1`	`2`	`#include <sycl/ext/intel/ac_types/ac_int.hpp>`
`2`	`3`	`#include <sycl/ext/intel/fpga_extensions.hpp>`
`3`	`4`	`#include <sycl/sycl.hpp>`