Regroup headers using clang-format

rapidsai · Feb 27, 2024 · 079de75 · 079de75
1 parent 2392d75
commit 079de75
Show file tree

Hide file tree

Showing 75 changed files with 235 additions and 270 deletions.
diff --git a/cpp/benchmarks/distance/hausdorff_benchmark.cpp b/cpp/benchmarks/distance/hausdorff_benchmark.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <cuspatial/distance.hpp>
-
 #include <benchmarks/fixture/benchmark_fixture.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 
+#include <cuspatial/distance.hpp>
+
 #include <cudf/detail/iterator.cuh>
 #include <cudf_test/column_wrapper.hpp>
 

diff --git a/cpp/benchmarks/distance/pairwise_linestring_distance.cu b/cpp/benchmarks/distance/pairwise_linestring_distance.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,15 @@
  */
 
 #include <benchmarks/fixture/rmm_pool_raii.hpp>
-#include <nvbench/nvbench.cuh>
 
 #include <cuspatial_test/geometry_generator.cuh>
 
 #include <cuspatial/distance.cuh>
 
 #include <rmm/cuda_stream_view.hpp>
 
+#include <nvbench/nvbench.cuh>
+
 using namespace cuspatial;
 
 template <typename T>

diff --git a/cpp/benchmarks/distance/pairwise_linestring_polygon_distance.cu b/cpp/benchmarks/distance/pairwise_linestring_polygon_distance.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,15 @@
  */
 
 #include <benchmarks/fixture/rmm_pool_raii.hpp>
-#include <nvbench/nvbench.cuh>
 
 #include <cuspatial_test/geometry_generator.cuh>
 
 #include <cuspatial/distance.cuh>
 
 #include <rmm/cuda_stream_view.hpp>
 
+#include <nvbench/nvbench.cuh>
+
 using namespace cuspatial;
 
 template <typename T>

diff --git a/cpp/benchmarks/distance/pairwise_point_polygon_distance.cu b/cpp/benchmarks/distance/pairwise_point_polygon_distance.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 
 #include <benchmarks/fixture/rmm_pool_raii.hpp>
-#include <nvbench/nvbench.cuh>
 
 #include <cuspatial_test/geometry_generator.cuh>
 
@@ -25,6 +24,8 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <nvbench/nvbench.cuh>
+
 using namespace cuspatial;
 using namespace cuspatial::test;
 

diff --git a/cpp/benchmarks/indexing/quadtree_on_points.cu b/cpp/benchmarks/indexing/quadtree_on_points.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
+#include <benchmarks/fixture/rmm_pool_raii.hpp>
+
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/point_quadtree.cuh>
 
-#include <benchmarks/fixture/rmm_pool_raii.hpp>
-#include <nvbench/nvbench.cuh>
-
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_vector.hpp>
-
 #include <rmm/exec_policy.hpp>
+
 #include <thrust/host_vector.h>
 
+#include <nvbench/nvbench.cuh>
+
 using namespace cuspatial;
 
 template <typename T>

diff --git a/cpp/benchmarks/point_in_polygon/point_in_polygon.cu b/cpp/benchmarks/point_in_polygon/point_in_polygon.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 
 #include <benchmarks/fixture/rmm_pool_raii.hpp>
-#include <nvbench/nvbench.cuh>
 
 #include <cuspatial_test/geometry_generator.cuh>
 
@@ -27,6 +26,8 @@
 
 #include <thrust/iterator/counting_iterator.h>
 
+#include <nvbench/nvbench.cuh>
+
 #include <memory>
 #include <numeric>
 

diff --git a/cpp/benchmarks/points_in_range/points_in_range.cu b/cpp/benchmarks/points_in_range/points_in_range.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,14 +26,14 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <nvbench/nvbench.cuh>
-
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/random/linear_congruential_engine.h>
 #include <thrust/random/normal_distribution.h>
 #include <thrust/random/uniform_int_distribution.h>
 #include <thrust/tabulate.h>
 
+#include <nvbench/nvbench.cuh>
+
 #include <memory>
 
 using cuspatial::vec_2d;

diff --git a/cpp/benchmarks/synchronization/synchronization.hpp b/cpp/benchmarks/synchronization/synchronization.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,14 @@
  * limitations under the License.
  */
 
+#pragma once
+
+#include <rmm/cuda_stream_view.hpp>
+
+#include <driver_types.h>
+
+#include <benchmark/benchmark.h>
+
 /**
  * @file synchronization.hpp
  * @brief This is the header file for `cuda_event_timer`.
@@ -52,22 +60,8 @@
     // Register the function as a benchmark. You will need to set the `UseManualTime()`
     // flag in order to use the timer embedded in this class.
     BENCHMARK(sample_cuda_benchmark)->UseManualTime();
-
-
  **/
 
-#ifndef CUDF_BENCH_SYNCHRONIZATION_H
-#define CUDF_BENCH_SYNCHRONIZATION_H
-
-// Google Benchmark library
-#include <benchmark/benchmark.h>
-
-#include <cudf/types.hpp>
-
-#include <rmm/cuda_stream_view.hpp>
-
-#include <driver_types.h>
-
 class cuda_event_timer {
  public:
   /**
@@ -99,5 +93,3 @@ class cuda_event_timer {
   rmm::cuda_stream_view stream;
   benchmark::State* p_state;
 };
-
-#endif
diff --git a/cpp/benchmarks/utility/floating_point_equality.cu b/cpp/benchmarks/utility/floating_point_equality.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 
 #include <benchmarks/fixture/rmm_pool_raii.hpp>
+
 #include <cuspatial_test/random.cuh>
 
 #include <cuspatial/detail/utility/floating_point.cuh>
@@ -23,10 +24,10 @@
 #include <rmm/device_vector.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <nvbench/nvbench.cuh>
-
 #include <thrust/tabulate.h>
 
+#include <nvbench/nvbench.cuh>
+
 #include <memory>
 #include <type_traits>
 

diff --git a/cpp/cuproj/benchmarks/synchronization/synchronization.hpp b/cpp/cuproj/benchmarks/synchronization/synchronization.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,14 @@
  * limitations under the License.
  */
 
+#pragma once
+
+#include <rmm/cuda_stream_view.hpp>
+
+#include <driver_types.h>
+
+#include <benchmark/benchmark.h>
+
 /**
  * @file synchronization.hpp
  * @brief This is the header file for `cuda_event_timer`.
@@ -52,22 +60,8 @@
     // Register the function as a benchmark. You will need to set the `UseManualTime()`
     // flag in order to use the timer embedded in this class.
     BENCHMARK(sample_cuda_benchmark)->UseManualTime();
-
-
  **/
 
-#ifndef CUDF_BENCH_SYNCHRONIZATION_H
-#define CUDF_BENCH_SYNCHRONIZATION_H
-
-// Google Benchmark library
-#include <benchmark/benchmark.h>
-
-#include <cudf/types.hpp>
-
-#include <rmm/cuda_stream_view.hpp>
-
-#include <driver_types.h>
-
 class cuda_event_timer {
  public:
   /**
@@ -99,5 +93,3 @@ class cuda_event_timer {
   rmm::cuda_stream_view stream;
   benchmark::State* p_state;
 };
-
-#endif
diff --git a/cpp/cuproj/benchmarks/wgs_to_utm_bench.cu b/cpp/cuproj/benchmarks/wgs_to_utm_bench.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <cuproj/projection_factories.cuh>
-#include <cuspatial/geometry/vec_2d.hpp>
+#include <benchmarks/fixture/benchmark_fixture.hpp>
+#include <benchmarks/synchronization/synchronization.hpp>
 
 #include <cuproj_test/convert_coordinates.hpp>
 #include <cuproj_test/coordinate_generator.cuh>
 
-#include <benchmarks/fixture/benchmark_fixture.hpp>
-#include <benchmarks/synchronization/synchronization.hpp>
+#include <cuproj/projection_factories.cuh>
+#include <cuspatial/geometry/vec_2d.hpp>
 
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_vector.hpp>

diff --git a/cpp/cuproj/tests/wgs_to_utm_test.cu b/cpp/cuproj/tests/wgs_to_utm_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +16,21 @@
 
 #include <cuproj_test/convert_coordinates.hpp>
 #include <cuproj_test/coordinate_generator.cuh>
+#include <cuspatial_test/vector_equality.hpp>
 
 #include <cuproj/error.hpp>
 #include <cuproj/projection_factories.cuh>
 #include <cuproj/vec_2d.hpp>
 
-#include <cuspatial_test/vector_equality.hpp>
-
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
 #include <thrust/device_vector.h>
 #include <thrust/host_vector.h>
 #include <thrust/tabulate.h>
 
-#include <proj.h>
-
 #include <gtest/gtest.h>
+#include <proj.h>
 
 #include <cmath>
 #include <iostream>

diff --git a/cpp/include/cuspatial/detail/algorithm/is_point_in_polygon.cuh b/cpp/include/cuspatial/detail/algorithm/is_point_in_polygon.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,13 @@
 
 #pragma once
 
+#include <cuspatial/detail/utility/floating_point.cuh>
+#include <cuspatial/geometry/polygon_ref.cuh>
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/geometry/vec_3d.hpp>
 #include <cuspatial/geometry_collection/multipoint_ref.cuh>
 #include <cuspatial/traits.hpp>
 
-#include <cuspatial/detail/utility/floating_point.cuh>
-#include <cuspatial/geometry/polygon_ref.cuh>
-
 #include <thrust/swap.h>
 
 namespace cuspatial {

diff --git a/cpp/include/cuspatial/detail/bounding_boxes.cuh b/cpp/include/cuspatial/detail/bounding_boxes.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/reduce.h>
+
 #include <type_traits>
 
 namespace cuspatial {