Skip to content

refactor: consolidate device runtime initialization #1399

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

Merged
voltjia merged 1 commit into from
Jul 15, 2026
+33 −39
Merged

refactor: consolidate device runtime initialization #1399

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 src/bridge/infini/rt.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ inline infiniStatus_t translate(::infini::rt::runtime::Error error) {
}
}

inline ::infini::rt::Device::Type translate_to(infiniDevice_t device) {
inline constexpr ::infini::rt::Device::Type translate_to(infiniDevice_t device) {
switch (device) {
case INFINI_DEVICE_CPU:
return ::infini::rt::Device::Type::kCpu;
Expand All @@ -38,7 +38,7 @@ inline ::infini::rt::Device::Type translate_to(infiniDevice_t device) {
}
}

inline infiniDevice_t translate_from(::infini::rt::Device::Type device) {
inline constexpr infiniDevice_t translate_from(::infini::rt::Device::Type device) {
switch (device) {
case ::infini::rt::Device::Type::kCpu:
return INFINI_DEVICE_CPU;
Expand Down
65 changes: 28 additions & 37 deletions src/infinicore/context/context_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,46 +61,37 @@ ContextImpl &ContextImpl::singleton() {
return instance;
}

ContextImpl::ContextImpl() {
std::vector<int> device_counter(static_cast<size_t>(Device::Type::COUNT), 0);

infini::rt::set_runtime_device_type(bridge::infini::rt::translate_to(INFINI_DEVICE_CPU));
INFINICORE_CHECK_ERROR(bridge::infini::rt::translate(infini::rt::runtime::GetDeviceCount(&device_counter[static_cast<int>(Device::Type::CPU)])));

runtime_table_[static_cast<int>(Device::Type::CPU)].resize(device_counter[static_cast<int>(Device::Type::CPU)]);
if (device_counter[static_cast<int>(Device::Type::CPU)] > 0) {
runtime_table_[static_cast<int>(Device::Type::CPU)][0] = std::unique_ptr<Runtime>(new Runtime(Device(Device::Type::CPU, 0)));
}

if constexpr (infini::rt::DeviceEnabled<infini::rt::Device::Type::kNvidia>::value) {
infini::rt::set_runtime_device_type(bridge::infini::rt::translate_to(INFINI_DEVICE_NVIDIA));
INFINICORE_CHECK_ERROR(bridge::infini::rt::translate(infini::rt::runtime::GetDeviceCount(&device_counter[static_cast<int>(Device::Type::NVIDIA)])));
runtime_table_[static_cast<int>(Device::Type::NVIDIA)].resize(device_counter[static_cast<int>(Device::Type::NVIDIA)]);
if (device_counter[static_cast<int>(Device::Type::NVIDIA)] > 0) {
runtime_table_[static_cast<int>(Device::Type::NVIDIA)][0] = std::unique_ptr<Runtime>(new Runtime(Device(Device::Type::NVIDIA, 0)));
current_runtime_ = runtime_table_[static_cast<int>(Device::Type::NVIDIA)][0].get();
}
}

if constexpr (infini::rt::DeviceEnabled<infini::rt::Device::Type::kIluvatar>::value) {
infini::rt::set_runtime_device_type(bridge::infini::rt::translate_to(INFINI_DEVICE_ILUVATAR));
INFINICORE_CHECK_ERROR(bridge::infini::rt::translate(infini::rt::runtime::GetDeviceCount(&device_counter[static_cast<int>(Device::Type::ILUVATAR)])));
runtime_table_[static_cast<int>(Device::Type::ILUVATAR)].resize(device_counter[static_cast<int>(Device::Type::ILUVATAR)]);
if (device_counter[static_cast<int>(Device::Type::ILUVATAR)] > 0) {
runtime_table_[static_cast<int>(Device::Type::ILUVATAR)][0] = std::unique_ptr<Runtime>(new Runtime(Device(Device::Type::ILUVATAR, 0)));
current_runtime_ = runtime_table_[static_cast<int>(Device::Type::ILUVATAR)][0].get();
template <Device::Type device_type>
void ContextImpl::initializeRuntime() {
constexpr auto runtime_device_type = bridge::infini::rt::translate_to(
static_cast<infiniDevice_t>(device_type));
static_assert(runtime_device_type != infini::rt::Device::Type::kCount,
"InfiniCore device does not map to an InfiniRT runtime");

if constexpr (infini::rt::DeviceEnabled<runtime_device_type>::value) {
constexpr auto device_index = static_cast<size_t>(device_type);
infini::rt::set_runtime_device_type(runtime_device_type);

int device_count = 0;
INFINICORE_CHECK_ERROR(bridge::infini::rt::translate(
infini::rt::runtime::GetDeviceCount(&device_count)));

auto &runtimes = runtime_table_[device_index];
runtimes.resize(device_count);
if (device_count > 0) {
runtimes[0] = std::unique_ptr<Runtime>(new Runtime(Device(device_type, 0)));
if constexpr (device_type != Device::Type::CPU) {
current_runtime_ = runtimes[0].get();
}
}
}
}

if constexpr (infini::rt::DeviceEnabled<infini::rt::Device::Type::kAscend>::value) {
infini::rt::set_runtime_device_type(bridge::infini::rt::translate_to(INFINI_DEVICE_ASCEND));
INFINICORE_CHECK_ERROR(bridge::infini::rt::translate(infini::rt::runtime::GetDeviceCount(&device_counter[static_cast<int>(Device::Type::ASCEND)])));
runtime_table_[static_cast<int>(Device::Type::ASCEND)].resize(device_counter[static_cast<int>(Device::Type::ASCEND)]);
if (device_counter[static_cast<int>(Device::Type::ASCEND)] > 0) {
runtime_table_[static_cast<int>(Device::Type::ASCEND)][0] = std::unique_ptr<Runtime>(new Runtime(Device(Device::Type::ASCEND, 0)));
current_runtime_ = runtime_table_[static_cast<int>(Device::Type::ASCEND)][0].get();
}
}
ContextImpl::ContextImpl() {
initializeRuntime<Device::Type::CPU>();
initializeRuntime<Device::Type::NVIDIA>();
initializeRuntime<Device::Type::ILUVATAR>();
initializeRuntime<Device::Type::ASCEND>();

if (current_runtime_ == nullptr && !runtime_table_[static_cast<int>(Device::Type::CPU)].empty()) {
current_runtime_ = runtime_table_[static_cast<int>(Device::Type::CPU)][0].get();
Expand Down
3 changes: 3 additions & 0 deletions src/infinicore/context/context_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
namespace infinicore {
class ContextImpl {
private:
template <Device::Type device_type>
void initializeRuntime();

// Table of runtimes for every device (type and index)
std::array<std::vector<std::unique_ptr<Runtime>>, size_t(Device::Type::COUNT)> runtime_table_;
// Active runtime for current thread. Can use "static thread local" because context is a process singleton.
Expand Down
Loading