Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename HIPPinnedAllocator to MIGraphXPinnedAllocator #83

Open
wants to merge 1 commit into
base: rocm6.4_internal_testing
Choose a base branch
from
Open

Rename HIPPinnedAllocator to MIGraphXPinnedAllocator #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions onnxruntime/core/providers/migraphx/migraphx_allocator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ void* MIGraphXExternalAllocator::Reserve(size_t size) {
return p;
}

void* HIPPinnedAllocator::Alloc(size_t size) {
void* MIGraphXPinnedAllocator::Alloc(size_t size) {
void* p = nullptr;
if (size > 0) {
HIP_CALL_THROW(hipHostMalloc((void**)&p, size));
}
return p;
}

void HIPPinnedAllocator::Free(void* p) {
void MIGraphXPinnedAllocator::Free(void* p) {
HIP_CALL_THROW(hipHostFree(p));
}

Expand Down
11 changes: 5 additions & 6 deletions onnxruntime/core/providers/migraphx/migraphx_allocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,16 @@ class MIGraphXExternalAllocator : public MIGraphXAllocator {
std::unordered_set<void*> reserved_;
};

// TODO: add a default constructor
class HIPPinnedAllocator : public IAllocator {
class MIGraphXPinnedAllocator final : public IAllocator {
public:
HIPPinnedAllocator(int device_id, const char* name)
MIGraphXPinnedAllocator(const int device_id, const char* name)
: IAllocator(
OrtMemoryInfo(name, OrtAllocatorType::OrtDeviceAllocator,
OrtMemoryInfo(name, OrtDeviceAllocator,
OrtDevice(OrtDevice::CPU, OrtDevice::MemType::HIP_PINNED, static_cast<OrtDevice::DeviceId>(device_id)),
device_id, OrtMemTypeCPUOutput)) {}

virtual void* Alloc(size_t size) override;
virtual void Free(void* p) override;
void* Alloc(size_t size) override;
void Free(void* p) override;
};

} // namespace onnxruntime
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/migraphx/migraphx_execution_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ std::vector<AllocatorPtr> MIGraphXExecutionProvider::CreatePreferredAllocators()
[](OrtDevice::DeviceId device_id) { return std::make_unique<MIGraphXAllocator>(device_id, onnxruntime::CUDA); }, info_.device_id);
AllocatorCreationInfo pinned_allocator_info(
[](OrtDevice::DeviceId device_id) {
return std::make_unique<HIPPinnedAllocator>(device_id, onnxruntime::CUDA_PINNED);
return std::make_unique<MIGraphXPinnedAllocator>(device_id, onnxruntime::CUDA_PINNED);
},
0);
return std::vector<AllocatorPtr>{CreateAllocator(default_memory_info), CreateAllocator(pinned_allocator_info)};
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/migraphx/migraphx_provider_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct ProviderInfo_MIGraphX_Impl final : ProviderInfo_MIGraphX {
}

std::unique_ptr<IAllocator> CreateMIGraphXPinnedAllocator(int16_t device_id, const char* name) override {
return std::make_unique<HIPPinnedAllocator>(device_id, name);
return std::make_unique<MIGraphXPinnedAllocator>(device_id, name);
}

void MIGraphXMemcpy_HostToDevice(void* dst, const void* src, size_t count) override {
Expand Down
Loading