diff --git a/cpp/benchmarks/fixture/benchmark_fixture.hpp b/cpp/benchmarks/fixture/benchmark_fixture.hpp index 8c8d6756b00..8900899f9be 100644 --- a/cpp/benchmarks/fixture/benchmark_fixture.hpp +++ b/cpp/benchmarks/fixture/benchmark_fixture.hpp @@ -107,7 +107,7 @@ class memory_stats_logger { public: memory_stats_logger() : existing_mr(rmm::mr::get_current_device_resource()), - statistics_mr(rmm::mr::make_statistics_adaptor(existing_mr)) + statistics_mr(rmm::mr::statistics_resource_adaptor(existing_mr)) { rmm::mr::set_current_device_resource(&statistics_mr); } diff --git a/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp b/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp index 4f3c723d195..417bbb3d9ab 100644 --- a/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp +++ b/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp @@ -156,16 +156,4 @@ class stream_checking_resource_adaptor final : public rmm::mr::device_memory_res // cudf::test::get_default_stream() is observed. }; -/** - * @brief Convenience factory to return a `stream_checking_resource_adaptor` around the - * upstream resource `upstream`. - * - * @param upstream Reference to the upstream resource - */ -inline stream_checking_resource_adaptor make_stream_checking_resource_adaptor( - rmm::device_async_resource_ref upstream, bool error_on_invalid_stream, bool check_default_stream) -{ - return stream_checking_resource_adaptor{upstream, error_on_invalid_stream, check_default_stream}; -} - } // namespace cudf::test diff --git a/cpp/include/cudf_test/testing_main.hpp b/cpp/include/cudf_test/testing_main.hpp index 9866253a9f8..ed83ddabb00 100644 --- a/cpp/include/cudf_test/testing_main.hpp +++ b/cpp/include/cudf_test/testing_main.hpp @@ -183,7 +183,7 @@ inline auto make_stream_mode_adaptor(cxxopts::ParseResult const& cmd_opts) auto const stream_error_mode = cmd_opts["stream_error_mode"].as(); auto const error_on_invalid_stream = (stream_error_mode == "error"); auto const check_default_stream = (stream_mode == "new_cudf_default"); - auto adaptor = cudf::test::make_stream_checking_resource_adaptor( + auto adaptor = cudf::test::stream_checking_resource_adaptor( resource, error_on_invalid_stream, check_default_stream); if ((stream_mode == "new_cudf_default") || (stream_mode == "new_testing_default")) { rmm::mr::set_current_device_resource(&adaptor); diff --git a/java/src/main/native/src/RmmJni.cpp b/java/src/main/native/src/RmmJni.cpp index 5842a980fc4..09c04a77590 100644 --- a/java/src/main/native/src/RmmJni.cpp +++ b/java/src/main/native/src/RmmJni.cpp @@ -154,13 +154,6 @@ class tracking_resource_adaptor final : public base_tracking_resource_adaptor { } }; -template -tracking_resource_adaptor* make_tracking_adaptor(Upstream* upstream, - std::size_t size_alignment) -{ - return new tracking_resource_adaptor{upstream, size_alignment}; -} - /** * @brief An RMM device memory resource adaptor that delegates to the wrapped resource * for most operations but will call Java to handle certain situations (e.g.: allocation failure).