Skip to content

[JIT] fix specialized list from dict keys #23267

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
eellison wants to merge 2 commits into from
+31 −23
Closed

[JIT] fix specialized list from dict keys #23267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77d2994
fix specialized list from dict keys
Jul 23, 2019
d9a2314
op that expects specialized list
Jul 23, 2019
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
8 changes: 8 additions & 0 deletions test/test_jit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16414,6 +16414,14 @@ def keys(x):

self.assertEqual(set(keys(self.dict())), set(self.dict().keys()))

@torch.jit.script
def specialized_list():
li = {1: 1, 2: 2}.keys()
li.append(3)
return li

self.assertTrue(set(specialized_list()) == set([1, 2, 3]))

def test_values(self):
@torch.jit.script
def values(x):
Expand Down
46 changes: 23 additions & 23 deletions torch/csrc/jit/register_prim_ops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,58 +1685,58 @@ int dictLen(Stack& stack) {
return 0;
}

int dictKeys(Stack& stack) {
auto dict = pop(stack).toGenericDict();
auto keys = c10::impl::GenericList(c10::impl::deprecatedUntypedList());
keys.reserve(dict.size());
for (auto& item : dict) {
keys.push_back(item.key());
}
push(stack, IValue(keys));
return 0;
}

template <typename Elem>
c10::List<Elem> makeListForDictValues(
template <unsigned int Index, typename Elem>
c10::List<Elem> makeListForDictKeysOrValues(
const std::vector<std::pair<IValue, IValue>>& order) {
c10::List<Elem> values;
values.reserve(order.size());
for (const auto& item : order) {
values.push_back(item.second.to<Elem>());
values.push_back(std::get<Index>(item).template to<Elem>());
}
return values;
}

template <>
c10::impl::GenericList makeListForDictValues<IValue>(
template <unsigned int Index>
c10::impl::GenericList makeGenericListForDictKeysOrValues(
const std::vector<std::pair<IValue, IValue>>& order) {
auto values = c10::impl::GenericList(c10::impl::deprecatedUntypedList());
Copy link
Contributor

@driazati driazati Jul 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to do c10::List<IValue> so we don't have to have a separate copy of this function for GenericLists?

Copy link
Contributor Author

@eellison eellison Jul 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that doesn't compile. And you can't do partial template specialization so that you are only passing in the Index in

values.reserve(order.size());
for (const auto& item : order) {
values.push_back(item.second);
values.push_back(std::get<Index>(item));
}
return values;
}

Operation dictValues(const Node* n) {
template <unsigned int Index>
Operation dictKeysOrValues(const Node* n) {
auto outputType = n->output()->type()->expect<ListType>();
return [=](Stack& stack) -> int {
const auto& order = iterationOrder(pop(stack).toGenericDict());
if (outputType->getElementType()->isSubtypeOf(TensorType::get())) {
push(stack, makeListForDictValues<at::Tensor>(order));
push(stack, makeListForDictKeysOrValues<Index, at::Tensor>(order));
} else if (outputType->getElementType() == IntType::get()) {
push(stack, makeListForDictValues<int64_t>(order));
push(stack, makeListForDictKeysOrValues<Index, int64_t>(order));
} else if (outputType->getElementType() == FloatType::get()) {
push(stack, makeListForDictValues<double>(order));
push(stack, makeListForDictKeysOrValues<Index, double>(order));
} else if (outputType->getElementType() == BoolType::get()) {
push(stack, makeListForDictValues<bool>(order));
push(stack, makeListForDictKeysOrValues<Index, bool>(order));
} else {
push(stack, makeListForDictValues<IValue>(order));
push(stack, makeGenericListForDictKeysOrValues<Index>(order));
}
return 0;
};
}

Operation dictKeys(const Node* n) {
// getting first dict pair
return dictKeysOrValues<0>(n);
}

Operation dictValues(const Node* n) {
// getting second of dict pair
return dictKeysOrValues<1>(n);
}

int dictIndex(Stack& stack) {
auto key = pop(stack);
auto dict = pop(stack).toGenericDict();
Expand Down