Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-11-14 12:18:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

python: return the existing ndarray for bfloat16 / float8 Mats instead of a copy

Browse Source 
Signed-off-by: Abhishek Gola <abhishek.gola@bigvisionllc.com>
This commit is contained in:
Abhishek Gola
2026-10-14 17:45:25 +05:30
parent f527a649bf
commit 2dc797b92e
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
modules/python/src2/cv2_convert.cpp
View File

@@ -334,30 +334,22 @@ bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo& info)
return true;
}
// Wraps m in a NumPy array of dtype `descr`; the caller guarantees it matches m.depth().
// Builds an empty or 0-D array of dtype `descr`; the caller guarantees it matches m.depth().
static PyObject* pyopencv_from_nonconventional(const cv::Mat& m, PyArray_Descr* descr)
{
cv::Mat cont;
if( m.isContinuous() )
cont = m;
else
ERRWRAP2(cont = m.clone());
const int cn = cont.channels();
int dims = cont.dims;
const int cn = m.channels();
int dims = m.dims;
cv::AutoBuffer<npy_intp> _sizes(dims + 1);
for( int i = 0; i < dims; i++ )
_sizes[i] = (npy_intp)cont.size[i];
_sizes[i] = (npy_intp)m.size[i];
if( cn > 1 )
_sizes[dims++] = cn;
Py_INCREF(descr); // PyArray_NewFromDescr steals the reference
PyObject* o = PyArray_NewFromDescr(&PyArray_Type, descr, dims, _sizes.data(),
nullptr, nullptr, 0, nullptr);
if( !o )
return nullptr;
if( !cont.empty() )
memcpy(PyArray_DATA((PyArrayObject*)o), cont.data, cont.total() * cont.elemSize());
if( o && !m.empty() )
memcpy(PyArray_DATA((PyArrayObject*)o), m.data, m.elemSize());
return o;
}
@@ -366,16 +358,21 @@ PyObject* pyopencv_from(const cv::Mat& m)
{
if( isNonConventionalDepth(m.depth()) )
{
if( PyArray_Descr* descr = nonConventionalDescrForCvDepth(m.depth()) )
PyArray_Descr* descr = nonConventionalDescrForCvDepth(m.depth());
if( !descr )
{
if( getAllowNonConventionalDataTypes() )
CV_LOG_ONCE_WARNING(NULL, "Python bindings: non-conventional data types are allowed, "
"but NumPy does not know bfloat16 / float8 and they are returned as float32. "
"Import ml_dtypes to keep the exact dtype.");
// NumPy alone cannot name these; widen to float32 (lossless).
cv::Mat m32f;
ERRWRAP2(m.convertTo(m32f, CV_32F));
return pyopencv_from(m32f);
}
if( m.empty() || m.dims == 0 )
return pyopencv_from_nonconventional(m, descr);
if( getAllowNonConventionalDataTypes() )
CV_LOG_ONCE_WARNING(NULL, "Python bindings: non-conventional data types are allowed, "
"but NumPy does not know bfloat16 / float8 and they are returned as float32. "
"Import ml_dtypes to keep the exact dtype.");
// NumPy alone cannot name these; widen to float32 (lossless).
cv::Mat m32f;
ERRWRAP2(m.convertTo(m32f, CV_32F));
return pyopencv_from(m32f);
// Otherwise share the path below: NumpyAllocator allocates with `descr`.
}
if( m.empty() )
{