Try reverting base_fixture change

vyasr · Sep 7, 2023 · 2201bc1 · 2201bc1
1 parent 4716f13
commit 2201bc1
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/cpp/include/cudf_test/base_fixture.hpp b/cpp/include/cudf_test/base_fixture.hpp
@@ -47,7 +47,17 @@ namespace test {
  * class MyTestFixture : public cudf::test::BaseFixture {};
  * ```
  */
-class BaseFixture : public ::testing::Test {};
+class BaseFixture : public ::testing::Test {
+  rmm::mr::device_memory_resource* _mr{rmm::mr::get_current_device_resource()};
+
+ public:
+  /**
+   * @brief Returns pointer to `device_memory_resource` that should be used for
+   * all tests inheriting from this fixture
+   * @return pointer to memory resource
+   */
+  rmm::mr::device_memory_resource* mr() { return _mr; }
+};
 
 /**
  * @brief Base test fixture that takes a parameter.
@@ -58,7 +68,17 @@ class BaseFixture : public ::testing::Test {};
  * ```
  */
 template <typename T>
-class BaseFixtureWithParam : public ::testing::TestWithParam<T> {};
+class BaseFixtureWithParam : public ::testing::TestWithParam<T> {
+  rmm::mr::device_memory_resource* _mr{rmm::mr::get_current_device_resource()};
+
+ public:
+  /**
+   * @brief Returns pointer to `device_memory_resource` that should be used for
+   * all tests inheriting from this fixture
+   * @return pointer to memory resource
+   */
+  rmm::mr::device_memory_resource* mr() const { return _mr; }
+};
 
 template <typename T, typename Enable = void>
 struct uniform_distribution_impl {};