[CUDAX] Add in_place_type argument to pass-through constructor of shared resource

cudax/include/cuda/experimental/__memory_resource/shared_resource.cuh

@@ -51,15 +51,6 @@ struct shared_resource
 {
   static_assert(_CUDA_VMR::resource<_Resource>, "");
 
-  //! @brief Constructs a \c shared_resource referring to an object of type \c _Resource
-  //! that has been constructed with arguments \c __args. The \c _Resource object is
-  //! dynamically allocated with \c new.
-  //! @param __args The arguments to be passed to the \c _Resource constructor.
-  template <class... _Args>
-  explicit shared_resource(_Args&&... __args)
-      : __control_block(new _Control_block{_Resource{_CUDA_VSTD::forward<_Args>(__args)...}, 1})
-  {}
-
   //! @brief Copy-constructs a \c shared_resource object resulting in an copy that shares
   //! ownership of the wrapped resource with \c __other.
   //! @param __other The \c shared_resource object to copy from.
@@ -223,6 +214,9 @@ struct shared_resource
     return get_property(__self.__control_block->__resource, _Property{});
   }
 
+  template <class _Res, class... _Args>
+  friend auto make_shared_resource(_Args&&... __args) -> shared_resource<_Res>;
+
 private:
   // Use a custom shared_ptr implementation because (a) we don't need to support weak_ptr so we only
   // need one pointer, not two, and (b) this implementation can work on device also.
@@ -233,6 +227,14 @@ private:
   };
 
   _Control_block* __control_block;
+
+  //! @brief Constructs a \c shared_resource referring to an object of type \c _Resource
+  //! that has been constructed with arguments \c __args. The \c _Resource object is
+  //! dynamically allocated with \c new.
+  //! @param __args The arguments to be passed to the \c _Resource constructor.
+  explicit shared_resource(_Control_block* __control_block)
+      : __control_block(__control_block)
+  {}
 };
 
 //! @rst
@@ -252,7 +254,8 @@ template <class _Resource, class... _Args>
 auto make_shared_resource(_Args&&... __args) -> shared_resource<_Resource>
 {
   static_assert(_CUDA_VMR::resource<_Resource>, "_Resource does not satisfy the cuda::mr::resource concept");
-  return shared_resource<_Resource>{_CUDA_VSTD::forward<_Args>(__args)...};
+  return shared_resource<_Resource>{
+    new typename shared_resource<_Resource>::_Control_block{_Resource{_CUDA_VSTD::forward<_Args>(__args)...}, 1}};
 }
 
 } // namespace cuda::experimental

cudax/test/memory_resource/shared_resource.cu

@@ -25,7 +25,7 @@ TEMPLATE_TEST_CASE_METHOD(test_fixture, "shared_resource", "[container][resource
     Counts expected{};
     CHECK(this->counts == expected);
     {
-      cudax::shared_resource<TestResource> mr{42, this};
+      auto mr = cudax::make_shared_resource<TestResource>(42, this);
       ++expected.object_count;
       CHECK(this->counts == expected);
     }
@@ -42,7 +42,7 @@ TEMPLATE_TEST_CASE_METHOD(test_fixture, "shared_resource", "[container][resource
     Counts expected{};
     CHECK(this->counts == expected);
     {
-      cudax::shared_resource<TestResource> mr{42, this};
+      auto mr = cudax::make_shared_resource<TestResource>(42, this);
       ++expected.object_count;
       CHECK(this->counts == expected);
 
@@ -51,15 +51,20 @@ TEMPLATE_TEST_CASE_METHOD(test_fixture, "shared_resource", "[container][resource
       CHECK(mr == mr2); // pointers compare equal, no call to TestResource::operator==
       CHECK(this->counts == expected);
 
-      auto mr3 = std::move(mr);
+      cudax::shared_resource<TestResource> mr3(mr);
       CHECK(this->counts == expected);
-      CHECK(mr2 == mr3); // pointers compare equal, no call to TestResource::operator==
+      CHECK(mr == mr3); // pointers compare equal, no call to TestResource::operator==
       CHECK(this->counts == expected);
 
-      cudax::shared_resource<TestResource> mr4{TestResource{42, this}};
+      auto mr4 = std::move(mr);
+      CHECK(this->counts == expected);
+      CHECK(mr2 == mr4); // pointers compare equal, no call to TestResource::operator==
+      CHECK(this->counts == expected);
+
+      cudax::shared_resource<TestResource> mr5{cudax::make_shared_resource<TestResource>(TestResource{42, this})};
       ++expected.object_count;
       ++expected.move_count;
-      CHECK(mr3 == mr4); // pointers are not equal, calls TestResource::operator==
+      CHECK(mr3 == mr5); // pointers are not equal, calls TestResource::operator==
       ++expected.equal_to_count;
       CHECK(this->counts == expected);
     }
@@ -76,7 +81,7 @@ TEMPLATE_TEST_CASE_METHOD(test_fixture, "shared_resource", "[container][resource
     Counts expected{};
     CHECK(this->counts == expected);
     {
-      cudax::shared_resource<TestResource> mr{42, this};
+      auto mr = cudax::make_shared_resource<TestResource>(42, this);
       ++expected.object_count;
       CHECK(this->counts == expected);
 
@@ -101,7 +106,7 @@ TEMPLATE_TEST_CASE_METHOD(test_fixture, "shared_resource", "[container][resource
   {
     Counts expected{};
     {
-      cudax::shared_resource<TestResource> mr{42, this};
+      auto mr = cudax::make_shared_resource<TestResource>(42, this);
       ++expected.object_count;
       CHECK(this->counts == expected);
 
@@ -130,7 +135,7 @@ TEMPLATE_TEST_CASE_METHOD(test_fixture, "shared_resource", "[container][resource
     {
       bytes(42 * sizeof(int));
       cudax::uninitialized_buffer<int, cudax::host_accessible> buffer{
-        cudax::shared_resource<TestResource>(42, this), 42};
+        cudax::make_shared_resource<TestResource>(42, this), 42};
       ++expected.object_count;
       ++expected.allocate_count;
       CHECK(this->counts == expected);