Skip to content

[Target] Several minor corrections to the device property query #8651

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
masahi merged 1 commit into from
Aug 4, 2021
Merged

[Target] Several minor corrections to the device property query #8651

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
7 changes: 5 additions & 2 deletions src/runtime/vulkan/vulkan_device_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void VulkanDeviceAPI::GetAttr(Device dev, DeviceAttrKind kind, TVMRetValue* rv)
break;
}
case kDeviceName:
*rv = String(prop.device_name);
*rv = std::string(prop.device_name);
break;

case kMaxClockRate:
Expand Down Expand Up @@ -237,7 +237,10 @@ void VulkanDeviceAPI::GetTargetProperty(Device dev, const std::string& property,
*rv = int64_t(prop.max_shared_memory_per_block);
}
if (property == "device_name") {
*rv = String(prop.device_name);
*rv = prop.device_name;
}
if (property == "device_type") {
*rv = prop.device_type;
}
if (property == "driver_version") {
*rv = int64_t(prop.driver_version);
Expand Down
4 changes: 2 additions & 2 deletions src/target/target.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static Optional<String> JoinString(const std::vector<String>& array, char separa
} else {
os << quote;
for (char c : str) {
if (c == separator || c == quote) {
if (c == quote) {
os << escape;
}
os << c;
Expand Down Expand Up @@ -781,7 +781,7 @@ ObjectPtr<Object> TargetInternal::FromConfig(std::unordered_map<String, ObjectRe
ICHECK_EQ(type_info.type_index, String::ContainerType::_GetOrAllocRuntimeTypeIndex())
<< "Expected " << type_info.type_key << " parameter for attribute '" << key
<< "', but received string from device api";
attrs[key] = ret;
attrs[key] = String(ret.operator std::string());
break;

default:
Expand Down
5 changes: 5 additions & 0 deletions tests/python/unittest/test_target_target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ def test_target_string_with_spaces():
assert target.attrs["device_name"] == "Name of GPU with spaces"
assert target.attrs["device_type"] == "discrete"

target = tvm.target.Target(str(target))

assert target.attrs["device_name"] == "Name of GPU with spaces"
assert target.attrs["device_type"] == "discrete"


def test_target_create():
targets = [cuda(), rocm(), mali(), intel_graphics(), arm_cpu("rk3399"), vta(), bifrost()]
Expand Down