Skip to content

Commit 9a31eee

Browse files
IvanKobzarevfacebook-github-bot
authored andcommittedSep 21, 2020
[vulkan] Remove duplication of op registration and clean unused vars (pytorch#44932)
Summary: Pull Request resolved: pytorch#44932 Test Plan: Imported from OSS Reviewed By: AshkanAliabadi Differential Revision: D23778203 Pulled By: IvanKobzarev fbshipit-source-id: d1bc0a5c2cdd711d8a4cd983154a4f6774987674
1 parent dfb8f2d commit 9a31eee

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed
 

‎aten/src/ATen/native/vulkan/Vulkan.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ void VContext::createInstance() {
102102
};
103103

104104
for (const auto& wantedLayer : instanceLayers) {
105-
bool found = false;
106105
for (const auto& presentLayer : layerProps) {
107106
if (strcmp(wantedLayer, presentLayer.layerName) == 0) {
108107
enabledValidationLayers_.push_back(wantedLayer);
@@ -1038,7 +1037,6 @@ ComputeUnit& ComputeUnitFactory::get(
10381037
// VBuffer <-> VImage
10391038
void copy_buffer_to_image(const VBuffer& buffer, VImage& image) {
10401039
const auto device = context().device();
1041-
const auto physicalDevice = context().physicalDevice();
10421040
struct ConstBlock {
10431041
int32_t w;
10441042
int32_t h;
@@ -1095,7 +1093,6 @@ void copy_image_to_buffer(
10951093
VBuffer& buffer,
10961094
bool addBufferMemoryBarrierForHost) {
10971095
const auto device = context().device();
1098-
const auto physicalDevice = context().physicalDevice();
10991096
TORCH_INTERNAL_ASSERT(
11001097
buffer.sizeBytes() >= image.capacityBytes(),
11011098
"VulkanBuffer's capacity is less than VulkanImage capacity to copy from");

‎aten/src/ATen/native/vulkan/VulkanAten.cpp

+10-12
Original file line numberDiff line numberDiff line change
@@ -523,14 +523,13 @@ Tensor mean(
523523
}
524524

525525
TORCH_LIBRARY_IMPL(aten, Vulkan, m) {
526-
m.impl("slice.Tensor", TORCH_FN(slice));
527-
m.impl("reshape", TORCH_FN(reshape));
528-
m.impl("select.int", TORCH_FN(select));
529-
m.impl("transpose.int", TORCH_FN(transpose));
530-
m.impl("_cat", TORCH_FN(cat));
531-
m.impl_UNBOXED("transpose_", transpose_);
532-
m.impl("view", TORCH_FN(view));
533-
m.impl("unsqueeze", TORCH_FN(unsqueeze));
526+
m.impl("slice.Tensor", TORCH_FN(at::native::vulkan::aten::slice));
527+
m.impl("reshape", TORCH_FN(at::native::vulkan::aten::reshape));
528+
m.impl("select.int", TORCH_FN(at::native::vulkan::aten::select));
529+
m.impl("transpose.int", TORCH_FN(at::native::vulkan::aten::transpose));
530+
m.impl_UNBOXED("transpose_", at::native::vulkan::aten::transpose_);
531+
m.impl("view", TORCH_FN(at::native::vulkan::aten::view));
532+
m.impl("unsqueeze", TORCH_FN(at::native::vulkan::aten::unsqueeze));
534533
m.impl_UNBOXED("empty.memory_format", at::native::vulkan::aten::empty);
535534
m.impl("empty_strided", TORCH_FN(at::native::vulkan::aten::empty_strided));
536535
m.impl("add.Tensor", TORCH_FN(at::native::vulkan::aten::add));
@@ -544,12 +543,11 @@ TORCH_LIBRARY_IMPL(aten, Vulkan, m) {
544543
m.impl(
545544
"_adaptive_avg_pool2d",
546545
TORCH_FN(at::native::vulkan::aten::adaptive_avg_pool2d));
547-
m.impl("avg_pool2d", TORCH_FN(avg_pool2d));
546+
m.impl("avg_pool2d", TORCH_FN(at::native::vulkan::aten::avg_pool2d));
548547
m.impl("max_pool2d", TORCH_FN(at::native::vulkan::aten::max_pool2d));
549-
m.impl("reshape", TORCH_FN(at::native::vulkan::aten::reshape));
550548
m.impl("_cat", TORCH_FN(at::native::vulkan::aten::cat));
551-
m.impl("mul.Scalar", TORCH_FN(mul_scalar));
552-
m.impl("add.Scalar", TORCH_FN(add_scalar));
549+
m.impl("mul.Scalar", TORCH_FN(at::native::vulkan::aten::mul_scalar));
550+
m.impl("add.Scalar", TORCH_FN(at::native::vulkan::aten::add_scalar));
553551
m.impl_UNBOXED(
554552
"convolution_overrideable", at::native::vulkan::aten::convolution);
555553
m.impl_UNBOXED("hardtanh_", at::native::vulkan::aten::hardtanh_);

‎aten/src/ATen/native/vulkan/VulkanCommon.h

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ template <typename To, typename From>
5959
inline constexpr To safe_downcast_internal(const From v) {
6060
typedef std::common_type_t<From, To> Type;
6161
constexpr Type min{static_cast<Type>(std::numeric_limits<To>::lowest())};
62-
const Type value{static_cast<Type>(v)};
6362
constexpr Type max{static_cast<Type>(std::numeric_limits<To>::max())};
6463
TORCH_CHECK(min <= v && v <= max, "Cast failed: out of range");
6564
return static_cast<To>(v);

0 commit comments

Comments
 (0)
Please sign in to comment.