nogil for cubical constructor

There may be some extra copying until cython3, but it is probably not
that bad.

1 files changed, 11 insertions, 3 deletions

diff --git a/src/python/gudhi/cubical_complex.pyx b/src/python/gudhi/cubical_complex.pyx
index 308b5099..0068f2ff 100644
--- a/src/python/gudhi/cubical_complex.pyx
+++ b/src/python/gudhi/cubical_complex.pyx
@@ -80,7 +80,7 @@ cdef class CubicalComplex:
                   perseus_file=''):
         if ((dimensions is not None) and (top_dimensional_cells is not None)
             and (perseus_file == '')):
-            self.thisptr = new Bitmap_cubical_complex_base_interface(dimensions, top_dimensional_cells)
+            self._construct_from_cells(dimensions, top_dimensional_cells)
         elif ((dimensions is None) and (top_dimensional_cells is not None)
             and (perseus_file == '')):
             top_dimensional_cells = np.array(top_dimensional_cells,
@@ -88,11 +88,11 @@ cdef class CubicalComplex:
                                              order = 'F')
             dimensions = top_dimensional_cells.shape
             top_dimensional_cells = top_dimensional_cells.ravel(order='F')
-            self.thisptr = new Bitmap_cubical_complex_base_interface(dimensions, top_dimensional_cells)
+            self._construct_from_cells(dimensions, top_dimensional_cells)
         elif ((dimensions is None) and (top_dimensional_cells is None)
             and (perseus_file != '')):
             if os.path.isfile(perseus_file):
-                self.thisptr = new Bitmap_cubical_complex_base_interface(perseus_file.encode('utf-8'))
+                self._construct_from_file(perseus_file.encode('utf-8'))
             else:
                 raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT),
                                         perseus_file)
@@ -101,6 +101,14 @@ cdef class CubicalComplex:
                 "top_dimensional_cells or from a Perseus-style file name.",
                 file=sys.stderr)
 
+    def _construct_from_cells(self, vector[unsigned] dimensions, vector[double] top_dimensional_cells):
+        with nogil:
+            self.thisptr = new Bitmap_cubical_complex_base_interface(dimensions, top_dimensional_cells)
+
+    def _construct_from_file(self, string filename):
+        with nogil:
+            self.thisptr = new Bitmap_cubical_complex_base_interface(filename)
+
     def __dealloc__(self):
         if self.thisptr != NULL:
             del self.thisptr