Skip to content

Commit 951e3b8

Browse files
authored
Forward-merge branch-24.03 into branch-24.06 (nv-morpheus#1593)
Forward-merge triggered by push to branch-24.03 that creates a PR to keep branch-24.06 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See [forward-merger docs](https://docs.rapids.ai/maintainers/forward-merger/) for more info.
2 parents c9346db + d12a7ac commit 951e3b8

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

morpheus/_lib/include/morpheus/objects/memory_descriptor.hpp

+10
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323

2424
#include "cuda/memory_resource"
2525

26+
namespace morpheus {
27+
/**
28+
* @addtogroup objects
29+
* @{
30+
* @file
31+
*/
32+
2633
/**
2734
* @brief Struct describing device memory resources.
2835
*
@@ -47,3 +54,6 @@ struct MORPHEUS_EXPORT MemoryDescriptor
4754
// Memory resource
4855
cuda::mr::async_resource_ref<cuda::mr::device_accessible> memory_resource;
4956
};
57+
58+
/** @} */ // end of group
59+
} // namespace morpheus

morpheus/_lib/src/objects/memory_descriptor.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121

2222
#include <utility> // for move
2323

24+
namespace morpheus {
25+
2426
MemoryDescriptor::MemoryDescriptor(rmm::cuda_stream_view stream,
2527
cuda::mr::async_resource_ref<cuda::mr::device_accessible> mem_resource) :
2628
cuda_stream(std::move(stream)),
2729
memory_resource(mem_resource)
2830
{}
31+
32+
} // namespace morpheus

0 commit comments

Comments
 (0)