update numpy version to 1.19.11

Author: taigw

densecrf_python/densecrf.cpp

@@ -42,10 +42,10 @@ densecrf_wrapper(PyObject *self, PyObject *args)
     VectorXs map = dense_crf_inference((const unsigned char *)arr_I->data, (const float *)arr_fP->data, 
                     shape_fP[0], shape_fP[1], shape_fP[2], crf_param);
 
-    int outshape[2];
+    npy_intp outshape[2];
     outshape[0]=shape_fP[0];
     outshape[1]=shape_fP[1];
-    PyArrayObject * labels = (PyArrayObject*)  PyArray_FromDims(2, outshape, NPY_INT8);
+    PyArrayObject * labels = (PyArrayObject*)  PyArray_SimpleNew(2, outshape, NPY_INT8);
     for (int x=0;x<outshape[0]*outshape[1];x++)
     {
         *(labels->data + x*labels->strides[1]) = map[x];

densecrf_python/densecrf3d.cpp

@@ -141,11 +141,11 @@ dense_crf_wrapper(PyObject *self, PyObject *args)
                         (unsigned char *)arr_I->data);
     MatrixXf probMapsMatrix = crf3d.inference(MaxIterations);
     VectorXs segmentationVector = crf3d.currentMap(probMapsMatrix);
-    int outshape[3];
+    npy_intp outshape[3];
     outshape[0] = shape_P[0];
     outshape[1] = shape_P[1];
     outshape[2] = shape_P[2];
-    PyArrayObject * labels = (PyArrayObject*)  PyArray_FromDims(3, outshape, NPY_INT8);
+    PyArrayObject * labels = (PyArrayObject*)  PyArray_SimpleNew(3, outshape, NPY_INT8);
     for(int i = 0; i < num_voxel; i++)
     {
         *(labels->data + i) = segmentationVector(i);

maxflow_python/maxflow.cpp

@@ -45,10 +45,10 @@ maxflow2d_wrapper(PyObject *self, PyObject *args)
 
     int chns = 1;
     if(dimI == 3) chns = shapeI[2];
-    int outshape[2];
+    npy_intp outshape[2];
     outshape[0]=shapeI[0];
     outshape[1]=shapeI[1];
-    PyArrayObject * arr_L = (PyArrayObject*)  PyArray_FromDims(2, outshape, NPY_INT8);
+    PyArrayObject * arr_L = (PyArrayObject*)  PyArray_SimpleNew(2, outshape, NPY_INT8);
     maxflow_inference((unsigned char *) arr_L->data, (const float *) arr_I->data, (const float *) arr_P->data, NULL,
         shapeI[0], shapeI[1], chns, 2, lambda, sigma);
 
@@ -100,10 +100,10 @@ interactive_maxflow2d_wrapper(PyObject *self, PyObject *args)
 
     int chns = 1;
     if(dimI == 3) chns = shapeI[2];
-    int outshape[2];
+    npy_intp outshape[2];
     outshape[0]=shapeI[0];
     outshape[1]=shapeI[1];
-    PyArrayObject * arr_L = (PyArrayObject*)  PyArray_FromDims(2, outshape, NPY_INT8);
+    PyArrayObject * arr_L = (PyArrayObject*)  PyArray_SimpleNew(2, outshape, NPY_INT8);
     maxflow_inference((unsigned char *) arr_L->data, (const float *) arr_I->data, 
         (const float *) arr_P->data, (const unsigned char *) arr_S->data,
         shapeI[0], shapeI[1], chns, 2, lambda, sigma);
@@ -153,8 +153,8 @@ maxflow3d_wrapper(PyObject *self, PyObject *args)
 
     int chns = 1;
     if(dimI == 4) chns = shapeI[3];
-    int outshape[3] = {shapeI[0], shapeI[1], shapeI[2]};
-    PyArrayObject * arr_L = (PyArrayObject*)  PyArray_FromDims(3, outshape, NPY_INT8);
+    npy_intp outshape[3] = {shapeI[0], shapeI[1], shapeI[2]};
+    PyArrayObject * arr_L = (PyArrayObject*)  PyArray_SimpleNew(3, outshape, NPY_INT8);
     maxflow3d_inference((unsigned char *) arr_L->data, (const float *) arr_I->data, 
         (const float *) arr_P->data, NULL,
         shapeI[0], shapeI[1], shapeI[2], chns, 2, lambda, sigma);
@@ -207,8 +207,8 @@ interactive_maxflow3d_wrapper(PyObject *self, PyObject *args)
 
     int chns = 1;
     if(dimI == 4) chns = shapeI[3];
-    int outshape[3] = {shapeI[0], shapeI[1], shapeI[2]};
-    PyArrayObject * arr_L = (PyArrayObject*)  PyArray_FromDims(3, outshape, NPY_INT8);
+    npy_intp outshape[3] = {shapeI[0], shapeI[1], shapeI[2]};
+    PyArrayObject * arr_L = (PyArrayObject*)  PyArray_SimpleNew(3, outshape, NPY_INT8);
     maxflow3d_inference((unsigned char *) arr_L->data, (const float *) arr_I->data, 
         (const float *) arr_P->data, (const unsigned char *) arr_S->data,
         shapeI[0], shapeI[1], shapeI[2], chns, 2, lambda, sigma);

requirements.txt

@@ -0,0 +1 @@
+numpy>=1.19.1

setup.py

@@ -71,7 +71,7 @@
 
 
 setup(name=package_name,
-      version = "0.0.6",
+      version = "0.1.0",
       author  ='Guotai Wang',
       author_email = '[email protected]',
       description  = description,