Update clang-format to 15.0.7

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
         hooks:
               - id: cython-lint
       - repo: https://github.com/pre-commit/mirrors-clang-format
-        rev: v11.1.0
+        rev: v15.0.7
         hooks:
               - id: clang-format
                 types_or: [c, c++, cuda]

cpp/include/cuspatial/detail/nvtx/nvtx3.hpp

@@ -585,10 +585,10 @@ constexpr auto has_name_member() noexcept -> decltype(T::name, bool())
  */
 class domain {
  public:
-  domain(domain const&) = delete;
+  domain(domain const&)            = delete;
   domain& operator=(domain const&) = delete;
   domain(domain&&)                 = delete;
-  domain& operator=(domain&&) = delete;
+  domain& operator=(domain&&)      = delete;
 
   /**
    * @brief Returns reference to an instance of a function local static
@@ -663,8 +663,7 @@ class domain {
    * applications will be grouped together.
    *
    */
-  struct global {
-  };
+  struct global {};
 
  private:
   /**
@@ -870,12 +869,12 @@ class color {
    */
   constexpr nvtxColorType_t get_type() const noexcept { return _type; }
 
-  color()             = delete;
-  ~color()            = default;
-  color(color const&) = default;
+  color()                        = delete;
+  ~color()                       = default;
+  color(color const&)            = default;
   color& operator=(color const&) = default;
   color(color&&)                 = default;
-  color& operator=(color&&) = default;
+  color& operator=(color&&)      = default;
 
  private:
   /**
@@ -937,12 +936,12 @@ class category {
    */
   constexpr id_type get_id() const noexcept { return id_; }
 
-  category()                = delete;
-  ~category()               = default;
-  category(category const&) = default;
+  category()                           = delete;
+  ~category()                          = default;
+  category(category const&)            = default;
   category& operator=(category const&) = default;
   category(category&&)                 = default;
-  category& operator=(category&&) = default;
+  category& operator=(category&&)      = default;
 
  private:
   id_type const id_{};  ///< category's unique identifier
@@ -1226,12 +1225,12 @@ class registered_message {
    */
   nvtxStringHandle_t get_handle() const noexcept { return handle_; }
 
-  registered_message()                          = delete;
-  ~registered_message()                         = default;
-  registered_message(registered_message const&) = default;
+  registered_message()                                     = delete;
+  ~registered_message()                                    = default;
+  registered_message(registered_message const&)            = default;
   registered_message& operator=(registered_message const&) = default;
   registered_message(registered_message&&)                 = default;
-  registered_message& operator=(registered_message&&) = default;
+  registered_message& operator=(registered_message&&)      = default;
 
  private:
   nvtxStringHandle_t const handle_{};  ///< The handle returned from
@@ -1612,11 +1611,11 @@ class event_attributes {
     attributes_.messageType = m.get_type();
   }
 
-  ~event_attributes()                       = default;
-  event_attributes(event_attributes const&) = default;
+  ~event_attributes()                                  = default;
+  event_attributes(event_attributes const&)            = default;
   event_attributes& operator=(event_attributes const&) = default;
   event_attributes(event_attributes&&)                 = default;
-  event_attributes& operator=(event_attributes&&) = default;
+  event_attributes& operator=(event_attributes&&)      = default;
 
   /**
    * @brief Get raw pointer to underlying NVTX attributes object.
@@ -1741,10 +1740,10 @@ class domain_thread_range {
    */
   domain_thread_range() : domain_thread_range{event_attributes{}} {}
 
-  domain_thread_range(domain_thread_range const&) = delete;
+  domain_thread_range(domain_thread_range const&)            = delete;
   domain_thread_range& operator=(domain_thread_range const&) = delete;
   domain_thread_range(domain_thread_range&&)                 = delete;
-  domain_thread_range& operator=(domain_thread_range&&) = delete;
+  domain_thread_range& operator=(domain_thread_range&&)      = delete;
 
   /**
    * @brief Destroy the domain_thread_range, ending the NVTX range event.
@@ -1819,7 +1818,7 @@ class domain_process_range {
     if (not moved_from_) { nvtxRangeEnd(range_id_); }
   }
 
-  domain_process_range(domain_process_range const&) = delete;
+  domain_process_range(domain_process_range const&)            = delete;
   domain_process_range& operator=(domain_process_range const&) = delete;
 
   domain_process_range(domain_process_range&& other) noexcept : range_id_{other.range_id_}

cpp/include/cuspatial_test/base_fixture.hpp

@@ -54,8 +54,7 @@ class RMMResourceMixin {
  * class MyTestFixture : public cuspatial::test::BaseFixture {};
  * ```
  */
-class BaseFixture : public RMMResourceMixin, public ::testing::Test {
-};
+class BaseFixture : public RMMResourceMixin, public ::testing::Test {};
 
 /**
  * @brief Base test fixture class from which libcuspatial test with only value parameterization
@@ -79,8 +78,7 @@ class BaseFixture : public RMMResourceMixin, public ::testing::Test {
  */
 template <typename... Ts>
 class BaseFixtureWithParam : public RMMResourceMixin,
-                             public ::testing::TestWithParam<std::tuple<Ts...>> {
-};
+                             public ::testing::TestWithParam<std::tuple<Ts...>> {};
 
 /**
  * @brief Floating point types to be used in libcuspatial tests

cpp/scripts/run-clang-format.py

@@ -22,7 +22,7 @@
 import tempfile
 
 
-EXPECTED_VERSION = "11.1.0"
+EXPECTED_VERSION = "15.0.7"
 VERSION_REGEX = re.compile(r"clang-format version ([0-9.]+)")
 # NOTE: populate this list with more top-level dirs as we add more of them to the cuspatial repo
 DEFAULT_DIRS = ["cpp/include",

cpp/tests/experimental/join/join_quadtree_and_bounding_boxes_test.cu

@@ -26,8 +26,7 @@
 // by the quadtree_point_in_polygon_test_small.cu test file.
 
 template <typename T>
-struct JoinQuadtreeAndBoundingBoxesErrorTest : public cuspatial::test::BaseFixture {
-};
+struct JoinQuadtreeAndBoundingBoxesErrorTest : public cuspatial::test::BaseFixture {};
 
 using TestTypes = ::testing::Types<float, double>;
 

cpp/tests/experimental/join/quadtree_point_in_polygon_test_large.cu

@@ -42,8 +42,7 @@
  */
 
 template <typename T>
-struct PIPRefineTestLarge : public cuspatial::test::BaseFixture {
-};
+struct PIPRefineTestLarge : public cuspatial::test::BaseFixture {};
 
 using TestTypes = ::testing::Types<float, double>;
 

cpp/tests/experimental/join/quadtree_point_in_polygon_test_small.cu

@@ -34,8 +34,7 @@
  * fully tested.
  */
 template <typename T>
-struct PIPRefineTestSmall : public cuspatial::test::BaseFixture {
-};
+struct PIPRefineTestSmall : public cuspatial::test::BaseFixture {};
 
 using TestTypes = ::testing::Types<float, double>;
 

cpp/tests/experimental/join/quadtree_point_to_nearest_linestring_test_small.cu

@@ -27,8 +27,7 @@
 #include <type_traits>
 
 template <typename T>
-struct QuadtreePointToLinestringTestSmall : public cuspatial::test::BaseFixture {
-};
+struct QuadtreePointToLinestringTestSmall : public cuspatial::test::BaseFixture {};
 
 using TestTypes = ::testing::Types<float, double>;
 

cpp/tests/experimental/operators/linestrings_test.cu

@@ -40,8 +40,7 @@ template <typename T>
 using optional_vec2d = thrust::optional<vec_2d<T>>;
 
 template <typename T>
-struct SegmentIntersectionTest : public BaseFixture {
-};
+struct SegmentIntersectionTest : public BaseFixture {};
 
 using TestTypes = ::testing::Types<float, double>;
 TYPED_TEST_CASE(SegmentIntersectionTest, TestTypes);

cpp/tests/experimental/spatial/haversine_test.cu

@@ -26,8 +26,7 @@
 #include <gtest/gtest.h>
 
 template <typename T>
-struct HaversineTest : public ::testing::Test {
-};
+struct HaversineTest : public ::testing::Test {};
 
 // float and double are logically the same but would require separate tests due to precision.
 using TestTypes = ::testing::Types<float, double>;

cpp/tests/experimental/spatial/linestring_bounding_boxes_test.cu

@@ -25,8 +25,7 @@
 #include <gtest/gtest.h>
 
 template <typename T>
-struct LinestringBoundingBoxTest : public ::testing::Test {
-};
+struct LinestringBoundingBoxTest : public ::testing::Test {};
 
 using cuspatial::vec_2d;
 using cuspatial::test::make_device_vector;

cpp/tests/experimental/spatial/linestring_distance_test.cu

@@ -29,11 +29,9 @@ using namespace cuspatial;
 using namespace cuspatial::test;
 
 template <typename T>
-struct PairwiseLinestringDistanceTest : public ::testing::Test {
-};
+struct PairwiseLinestringDistanceTest : public ::testing::Test {};
 
-struct PairwiseLinestringDistanceTestUntyped : public ::testing::Test {
-};
+struct PairwiseLinestringDistanceTestUntyped : public ::testing::Test {};
 
 // float and double are logically the same but would require separate tests due to precision.
 using TestTypes = ::testing::Types<float, double>;

cpp/tests/experimental/spatial/linestring_distance_test_medium.cu

@@ -34,8 +34,7 @@ using namespace cuspatial;
 using namespace cuspatial::test;
 
 template <typename T>
-struct PairwiseLinestringDistanceTestMedium : public ::testing::Test {
-};
+struct PairwiseLinestringDistanceTestMedium : public ::testing::Test {};
 
 // float and double are logically the same but would require separate tests due to precision.
 using TestTypes = ::testing::Types<float, double>;

cpp/tests/experimental/spatial/pairwise_point_in_polygon_test.cu

@@ -32,8 +32,7 @@ using namespace cuspatial;
 using namespace cuspatial::test;
 
 template <typename T>
-struct PairwisePointInPolygonTest : public ::testing::Test {
-};
+struct PairwisePointInPolygonTest : public ::testing::Test {};
 
 // float and double are logically the same but would require separate tests due to precision.
 using TestTypes = ::testing::Types<float, double>;
@@ -43,13 +42,13 @@ TYPED_TEST(PairwisePointInPolygonTest, OnePolygonOneRing)
 {
   using T                = TypeParam;
   auto point_list        = std::vector<std::vector<T>>{{-2.0, 0.0},
-                                                {2.0, 0.0},
-                                                {0.0, -2.0},
-                                                {0.0, 2.0},
-                                                {-0.5, 0.0},
-                                                {0.5, 0.0},
-                                                {0.0, -0.5},
-                                                {0.0, 0.5}};
+                                                       {2.0, 0.0},
+                                                       {0.0, -2.0},
+                                                       {0.0, 2.0},
+                                                       {-0.5, 0.0},
+                                                       {0.5, 0.0},
+                                                       {0.0, -0.5},
+                                                       {0.0, 0.5}};
   auto poly_offsets      = make_device_vector({0, 1});
   auto poly_ring_offsets = make_device_vector({0, 5});
   auto poly_point        = make_device_vector<vec_2d<T>>(
@@ -90,15 +89,15 @@ TYPED_TEST(PairwisePointInPolygonTest, TwoPolygonsOneRingEach)
   auto poly_offsets      = make_device_vector({0, 1, 2});
   auto poly_ring_offsets = make_device_vector({0, 5, 10});
   auto poly_point        = make_device_vector<vec_2d<T>>({{-1.0, -1.0},
-                                                   {-1.0, 1.0},
-                                                   {1.0, 1.0},
-                                                   {1.0, -1.0},
-                                                   {-1.0, -1.0},
-                                                   {0.0, 1.0},
-                                                   {1.0, 0.0},
-                                                   {0.0, -1.0},
-                                                   {-1.0, 0.0},
-                                                   {0.0, 1.0}});
+                                                          {-1.0, 1.0},
+                                                          {1.0, 1.0},
+                                                          {1.0, -1.0},
+                                                          {-1.0, -1.0},
+                                                          {0.0, 1.0},
+                                                          {1.0, 0.0},
+                                                          {0.0, -1.0},
+                                                          {-1.0, 0.0},
+                                                          {0.0, 1.0}});
 
   auto got      = rmm::device_vector<int32_t>(2);
   auto expected = std::vector<int>({false, false, false, false, true, true, true, true});
@@ -129,15 +128,15 @@ TYPED_TEST(PairwisePointInPolygonTest, OnePolygonTwoRings)
   auto poly_offsets      = make_device_vector({0, 1});
   auto poly_ring_offsets = make_device_vector({0, 5, 10});
   auto poly_point        = make_device_vector<vec_2d<T>>({{-1.0, -1.0},
-                                                   {1.0, -1.0},
-                                                   {1.0, 1.0},
-                                                   {-1.0, 1.0},
-                                                   {-1.0, -1.0},
-                                                   {-0.5, -0.5},
-                                                   {-0.5, 0.5},
-                                                   {0.5, 0.5},
-                                                   {0.5, -0.5},
-                                                   {-0.5, -0.5}});
+                                                          {1.0, -1.0},
+                                                          {1.0, 1.0},
+                                                          {-1.0, 1.0},
+                                                          {-1.0, -1.0},
+                                                          {-0.5, -0.5},
+                                                          {-0.5, 0.5},
+                                                          {0.5, 0.5},
+                                                          {0.5, -0.5},
+                                                          {-0.5, -0.5}});
 
   auto got      = rmm::device_vector<int32_t>(1);
   auto expected = std::vector<int>{0b0, 0b0, 0b1, 0b0, 0b1};
@@ -299,8 +298,7 @@ TYPED_TEST(PairwisePointInPolygonTest, 32PolygonSupport)
   EXPECT_EQ(ret, got.end());
 }
 
-struct PairwisePointInPolygonErrorTest : public PairwisePointInPolygonTest<double> {
-};
+struct PairwisePointInPolygonErrorTest : public PairwisePointInPolygonTest<double> {};
 
 TEST_F(PairwisePointInPolygonErrorTest, InsufficientPoints)
 {