Skip to content

Commit 91fc6f3

Browse files
zou3519facebook-github-bot
zou3519
authored and
facebook-github-bot
committed
Fix namedtensor ci (#26257)
Summary: Pull Request resolved: #26257 In native_functions.yaml, all overloads must have unique overload names. This PR fixes `flatten` to have unique names for the overloads. Test Plan: - tested locally, but also [namedtensor ci] Differential Revision: D17391243 Pulled By: zou3519 fbshipit-source-id: aaef654953b4275c43b9d7bd949c46bd011f6c73
1 parent 31139b5 commit 91fc6f3

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎aten/src/ATen/core/OpsAlreadyMovedToC10.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ const std::unordered_set<c10::OperatorName>& aten_ops_already_moved_to_c10() {
119119
{"aten::expm1", ""},
120120
{"aten::expand", ""},
121121
{"aten::expand_as", ""},
122-
{"aten::flatten", ""},
122+
{"aten::flatten", "using_ints"},
123123
{"aten::fill_", "Scalar"},
124124
{"aten::fill_", "Tensor"},
125125
{"aten::floor", ""},
@@ -730,13 +730,13 @@ const std::unordered_set<c10::OperatorName>& aten_ops_not_moved_to_c10_yet() {
730730
{"aten::eye", "out"},
731731
{"aten::eye", "m_out"},
732732
#ifdef BUILD_NAMEDTENSOR
733-
{"aten::flatten", ""},
733+
{"aten::flatten", "named_out_dim"},
734734
#endif
735735
#ifdef BUILD_NAMEDTENSOR
736-
{"aten::flatten", ""},
736+
{"aten::flatten", "using_names"},
737737
#endif
738738
#ifdef BUILD_NAMEDTENSOR
739-
{"aten::flatten", ""},
739+
{"aten::flatten", "DimnameList"},
740740
#endif
741741
{"aten::floor_", ""},
742742
{"aten::floor", "out"},

‎aten/src/ATen/core/TensorMethods.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ inline Tensor Tensor::flatten(int64_t start_dim, int64_t end_dim) const {
966966
#ifdef USE_STATIC_DISPATCH
967967
return TypeDefault::flatten(const_cast<Tensor&>(*this), start_dim, end_dim);
968968
#else
969-
static c10::OperatorHandle op = c10::Dispatcher::singleton().findSchema({"aten::flatten", ""}).value();
969+
static c10::OperatorHandle op = c10::Dispatcher::singleton().findSchema({"aten::flatten", "using_ints"}).value();
970970
return c10::Dispatcher::singleton().lookup(op, impl::dispatchTypeId(type_set()))
971971
.callUnboxed<Tensor, const Tensor &, int64_t, int64_t>(const_cast<Tensor&>(*this), start_dim, end_dim);
972972
#endif
@@ -976,7 +976,7 @@ inline Tensor Tensor::flatten(int64_t start_dim, int64_t end_dim, Dimname out_di
976976
#ifdef USE_STATIC_DISPATCH
977977
return TypeDefault::flatten(const_cast<Tensor&>(*this), start_dim, end_dim, out_dim);
978978
#else
979-
static auto table = globalATenDispatch().getOpTable("aten::flatten(Tensor self, int start_dim, int end_dim, Dimname out_dim) -> Tensor");
979+
static auto table = globalATenDispatch().getOpTable("aten::flatten.named_out_dim(Tensor self, int start_dim, int end_dim, Dimname out_dim) -> Tensor");
980980
return table->getOp<Tensor (const Tensor &, int64_t, int64_t, Dimname)>(type_set())(const_cast<Tensor&>(*this), start_dim, end_dim, out_dim);
981981
#endif
982982
}
@@ -986,7 +986,7 @@ inline Tensor Tensor::flatten(Dimname start_dim, Dimname end_dim, Dimname out_di
986986
#ifdef USE_STATIC_DISPATCH
987987
return TypeDefault::flatten(const_cast<Tensor&>(*this), start_dim, end_dim, out_dim);
988988
#else
989-
static auto table = globalATenDispatch().getOpTable("aten::flatten(Tensor self, Dimname start_dim, Dimname end_dim, Dimname out_dim) -> Tensor");
989+
static auto table = globalATenDispatch().getOpTable("aten::flatten.using_names(Tensor self, Dimname start_dim, Dimname end_dim, Dimname out_dim) -> Tensor");
990990
return table->getOp<Tensor (const Tensor &, Dimname, Dimname, Dimname)>(type_set())(const_cast<Tensor&>(*this), start_dim, end_dim, out_dim);
991991
#endif
992992
}
@@ -996,7 +996,7 @@ inline Tensor Tensor::flatten(DimnameList dims, Dimname out_dim) const {
996996
#ifdef USE_STATIC_DISPATCH
997997
return TypeDefault::flatten(const_cast<Tensor&>(*this), dims, out_dim);
998998
#else
999-
static auto table = globalATenDispatch().getOpTable("aten::flatten(Tensor self, DimnameList dims, Dimname out_dim) -> Tensor");
999+
static auto table = globalATenDispatch().getOpTable("aten::flatten.DimnameList(Tensor self, DimnameList dims, Dimname out_dim) -> Tensor");
10001000
return table->getOp<Tensor (const Tensor &, DimnameList, Dimname)>(type_set())(const_cast<Tensor&>(*this), dims, out_dim);
10011001
#endif
10021002
}

‎aten/src/ATen/native/native_functions.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,20 +1060,20 @@
10601060
CPU: eye_out_cpu
10611061
CUDA: eye_out_cuda
10621062

1063-
- func: flatten(Tensor self, int start_dim=0, int end_dim=-1) -> Tensor
1063+
- func: flatten.using_ints(Tensor self, int start_dim=0, int end_dim=-1) -> Tensor
10641064
use_c10_dispatcher: True
10651065
variants: function, method
10661066
named_guard: False
10671067

1068-
- func: flatten(Tensor self, int start_dim, int end_dim, Dimname out_dim) -> Tensor
1068+
- func: flatten.named_out_dim(Tensor self, int start_dim, int end_dim, Dimname out_dim) -> Tensor
10691069
variants: function, method
10701070
named_guard: False
10711071

1072-
- func: flatten(Tensor self, Dimname start_dim, Dimname end_dim, Dimname out_dim) -> Tensor
1072+
- func: flatten.using_names(Tensor self, Dimname start_dim, Dimname end_dim, Dimname out_dim) -> Tensor
10731073
variants: function, method
10741074
named_guard: False
10751075

1076-
- func: flatten(Tensor self, DimnameList dims, Dimname out_dim) -> Tensor
1076+
- func: flatten.DimnameList(Tensor self, DimnameList dims, Dimname out_dim) -> Tensor
10771077
variants: function, method
10781078
named_guard: False
10791079

0 commit comments

Comments
 (0)