diff --git a/cpp/benchmarks/fixture/nvbench_fixture.hpp b/cpp/benchmarks/fixture/nvbench_fixture.hpp index ac0cab4071b..ebcbcb17e98 100644 --- a/cpp/benchmarks/fixture/nvbench_fixture.hpp +++ b/cpp/benchmarks/fixture/nvbench_fixture.hpp @@ -45,8 +45,6 @@ static std::string cuio_host_mem_param{ * Initializes the default memory resource to use the RMM pool device resource. */ struct nvbench_base_fixture { - using host_pooled_mr_t = rmm::mr::pool_memory_resource; - inline auto make_cuda() { return std::make_shared(); } inline auto make_pool() @@ -90,22 +88,10 @@ struct nvbench_base_fixture { return *mr; } - inline rmm::host_async_resource_ref make_cuio_host_pinned_pool() - { - if (!this->host_pooled_mr) { - // Don't store in static, as the CUDA context may be destroyed before static destruction - this->host_pooled_mr = std::make_shared( - std::make_shared().get(), - size_t{1} * 1024 * 1024 * 1024); - } - - return *this->host_pooled_mr; - } - inline rmm::host_async_resource_ref create_cuio_host_memory_resource(std::string const& mode) { if (mode == "pinned") return make_cuio_host_pinned(); - if (mode == "pinned_pool") return make_cuio_host_pinned_pool(); + if (mode == "pinned_pool") return cudf::io::get_host_memory_resource(); CUDF_FAIL("Unknown cuio_host_mem parameter: " + mode + "\nExpecting: pinned or pinned_pool"); } @@ -139,8 +125,7 @@ struct nvbench_base_fixture { std::shared_ptr mr; std::string rmm_mode{"pool"}; - std::shared_ptr host_pooled_mr; - std::string cuio_host_mode{"pinned"}; + std::string cuio_host_mode{"pinned_pool"}; }; } // namespace cudf