Skip to content

Commit 6774689

Browse files
mthrokfacebook-github-bot
authored andcommitted
Add Torch Selective macros in all C++ Ops for better support on mobile (#3218)
Summary: * Adding TORCH_SELECTIVE_* macros on op registration. * Adding torchvision namespace. Reviewed By: datumbox Differential Revision: D25954562 fbshipit-source-id: c0a5fc6394b3e257d0a9879bd08250663abd33c4
1 parent 979103e commit 6774689

29 files changed

+130
-59
lines changed

torchvision/csrc/ops/autocast/deform_conv2d_kernel.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ at::Tensor deform_conv2d_autocast(
4545
} // namespace
4646

4747
TORCH_LIBRARY_IMPL(torchvision, Autocast, m) {
48-
m.impl("deform_conv2d", deform_conv2d_autocast);
48+
m.impl(
49+
TORCH_SELECTIVE_NAME("torchvision::deform_conv2d"),
50+
TORCH_FN(deform_conv2d_autocast));
4951
}
5052

5153
} // namespace ops

torchvision/csrc/ops/autocast/nms_kernel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ at::Tensor nms_autocast(
2222
} // namespace
2323

2424
TORCH_LIBRARY_IMPL(torchvision, Autocast, m) {
25-
m.impl("nms", nms_autocast);
25+
m.impl(TORCH_SELECTIVE_NAME("torchvision::nms"), TORCH_FN(nms_autocast));
2626
}
2727

2828
} // namespace ops

torchvision/csrc/ops/autocast/ps_roi_align_kernel.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ std::tuple<at::Tensor, at::Tensor> ps_roi_align_autocast(
3232
} // namespace
3333

3434
TORCH_LIBRARY_IMPL(torchvision, Autocast, m) {
35-
m.impl("ps_roi_align", ps_roi_align_autocast);
35+
m.impl(
36+
TORCH_SELECTIVE_NAME("torchvision::ps_roi_align"),
37+
TORCH_FN(ps_roi_align_autocast));
3638
}
3739

3840
} // namespace ops

torchvision/csrc/ops/autocast/ps_roi_pool_kernel.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ std::tuple<at::Tensor, at::Tensor> ps_roi_pool_autocast(
3030
} // namespace
3131

3232
TORCH_LIBRARY_IMPL(torchvision, Autocast, m) {
33-
m.impl("ps_roi_pool", ps_roi_pool_autocast);
33+
m.impl(
34+
TORCH_SELECTIVE_NAME("torchvision::ps_roi_pool"),
35+
TORCH_FN(ps_roi_pool_autocast));
3436
}
3537

3638
} // namespace ops

torchvision/csrc/ops/autocast/roi_align_kernel.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ at::Tensor roi_align_autocast(
3131
} // namespace
3232

3333
TORCH_LIBRARY_IMPL(torchvision, Autocast, m) {
34-
m.impl("roi_align", roi_align_autocast);
34+
m.impl(
35+
TORCH_SELECTIVE_NAME("torchvision::roi_align"),
36+
TORCH_FN(roi_align_autocast));
3537
}
3638

3739
} // namespace ops

torchvision/csrc/ops/autocast/roi_pool_kernel.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ std::tuple<at::Tensor, at::Tensor> roi_pool_autocast(
3030
} // namespace
3131

3232
TORCH_LIBRARY_IMPL(torchvision, Autocast, m) {
33-
m.impl("roi_pool", roi_pool_autocast);
33+
m.impl(
34+
TORCH_SELECTIVE_NAME("torchvision::roi_pool"),
35+
TORCH_FN(roi_pool_autocast));
3436
}
3537

3638
} // namespace ops

torchvision/csrc/ops/autograd/deform_conv2d_kernel.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,12 @@ deform_conv2d_backward_autograd(
254254
} // namespace
255255

256256
TORCH_LIBRARY_IMPL(torchvision, Autograd, m) {
257-
m.impl("deform_conv2d", deform_conv2d_autograd);
258-
m.impl("_deform_conv2d_backward", deform_conv2d_backward_autograd);
257+
m.impl(
258+
TORCH_SELECTIVE_NAME("torchvision::deform_conv2d"),
259+
TORCH_FN(deform_conv2d_autograd));
260+
m.impl(
261+
TORCH_SELECTIVE_NAME("torchvision::_deform_conv2d_backward"),
262+
TORCH_FN(deform_conv2d_backward_autograd));
259263
}
260264

261265
} // namespace ops

torchvision/csrc/ops/autograd/ps_roi_align_kernel.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,12 @@ at::Tensor ps_roi_align_backward_autograd(
154154
} // namespace
155155

156156
TORCH_LIBRARY_IMPL(torchvision, Autograd, m) {
157-
m.impl("ps_roi_align", ps_roi_align_autograd);
158-
m.impl("_ps_roi_align_backward", ps_roi_align_backward_autograd);
157+
m.impl(
158+
TORCH_SELECTIVE_NAME("torchvision::ps_roi_align"),
159+
TORCH_FN(ps_roi_align_autograd));
160+
m.impl(
161+
TORCH_SELECTIVE_NAME("torchvision::_ps_roi_align_backward"),
162+
TORCH_FN(ps_roi_align_backward_autograd));
159163
}
160164

161165
} // namespace ops

torchvision/csrc/ops/autograd/ps_roi_pool_kernel.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,12 @@ at::Tensor ps_roi_pool_backward_autograd(
139139
} // namespace
140140

141141
TORCH_LIBRARY_IMPL(torchvision, Autograd, m) {
142-
m.impl("ps_roi_pool", ps_roi_pool_autograd);
143-
m.impl("_ps_roi_pool_backward", ps_roi_pool_backward_autograd);
142+
m.impl(
143+
TORCH_SELECTIVE_NAME("torchvision::ps_roi_pool"),
144+
TORCH_FN(ps_roi_pool_autograd));
145+
m.impl(
146+
TORCH_SELECTIVE_NAME("torchvision::_ps_roi_pool_backward"),
147+
TORCH_FN(ps_roi_pool_backward_autograd));
144148
}
145149

146150
} // namespace ops

torchvision/csrc/ops/autograd/roi_align_kernel.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,12 @@ at::Tensor roi_align_backward_autograd(
154154
} // namespace
155155

156156
TORCH_LIBRARY_IMPL(torchvision, Autograd, m) {
157-
m.impl("roi_align", roi_align_autograd);
158-
m.impl("_roi_align_backward", roi_align_backward_autograd);
157+
m.impl(
158+
TORCH_SELECTIVE_NAME("torchvision::roi_align"),
159+
TORCH_FN(roi_align_autograd));
160+
m.impl(
161+
TORCH_SELECTIVE_NAME("torchvision::_roi_align_backward"),
162+
TORCH_FN(roi_align_backward_autograd));
159163
}
160164

161165
} // namespace ops

0 commit comments

Comments
 (0)