1010#include " alpaka/core/Hip.hpp"
1111#include " alpaka/core/Interface.hpp"
1212#include " alpaka/dev/Traits.hpp"
13+ #include " alpaka/dev/common/DevGenericImpl.hpp"
1314#include " alpaka/dev/common/DeviceProperties.hpp"
14- #include " alpaka/dev/common/QueueRegistry.hpp"
1515#include " alpaka/mem/buf/Traits.hpp"
1616#include " alpaka/platform/Traits.hpp"
1717#include " alpaka/queue/Properties.hpp"
@@ -96,7 +96,7 @@ namespace alpaka
9696 using IDeviceQueue = uniform_cuda_hip::detail::QueueUniformCudaHipRtImpl<TApi>;
9797
9898 protected:
99- DevUniformCudaHipRt () : m_QueueRegistry {std::make_shared<alpaka::detail::QueueRegistry <IDeviceQueue>>()}
99+ DevUniformCudaHipRt () : m_DevGenericImpl {std::make_shared<alpaka::detail::DevGenericImpl <IDeviceQueue>>()}
100100 {
101101 }
102102
@@ -118,14 +118,14 @@ namespace alpaka
118118
119119 [[nodiscard]] ALPAKA_FN_HOST auto getAllQueues () const -> std::vector<std::shared_ptr<IDeviceQueue>>
120120 {
121- return m_QueueRegistry ->getAllExistingQueues ();
121+ return m_DevGenericImpl ->getAllExistingQueues ();
122122 }
123123
124124 // ! Registers the given queue on this device.
125125 // ! NOTE: Every queue has to be registered for correct functionality of device wait operations!
126126 ALPAKA_FN_HOST auto registerQueue (std::shared_ptr<IDeviceQueue> spQueue) const -> void
127127 {
128- m_QueueRegistry ->registerQueue (spQueue);
128+ m_DevGenericImpl ->registerQueue (spQueue);
129129 }
130130
131131 friend struct trait ::GetName<DevUniformCudaHipRt<TApi>>;
@@ -137,13 +137,13 @@ namespace alpaka
137137 private:
138138 DevUniformCudaHipRt (int iDevice)
139139 : m_iDevice(iDevice)
140- , m_QueueRegistry (std::make_shared<alpaka::detail::QueueRegistry <IDeviceQueue>>())
140+ , m_DevGenericImpl (std::make_shared<alpaka::detail::DevGenericImpl <IDeviceQueue>>())
141141 {
142142 }
143143
144144 int m_iDevice;
145145
146- std::shared_ptr<alpaka::detail::QueueRegistry <IDeviceQueue>> m_QueueRegistry ;
146+ std::shared_ptr<alpaka::detail::DevGenericImpl <IDeviceQueue>> m_DevGenericImpl ;
147147 };
148148
149149 namespace trait
@@ -155,7 +155,7 @@ namespace alpaka
155155 {
156156 ALPAKA_FN_HOST static auto getName (DevUniformCudaHipRt<TApi> const & dev) -> std::string
157157 {
158- return dev.m_QueueRegistry ->deviceProperties (dev)->name ;
158+ return dev.m_DevGenericImpl ->deviceProperties (dev)->name ;
159159 }
160160 };
161161
@@ -165,7 +165,7 @@ namespace alpaka
165165 {
166166 ALPAKA_FN_HOST static auto getMemBytes (DevUniformCudaHipRt<TApi> const & dev) -> std::size_t
167167 {
168- return dev.m_QueueRegistry ->deviceProperties (dev)->totalGlobalMem ;
168+ return dev.m_DevGenericImpl ->deviceProperties (dev)->totalGlobalMem ;
169169 }
170170 };
171171
@@ -190,7 +190,7 @@ namespace alpaka
190190 {
191191 ALPAKA_FN_HOST static auto getWarpSizes (DevUniformCudaHipRt<TApi> const & dev) -> std::vector<std::size_t>
192192 {
193- return dev.m_QueueRegistry ->deviceProperties (dev)->warpSizes ;
193+ return dev.m_DevGenericImpl ->deviceProperties (dev)->warpSizes ;
194194 }
195195 };
196196
@@ -200,7 +200,7 @@ namespace alpaka
200200 {
201201 ALPAKA_FN_HOST static auto getPreferredWarpSize (DevUniformCudaHipRt<TApi> const & dev) -> std::size_t
202202 {
203- return dev.m_QueueRegistry ->deviceProperties (dev)->preferredWarpSize ;
203+ return dev.m_DevGenericImpl ->deviceProperties (dev)->preferredWarpSize ;
204204 }
205205 };
206206
0 commit comments