wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-07-19 11:27:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

switch to release mode

Browse Source
This commit is contained in:
Philipp Moritz
2016-07-22 22:01:29 -07:00
parent 9bc7e7843f
commit c973059944
5 changed files with 77 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/pynumbuf/adapters/numpy.cc
+27 -11
View File
@@ -57,31 +57,47 @@ Status SerializeArray(PyArrayObject* array, SequenceBuilder& builder) {
for (int i = 0; i < ndim; ++i) {
dims[i] = PyArray_DIM(array, i);
}
auto data = PyArray_DATA(array);
// TODO(pcm): Once we don't use builders any more below and directly share
// the memory buffer, we need to be more careful about this and not
// decrease the reference count of "contiguous" before the serialization
// is finished
auto contiguous = PyArray_GETCONTIGUOUS(array);
auto data = PyArray_DATA(contiguous);
switch (dtype) {
case NPY_UINT8:
return builder.Append(dims, reinterpret_cast<uint8_t*>(data));
RETURN_NOT_OK(builder.Append(dims, reinterpret_cast<uint8_t*>(data)));
break;
case NPY_INT8:
return builder.Append(dims, reinterpret_cast<int8_t*>(data));
RETURN_NOT_OK(builder.Append(dims, reinterpret_cast<int8_t*>(data)));
break;
case NPY_UINT16:
return builder.Append(dims, reinterpret_cast<uint16_t*>(data));
RETURN_NOT_OK(builder.Append(dims, reinterpret_cast<uint16_t*>(data)));
break;
case NPY_INT16:
return builder.Append(dims, reinterpret_cast<int16_t*>(data));
RETURN_NOT_OK(builder.Append(dims, reinterpret_cast<int16_t*>(data)));
break;
case NPY_UINT32:
return builder.Append(dims, reinterpret_cast<uint32_t*>(data));
RETURN_NOT_OK(builder.Append(dims, reinterpret_cast<uint32_t*>(data)));
break;
case NPY_INT32:
return builder.Append(dims, reinterpret_cast<int32_t*>(data));
RETURN_NOT_OK(builder.Append(dims, reinterpret_cast<int32_t*>(data)));
break;
case NPY_UINT64:
return builder.Append(dims, reinterpret_cast<uint64_t*>(data));
RETURN_NOT_OK(builder.Append(dims, reinterpret_cast<uint64_t*>(data)));
break;
case NPY_INT64:
return builder.Append(dims, reinterpret_cast<int64_t*>(data));
RETURN_NOT_OK(builder.Append(dims, reinterpret_cast<int64_t*>(data)));
break;
case NPY_FLOAT:
return builder.Append(dims, reinterpret_cast<float*>(data));
RETURN_NOT_OK(builder.Append(dims, reinterpret_cast<float*>(data)));
break;
case NPY_DOUBLE:
return builder.Append(dims, reinterpret_cast<double*>(data));
RETURN_NOT_OK(builder.Append(dims, reinterpret_cast<double*>(data)));
break;
default:
DCHECK(false) << "numpy data type not recognized: " << dtype;
}
Py_XDECREF(contiguous);
return Status::OK();
}
python/src/pynumbuf/adapters/python.cc
+6 -1
View File
@@ -96,8 +96,13 @@ Status SerializeSequences(std::vector<PyObject*> sequences, std::shared_ptr<Arra
PyObject* item;
PyObject* iterator = PyObject_GetIter(sequence);
while (item = PyIter_Next(iterator)) {
RETURN_NOT_OK(append(item, builder, sublists, subtuples, subdicts));
Status s = append(item, builder, sublists, subtuples, subdicts);
Py_DECREF(item);
// if an error occurs, we need to decrement the reference counts before returning
if (!s.ok()) {
Py_DECREF(iterator);
return s;
}
}
Py_DECREF(iterator);
}