wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-06-30 21:11:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tuples as keys in dicts can be serialized

Browse Source
This commit is contained in:
William Paul
2016-08-24 23:31:09 +00:00
parent 7b548bddd3
commit f468871b5d
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/pynumbuf/adapters/python.cc
+7 -3
View File
@@ -171,16 +171,20 @@ Status DeserializeTuple(std::shared_ptr<Array> array, int32_t start_idx, int32_t
Status SerializeDict(std::vector<PyObject*> dicts, std::shared_ptr<Array>* out) {
DictBuilder result;
std::vector<PyObject*> sublists, subtuples, subdicts, dummy;
std::vector<PyObject*> sublists, subtuples, subdicts, keytuples, dummy;
for (const auto& dict : dicts) {
PyObject *key, *value;
Py_ssize_t pos = 0;
while (PyDict_Next(dict, &pos, &key, &value)) {
RETURN_NOT_OK(append(key, result.keys(), dummy, dummy, dummy));
RETURN_NOT_OK(append(key, result.keys(), dummy, keytuples, dummy));
DCHECK(dummy.size() == 0);
RETURN_NOT_OK(append(value, result.vals(), sublists, subtuples, subdicts));
}
}
std::shared_ptr<Array> key_val_tuples;
if (keytuples.size() > 0) {
RETURN_NOT_OK(SerializeSequences(keytuples, &key_val_tuples));
}
std::shared_ptr<Array> val_list;
if (sublists.size() > 0) {
RETURN_NOT_OK(SerializeSequences(sublists, &val_list));
@@ -193,7 +197,7 @@ Status SerializeDict(std::vector<PyObject*> dicts, std::shared_ptr<Array>* out)
if (subdicts.size() > 0) {
RETURN_NOT_OK(SerializeDict(subdicts, &val_dict));
}
*out = result.Finish(val_list, val_tuples, val_dict);
*out = result.Finish(key_val_tuples, val_list, val_tuples, val_dict);
return Status::OK();
}
python/test/runtest.py
+3 -2
View File
@@ -3,8 +3,9 @@ import libnumbuf
import numpy as np
from numpy.testing import assert_equal
TEST_OBJECTS = [[1, "hello", 3.0], 42, 43L, "hello world", u"x", u"\u262F",
42.0, 1L << 62, (1.0, "hi"),
TEST_OBJECTS = [{(1,2) : 1}, {() : 2}, [1, "hello", 3.0], 42, 43L, "hello world",
u"x", u"\u262F", 42.0,
1L << 62, (1.0, "hi"),
None, (None, None), ("hello", None),
True, False, (True, False), "hello",
{True: "hello", False: "world"},