Skip to content

fix: align device list with InfiniRT master #792

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

Closed
voltjia wants to merge 1 commit into from
Closed

fix: align device list with InfiniRT master #792

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
2 changes: 0 additions & 2 deletions docs/aten-operators.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,7 @@ template class Operator<Foo, Device::Type::kAscend, kIndex>;
template class Operator<Foo, Device::Type::kMetax, kIndex>;
template class Operator<Foo, Device::Type::kMoore, kIndex>;
template class Operator<Foo, Device::Type::kIluvatar, kIndex>;
template class Operator<Foo, Device::Type::kKunlun, kIndex>;
template class Operator<Foo, Device::Type::kHygon, kIndex>;
template class Operator<Foo, Device::Type::kQy, kIndex>;

} // namespace infini::ops
```
Expand Down
2 changes: 0 additions & 2 deletions scripts/generate_torch_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@
"kMetax",
"kMoore",
"kIluvatar",
"kKunlun",
"kHygon",
"kQy",
)

# YAML scalar-type tokens → C++ types. Reference types (e.g. `const Scalar&`)
Expand Down
6 changes: 2 additions & 4 deletions scripts/generate_wrappers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,9 +765,7 @@ def _generate_source(operator):
{{INFINI_DEVICE_METAX, infini::ops::Device::Type::kMetax}},
{{INFINI_DEVICE_MOORE, infini::ops::Device::Type::kMoore}},
{{INFINI_DEVICE_ILUVATAR, infini::ops::Device::Type::kIluvatar}},
{{INFINI_DEVICE_KUNLUN, infini::ops::Device::Type::kKunlun}},
{{INFINI_DEVICE_HYGON, infini::ops::Device::Type::kHygon}},
{{INFINI_DEVICE_QY, infini::ops::Device::Type::kQy}}}}}}}};
{{INFINI_DEVICE_HYGON, infini::ops::Device::Type::kHygon}}}}}}}};

return kInfiniDeviceToDeviceType.at(device);
}}
Expand Down Expand Up @@ -1498,7 +1496,7 @@ def _dispatch_gen_batch_size():
nargs="+",
default="cpu",
type=str,
help="Devices to use. Please pick from `cpu`, `nvidia`, `cambricon`, `ascend`, `metax`, `moore`, `iluvatar`, `kunlun`, `hygon`, and `qy`. (default: `cpu`)",
help="Devices to use. Please pick from `cpu`, `nvidia`, `cambricon`, `ascend`, `metax`, `moore`, `iluvatar`, and `hygon`. (default: `cpu`)",
)

parser.add_argument(
Expand Down
3 changes: 1 addition & 2 deletions src/device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ using DeviceEnabled = infini::rt::DeviceEnabled<device_type>;
using AllDeviceTypes =
List<Device::Type::kCpu, Device::Type::kNvidia, Device::Type::kCambricon,
Device::Type::kAscend, Device::Type::kMetax, Device::Type::kMoore,
Device::Type::kIluvatar, Device::Type::kKunlun, Device::Type::kHygon,
Device::Type::kQy>;
Device::Type::kIluvatar, Device::Type::kHygon>;

template <typename>
struct ActiveDevicesImpl {
Expand Down
2 changes: 0 additions & 2 deletions src/pybind11_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,7 @@ inline std::optional<Device::Type> TryDeviceTypeFromString(
{"metax", Device::Type::kMetax},
{"moore", Device::Type::kMoore},
{"iluvatar", Device::Type::kIluvatar},
{"kunlun", Device::Type::kKunlun},
{"hygon", Device::Type::kHygon},
{"qy", Device::Type::kQy},
};

auto platform_it{kPlatformNames.find(name)};
Expand Down
10 changes: 0 additions & 10 deletions src/torch/device_.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,11 @@ struct TorchDeviceName<Device::Type::kIluvatar> {
static constexpr std::string_view kValue{"cuda"};
};

template <>
struct TorchDeviceName<Device::Type::kKunlun> {
static constexpr std::string_view kValue{"cuda"};
};

template <>
struct TorchDeviceName<Device::Type::kHygon> {
static constexpr std::string_view kValue{"cuda"};
};

template <>
struct TorchDeviceName<Device::Type::kQy> {
static constexpr std::string_view kValue{"cuda"};
};

} // namespace infini::ops::detail

#endif
2 changes: 0 additions & 2 deletions src/torch/ops/add/add.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ template class Operator<Add, Device::Type::kAscend, 1>;
template class Operator<Add, Device::Type::kMetax, 1>;
template class Operator<Add, Device::Type::kMoore, 1>;
template class Operator<Add, Device::Type::kIluvatar, 1>;
template class Operator<Add, Device::Type::kKunlun, 1>;
template class Operator<Add, Device::Type::kHygon, 1>;
template class Operator<Add, Device::Type::kQy, 1>;

} // namespace infini::ops
2 changes: 0 additions & 2 deletions src/torch/ops/gemm/gemm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ template class Operator<Gemm, Device::Type::kAscend, 2>;
template class Operator<Gemm, Device::Type::kMetax, 2>;
template class Operator<Gemm, Device::Type::kMoore, 2>;
template class Operator<Gemm, Device::Type::kIluvatar, 2>;
template class Operator<Gemm, Device::Type::kKunlun, 2>;
template class Operator<Gemm, Device::Type::kHygon, 2>;
template class Operator<Gemm, Device::Type::kQy, 2>;

} // namespace infini::ops
Loading