diff --git a/cpp/benchmarks/distance/hausdorff_benchmark.cpp b/cpp/benchmarks/distance/hausdorff_benchmark.cpp index 8d39b7167..841ef23d2 100644 --- a/cpp/benchmarks/distance/hausdorff_benchmark.cpp +++ b/cpp/benchmarks/distance/hausdorff_benchmark.cpp @@ -53,7 +53,7 @@ class HausdorffBenchmark : public cuspatial::benchmark { virtual void SetUp(const ::benchmark::State& state) override { mr = std::make_shared(); - rmm::mr::set_current_device_resource(mr.get()); // set default resource to cuda + rmm::mr::set_current_device_resource_ref(mr.get()); // set default resource to cuda } }; diff --git a/cpp/benchmarks/fixture/benchmark_fixture.hpp b/cpp/benchmarks/fixture/benchmark_fixture.hpp index 25b7cdfb5..0b5e4292d 100644 --- a/cpp/benchmarks/fixture/benchmark_fixture.hpp +++ b/cpp/benchmarks/fixture/benchmark_fixture.hpp @@ -73,13 +73,13 @@ class benchmark : public ::benchmark::Fixture { virtual void SetUp(const ::benchmark::State& state) { mr = make_pool(); - rmm::mr::set_current_device_resource(mr.get()); // set default resource to pool + rmm::mr::set_current_device_resource_ref(mr.get()); // set default resource to pool } virtual void TearDown(const ::benchmark::State& state) { // reset default resource to the initial resource - rmm::mr::set_current_device_resource(nullptr); + rmm::mr::reset_current_device_resource_ref(); } // eliminate partial override warnings (see benchmark/benchmark.h) diff --git a/cpp/benchmarks/fixture/rmm_pool_raii.hpp b/cpp/benchmarks/fixture/rmm_pool_raii.hpp index da3b35a05..85393637d 100644 --- a/cpp/benchmarks/fixture/rmm_pool_raii.hpp +++ b/cpp/benchmarks/fixture/rmm_pool_raii.hpp @@ -58,12 +58,12 @@ class rmm_pool_raii { rmm_pool_raii() { mr = make_pool(); - rmm::mr::set_current_device_resource(mr.get()); // set default resource to pool + rmm::mr::set_current_device_resource_ref(mr.get()); // set default resource to pool } ~rmm_pool_raii() { - rmm::mr::set_current_device_resource(nullptr); + rmm::mr::reset_current_device_resource_ref(); mr.reset(); } diff --git a/cpp/cuproj/benchmarks/fixture/benchmark_fixture.hpp b/cpp/cuproj/benchmarks/fixture/benchmark_fixture.hpp index a41e69393..51afc408f 100644 --- a/cpp/cuproj/benchmarks/fixture/benchmark_fixture.hpp +++ b/cpp/cuproj/benchmarks/fixture/benchmark_fixture.hpp @@ -73,13 +73,13 @@ class benchmark : public ::benchmark::Fixture { virtual void SetUp(const ::benchmark::State& state) override { mr = make_pool(); - rmm::mr::set_current_device_resource(mr.get()); // set default resource to pool + rmm::mr::set_current_device_resource_ref(mr.get()); // set default resource to pool } virtual void TearDown(const ::benchmark::State& state) override { // reset default resource to the initial resource - rmm::mr::set_current_device_resource(nullptr); + rmm::mr::reset_current_device_resource_ref(); mr.reset(); } diff --git a/cpp/include/cuspatial/bounding_boxes.hpp b/cpp/include/cuspatial/bounding_boxes.hpp index 2134bc1d1..e9ec3c817 100644 --- a/cpp/include/cuspatial/bounding_boxes.hpp +++ b/cpp/include/cuspatial/bounding_boxes.hpp @@ -54,7 +54,7 @@ std::unique_ptr linestring_bounding_boxes( cudf::column_view const& x, cudf::column_view const& y, double expansion_radius, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Compute minimum bounding box for each polygon in a list. @@ -82,7 +82,7 @@ std::unique_ptr polygon_bounding_boxes( cudf::column_view const& x, cudf::column_view const& y, double expansion_radius = 0.0, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @} // end of doxygen group diff --git a/cpp/include/cuspatial/distance.hpp b/cpp/include/cuspatial/distance.hpp index 76c920b11..51b21fdca 100644 --- a/cpp/include/cuspatial/distance.hpp +++ b/cpp/include/cuspatial/distance.hpp @@ -55,7 +55,7 @@ std::unique_ptr haversine_distance( cudf::column_view const& b_lon, cudf::column_view const& b_lat, double const radius = EARTH_RADIUS_KM, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief computes Hausdorff distances for all pairs in a collection of spaces @@ -125,7 +125,7 @@ std::pair, cudf::table_view> directed_hausdorff_di cudf::column_view const& xs, cudf::column_view const& ys, cudf::column_view const& space_offsets, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Compute pairwise (multi)point-to-(multi)point Cartesian distance @@ -145,7 +145,7 @@ std::pair, cudf::table_view> directed_hausdorff_di std::unique_ptr pairwise_point_distance( geometry_column_view const& multipoints1, geometry_column_view const& multipoints2, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Compute pairwise (multi)points-to-(multi)linestrings Cartesian distance @@ -167,7 +167,7 @@ std::unique_ptr pairwise_point_distance( std::unique_ptr pairwise_point_linestring_distance( geometry_column_view const& multipoints, geometry_column_view const& multilinestrings, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Compute pairwise (multi)point-to-(multi)polygon Cartesian distance @@ -191,7 +191,7 @@ std::unique_ptr pairwise_point_linestring_distance( std::unique_ptr pairwise_point_polygon_distance( geometry_column_view const& multipoints, geometry_column_view const& multipolygons, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Compute pairwise (multi)linestring-to-(multi)linestring Cartesian distance @@ -213,7 +213,7 @@ std::unique_ptr pairwise_point_polygon_distance( std::unique_ptr pairwise_linestring_distance( geometry_column_view const& multilinestrings1, geometry_column_view const& multilinestrings2, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Compute pairwise (multi)linestring-to-(multi)polygon Cartesian distance @@ -238,7 +238,7 @@ std::unique_ptr pairwise_linestring_distance( std::unique_ptr pairwise_linestring_polygon_distance( geometry_column_view const& multilinestrings, geometry_column_view const& multipolygons, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Compute pairwise (multi)polygon-to-(multi)polygon Cartesian distance @@ -257,7 +257,7 @@ std::unique_ptr pairwise_linestring_polygon_distance( std::unique_ptr pairwise_polygon_distance( geometry_column_view const& multipolygons1, geometry_column_view const& multipolygons2, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @} // end of doxygen group diff --git a/cpp/include/cuspatial/intersection.cuh b/cpp/include/cuspatial/intersection.cuh index c086d84cc..ba7a1c3ab 100644 --- a/cpp/include/cuspatial/intersection.cuh +++ b/cpp/include/cuspatial/intersection.cuh @@ -88,7 +88,7 @@ template pairwise_linestring_intersection( MultiLinestringRange1 multilinestrings1, MultiLinestringRange2 multilinestrings2, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource(), + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref(), rmm::cuda_stream_view stream = rmm::cuda_stream_default); } // namespace cuspatial diff --git a/cpp/include/cuspatial/intersection.hpp b/cpp/include/cuspatial/intersection.hpp index 1869768b1..90041bc84 100644 --- a/cpp/include/cuspatial/intersection.hpp +++ b/cpp/include/cuspatial/intersection.hpp @@ -55,6 +55,6 @@ struct linestring_intersection_column_result { linestring_intersection_column_result pairwise_linestring_intersection( geometry_column_view const& multilinestrings_lhs, geometry_column_view const& multilinestrings_rhs, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); } // namespace cuspatial diff --git a/cpp/include/cuspatial/nearest_points.hpp b/cpp/include/cuspatial/nearest_points.hpp index 46f0c14a2..0a5317054 100644 --- a/cpp/include/cuspatial/nearest_points.hpp +++ b/cpp/include/cuspatial/nearest_points.hpp @@ -167,7 +167,7 @@ point_linestring_nearest_points_result pairwise_point_linestring_nearest_points( std::optional> multilinestring_geometry_offsets, cudf::device_span linestring_part_offsets, cudf::column_view linestring_points_xy, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @} // end of doxygen group diff --git a/cpp/include/cuspatial/pairwise_multipoint_equals_count.hpp b/cpp/include/cuspatial/pairwise_multipoint_equals_count.hpp index 0df60c269..a9e471db7 100644 --- a/cpp/include/cuspatial/pairwise_multipoint_equals_count.hpp +++ b/cpp/include/cuspatial/pairwise_multipoint_equals_count.hpp @@ -70,6 +70,6 @@ namespace cuspatial { std::unique_ptr pairwise_multipoint_equals_count( geometry_column_view const& lhs, geometry_column_view const& rhs, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); } // namespace cuspatial diff --git a/cpp/include/cuspatial/point_in_polygon.hpp b/cpp/include/cuspatial/point_in_polygon.hpp index c66e2e260..b9347c9fb 100644 --- a/cpp/include/cuspatial/point_in_polygon.hpp +++ b/cpp/include/cuspatial/point_in_polygon.hpp @@ -79,7 +79,7 @@ std::unique_ptr point_in_polygon( cudf::column_view const& poly_ring_offsets, cudf::column_view const& poly_points_x, cudf::column_view const& poly_points_y, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Given (point, polygon pairs), tests whether the point of each pair is inside the polygon @@ -128,7 +128,7 @@ std::unique_ptr pairwise_point_in_polygon( cudf::column_view const& poly_ring_offsets, cudf::column_view const& poly_points_x, cudf::column_view const& poly_points_y, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @} // end of doxygen group diff --git a/cpp/include/cuspatial/point_quadtree.cuh b/cpp/include/cuspatial/point_quadtree.cuh index f64cee6f0..ca488267f 100644 --- a/cpp/include/cuspatial/point_quadtree.cuh +++ b/cpp/include/cuspatial/point_quadtree.cuh @@ -177,7 +177,7 @@ std::pair, point_quadtree> quadtree_on_points( int8_t max_depth, int32_t max_size, rmm::cuda_stream_view stream = rmm::cuda_stream_default, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @} // end of doxygen group diff --git a/cpp/include/cuspatial/point_quadtree.hpp b/cpp/include/cuspatial/point_quadtree.hpp index 72306730f..cbe79246c 100644 --- a/cpp/include/cuspatial/point_quadtree.hpp +++ b/cpp/include/cuspatial/point_quadtree.hpp @@ -75,7 +75,7 @@ std::pair, std::unique_ptr> quadtree_ double scale, int8_t max_depth, cudf::size_type max_size, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @} // end of doxygen group diff --git a/cpp/include/cuspatial/points_in_range.hpp b/cpp/include/cuspatial/points_in_range.hpp index 8637e2b24..dd5ea2089 100644 --- a/cpp/include/cuspatial/points_in_range.hpp +++ b/cpp/include/cuspatial/points_in_range.hpp @@ -61,7 +61,7 @@ std::unique_ptr points_in_range( double range_max_y, cudf::column_view const& x, cudf::column_view const& y, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @} // end of doxygen group diff --git a/cpp/include/cuspatial/projection.hpp b/cpp/include/cuspatial/projection.hpp index e71164148..f489b16ab 100644 --- a/cpp/include/cuspatial/projection.hpp +++ b/cpp/include/cuspatial/projection.hpp @@ -51,7 +51,7 @@ std::pair, std::unique_ptr> sinusoid double origin_lat, cudf::column_view const& input_lon, cudf::column_view const& input_lat, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @} // end of doxygen group diff --git a/cpp/include/cuspatial/spatial_join.cuh b/cpp/include/cuspatial/spatial_join.cuh index 096af5fb2..3fefccd79 100644 --- a/cpp/include/cuspatial/spatial_join.cuh +++ b/cpp/include/cuspatial/spatial_join.cuh @@ -71,7 +71,7 @@ join_quadtree_and_bounding_boxes( T scale, int8_t max_depth, rmm::cuda_stream_view stream = rmm::cuda_stream_default, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Test whether the specified points are inside any of the specified polygons. @@ -129,7 +129,7 @@ std::pair, rmm::device_uvector> quadtr PointIterator points_first, MultiPolygonRange polygons, rmm::cuda_stream_view stream = rmm::cuda_stream_default, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Finds the nearest linestring to each point in a quadrant, and computes the distances @@ -186,7 +186,7 @@ quadtree_point_to_nearest_linestring( PointIterator points_first, MultiLinestringRange linestrings, rmm::cuda_stream_view stream = rmm::cuda_stream_default, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); } // namespace cuspatial diff --git a/cpp/include/cuspatial/spatial_join.hpp b/cpp/include/cuspatial/spatial_join.hpp index e3bec92d8..c693669c1 100644 --- a/cpp/include/cuspatial/spatial_join.hpp +++ b/cpp/include/cuspatial/spatial_join.hpp @@ -72,7 +72,7 @@ std::unique_ptr join_quadtree_and_bounding_boxes( double y_max, double scale, int8_t max_depth, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Test whether the specified points are inside any of the specified polygons. @@ -123,7 +123,7 @@ std::unique_ptr quadtree_point_in_polygon( cudf::column_view const& ring_offsets, cudf::column_view const& poly_points_x, cudf::column_view const& poly_points_y, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Finds the nearest linestring to each point in a quadrant, and computes the distances @@ -172,7 +172,7 @@ std::unique_ptr quadtree_point_to_nearest_linestring( cudf::column_view const& linestring_offsets, cudf::column_view const& linestring_points_x, cudf::column_view const& linestring_points_y, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @} // end of doxygen group diff --git a/cpp/include/cuspatial/trajectory.cuh b/cpp/include/cuspatial/trajectory.cuh index dc5ec9708..8186dff41 100644 --- a/cpp/include/cuspatial/trajectory.cuh +++ b/cpp/include/cuspatial/trajectory.cuh @@ -87,7 +87,7 @@ std::unique_ptr> derive_trajectories( PointOutputIt points_output_first, TimestampOutputIt timestamps_output_first, rmm::cuda_stream_view stream = rmm::cuda_stream_default, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Compute the total distance (in meters) and average speed (in m/s) of objects in diff --git a/cpp/include/cuspatial/trajectory.hpp b/cpp/include/cuspatial/trajectory.hpp index 308063569..673299642 100644 --- a/cpp/include/cuspatial/trajectory.hpp +++ b/cpp/include/cuspatial/trajectory.hpp @@ -63,7 +63,7 @@ std::pair, std::unique_ptr> derive_tr cudf::column_view const& x, cudf::column_view const& y, cudf::column_view const& timestamp, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Compute the distance and speed of objects in a trajectory. Groups the @@ -96,7 +96,7 @@ std::unique_ptr trajectory_distances_and_speeds( cudf::column_view const& x, cudf::column_view const& y, cudf::column_view const& timestamp, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @brief Compute the spatial bounding boxes of trajectories. Groups the x, y, @@ -128,7 +128,7 @@ std::unique_ptr trajectory_bounding_boxes( cudf::column_view const& object_id, cudf::column_view const& x, cudf::column_view const& y, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()); /** * @} // end of doxygen group diff --git a/cpp/include/cuspatial_test/base_fixture.hpp b/cpp/include/cuspatial_test/base_fixture.hpp index 820e54e77..1de06a364 100644 --- a/cpp/include/cuspatial_test/base_fixture.hpp +++ b/cpp/include/cuspatial_test/base_fixture.hpp @@ -29,7 +29,7 @@ namespace test { * @brief Mixin to supply rmm resources for fixtures */ class RMMResourceMixin { - rmm::device_async_resource_ref _mr{rmm::mr::get_current_device_resource()}; + rmm::device_async_resource_ref _mr{rmm::mr::get_current_device_resource_ref()}; rmm::cuda_stream_view _stream{rmm::cuda_stream_default}; public: diff --git a/cpp/tests/distance/linestring_polygon_distance_test.cu b/cpp/tests/distance/linestring_polygon_distance_test.cu index 9a09fd84b..da2ef3b44 100644 --- a/cpp/tests/distance/linestring_polygon_distance_test.cu +++ b/cpp/tests/distance/linestring_polygon_distance_test.cu @@ -36,7 +36,7 @@ using namespace cuspatial::test; template struct PairwiseLinestringPolygonDistanceTest : public BaseFixture { rmm::cuda_stream_view stream() { return rmm::cuda_stream_default; } - rmm::device_async_resource_ref mr() { return rmm::mr::get_current_device_resource(); } + rmm::device_async_resource_ref mr() { return rmm::mr::get_current_device_resource_ref(); } void run_single(std::initializer_list multilinestring_geometry_offsets, std::initializer_list multilinestring_part_offsets, diff --git a/cpp/tests/distance/point_polygon_distance_test.cu b/cpp/tests/distance/point_polygon_distance_test.cu index 244ac5ee6..3d556be02 100644 --- a/cpp/tests/distance/point_polygon_distance_test.cu +++ b/cpp/tests/distance/point_polygon_distance_test.cu @@ -37,7 +37,7 @@ double constexpr PI = 3.14159265358979323846; template struct PairwisePointPolygonDistanceTest : public ::testing::Test { rmm::cuda_stream_view stream() { return rmm::cuda_stream_default; } - rmm::device_async_resource_ref mr() { return rmm::mr::get_current_device_resource(); } + rmm::device_async_resource_ref mr() { return rmm::mr::get_current_device_resource_ref(); } void run_single(std::initializer_list>> multipoints, std::initializer_list multipolygon_geometry_offsets, diff --git a/cpp/tests/intersection/linestring_intersection_intermediates_remove_if_test.cu b/cpp/tests/intersection/linestring_intersection_intermediates_remove_if_test.cu index 760ab72a4..6ca5c3b9a 100644 --- a/cpp/tests/intersection/linestring_intersection_intermediates_remove_if_test.cu +++ b/cpp/tests/intersection/linestring_intersection_intermediates_remove_if_test.cu @@ -67,7 +67,7 @@ auto make_linestring_intersection_intermediates(std::initializer_list template struct LinestringIntersectionIntermediatesRemoveIfTest : public ::testing::Test { rmm::cuda_stream_view stream() { return rmm::cuda_stream_default; } - rmm::device_async_resource_ref mr() { return rmm::mr::get_current_device_resource(); } + rmm::device_async_resource_ref mr() { return rmm::mr::get_current_device_resource_ref(); } template void run_single(IntermediateType& intermediates, diff --git a/cpp/tests/intersection/linestring_intersection_test.cpp b/cpp/tests/intersection/linestring_intersection_test.cpp index d91d99ddb..d0f6ced03 100644 --- a/cpp/tests/intersection/linestring_intersection_test.cpp +++ b/cpp/tests/intersection/linestring_intersection_test.cpp @@ -117,7 +117,7 @@ std::pair> make_linestring_col struct LinestringIntersectionTestBase : public BaseFixture { rmm::cuda_stream_view stream{rmm::cuda_stream_default}; - rmm::device_async_resource_ref mr{rmm::mr::get_current_device_resource()}; + rmm::device_async_resource_ref mr{rmm::mr::get_current_device_resource_ref()}; }; template diff --git a/cpp/tests/intersection/linestring_intersection_test.cu b/cpp/tests/intersection/linestring_intersection_test.cu index d6ec4affd..e8cc5fc32 100644 --- a/cpp/tests/intersection/linestring_intersection_test.cu +++ b/cpp/tests/intersection/linestring_intersection_test.cu @@ -44,7 +44,7 @@ using namespace cuspatial::test; template struct LinestringIntersectionTest : public ::testing::Test { rmm::cuda_stream_view stream() { return rmm::cuda_stream_default; } - rmm::device_async_resource_ref mr() { return rmm::mr::get_current_device_resource(); } + rmm::device_async_resource_ref mr() { return rmm::mr::get_current_device_resource_ref(); } template void run_single_test(MultiLinestringRange lhs, diff --git a/cpp/tests/intersection/linestring_intersection_with_duplicates_test.cu b/cpp/tests/intersection/linestring_intersection_with_duplicates_test.cu index 720eb2efa..19b635447 100644 --- a/cpp/tests/intersection/linestring_intersection_with_duplicates_test.cu +++ b/cpp/tests/intersection/linestring_intersection_with_duplicates_test.cu @@ -127,7 +127,7 @@ Intermediate segmented_sort_intersection_intermediates(Intermediate& intermediat template struct LinestringIntersectionDuplicatesTest : public ::testing::Test { rmm::cuda_stream_view stream() { return rmm::cuda_stream_default; } - rmm::device_async_resource_ref mr() { return rmm::mr::get_current_device_resource(); } + rmm::device_async_resource_ref mr() { return rmm::mr::get_current_device_resource_ref(); } template void run_single(MultilinestringRange1 lhs, diff --git a/cpp/tests/join/quadtree_point_in_polygon_test_large.cu b/cpp/tests/join/quadtree_point_in_polygon_test_large.cu index 554d197cc..b31f3016c 100644 --- a/cpp/tests/join/quadtree_point_in_polygon_test_large.cu +++ b/cpp/tests/join/quadtree_point_in_polygon_test_large.cu @@ -57,7 +57,7 @@ inline auto generate_points( cuspatial::vec_2d v_max, std::size_t seed, rmm::cuda_stream_view stream, - rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()) + rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource_ref()) { auto engine_x = cuspatial::test::deterministic_engine(42); auto engine_y = cuspatial::test::deterministic_engine(137);