Removed JIT (I've not seen significant improvement in performance).

This also fixes a big bubu that was in the non JITed kernel

Signed-off-by: uzerbianati <zerbinati@maths.ox.ac.uk>

Author: uzerbianati

ngsPETSc/plex.py

@@ -16,114 +16,57 @@ class ngs:
         class comp:
             "dummy class"
             Mesh = type(None)
-try:
-    from numba import jit
-    numba = True
-except: # pylint: disable=bare-except
-    jit = None
-    numba = False
 
 FACE_SETS_LABEL = "Face Sets"
 CELL_SETS_LABEL = "Cell Sets"
 EDGE_SETS_LABEL = "Edge Sets"
 
-if numba:
-    @jit(nopython=True, cache=True)
-    def build2DCells(coordinates, sIndicies, cell_indicies, start_end):
-        """
-        JIT Method used to construct 2D cells
-        """
-        cStart = start_end[0]
-        cEnd = start_end[1]
-        cells = np.zeros((cell_indicies.shape[0], 3))
-        for i in range(cStart,cEnd):
-            sIndex = sIndicies[i]
-            if len(sIndex)==3:
-                cell = list(set(cell_indicies[i]))
-                A = np.zeros((2,2))
-                A[0,0] = (coordinates[cell[1]]-coordinates[cell[0]])[0]
-                A[0,1] = (coordinates[cell[1]]-coordinates[cell[0]])[1]
-                A[1,0] = (coordinates[cell[2]]-coordinates[cell[1]])[0]
-                A[1,1] = (coordinates[cell[2]]-coordinates[cell[1]])[1]
-                if np.linalg.det(A) > 0:
-                    cells[i] = cell
-                else:
-                    cells[i] = np.array([cell[0], cell[2], cell[1]])
-            else:
-                raise RuntimeError("We only support triangles.")
-        return cells
-
-    @jit(nopython=True, cache=True)
-    def build3DCells(coordinates, sIndicies, cell_indicies, start_end):
-        """
-        JIT Method used to construct 3D cells
-        """
-        cStart = start_end[0]
-        cEnd = start_end[1]
-        cells = np.zeros((cell_indicies.shape[0], 4))
-        for i in range(cStart,cEnd):
-            sIndex = sIndicies[i]
-            if len(sIndex)==4:
-                cell = list(set(cell_indicies[i]))
-                A = np.zeros((3,3))
-                A[0,0] = (coordinates[cell[1]]-coordinates[cell[0]])[0]
-                A[0,1] = (coordinates[cell[1]]-coordinates[cell[0]])[1]
-                A[0,2] = (coordinates[cell[1]]-coordinates[cell[0]])[2]
-                A[1,0] = (coordinates[cell[2]]-coordinates[cell[1]])[0]
-                A[1,1] = (coordinates[cell[2]]-coordinates[cell[1]])[1]
-                A[1,2] = (coordinates[cell[2]]-coordinates[cell[1]])[2]
-                A[2,0] = (coordinates[cell[3]]-coordinates[cell[2]])[0]
-                A[2,1] = (coordinates[cell[3]]-coordinates[cell[2]])[1]
-                A[2,2] = (coordinates[cell[3]]-coordinates[cell[2]])[2]
-                if np.linalg.det(A) > 0:
-                    cells[i] = cell
-                else:
-                    cells[i] = np.array([cell[0], cell[1], cell[2], cell[2]])
+def build2DCells(coordinates, sIndicies, cell_indicies, start_end):
+    cStart = start_end[0]
+    cEnd = start_end[1]
+    cells = np.zeros((cell_indicies.shape[0], 3))
+    for i in range(cStart,cEnd):
+        sIndex = sIndicies[i]
+        if len(sIndex)==3:
+            cell = list(set(cell_indicies[i]))
+            A = np.zeros((2,2))
+            A[0,0] = (coordinates[cell[1]]-coordinates[cell[0]])[0]
+            A[0,1] = (coordinates[cell[1]]-coordinates[cell[0]])[1]
+            A[1,0] = (coordinates[cell[2]]-coordinates[cell[1]])[0]
+            A[1,1] = (coordinates[cell[2]]-coordinates[cell[1]])[1]
+            if np.linalg.det(A) > 0:
+                cells[i] = cell
             else:
-                raise RuntimeError("We only support tets.")
-        return cells
-else:
-    def build2DCells(coordinates, sIndicies, cell_indicies, start_end):
-        """
-        Method used to construct 2D cells
-        """
-        cStart, cEnd = start_end
-        cells = np.zeros((cell_indicies.shape[0], 3))
-        for i in range(cStart,cEnd):
-            sIndex = sIndicies[i]
-            if len(sIndex)==3:
-                cell = list(set(cell_indicies[i]))
-                A = np.zeros((2,2))
-                for i in range(2):
-                    A[i, :] = coordinates[cell[i+1]] - coordinates[cell[i]]
-                if np.linalg.det(A) > 0:
-                    cells[i] = cell
-                else:
-                    cells[i] = np.array([cell[0], cell[2], cell[1]])
-            else:
-                raise RuntimeError("We only support triangles.")
-        return cells
+                cells[i] = np.array([cell[0], cell[2], cell[1]])
+        else:
+            raise RuntimeError("We only support triangles.")
+    return cells
 
-    def build3DCells(coordinates, sIndicies, cell_indicies, start_end):
-        """
-        Method used to construct 3D cells
-        """
-        cStart, cEnd = start_end
-        cells = np.zeros((cell_indicies.shape[0], 4))
-        for i in range(cStart,cEnd):
-            sIndex = sIndicies[i]
-            if len(sIndex)==4:
-                cell = list(set(cell_indicies[i]))
-                A = np.zeros((3,3))
-                for i in range(3):
-                    A[i, :] = coordinates[cell[i+1]] - coordinates[cell[i]]
-                if np.linalg.det(A) > 0:
-                    cells[i] = cell
-                else:
-                    cells[i] = np.array([cell[0], cell[1], cell[3], cell[2]])
+def build3DCells(coordinates, sIndicies, cell_indicies, start_end):
+    cStart = start_end[0]
+    cEnd = start_end[1]
+    cells = np.zeros((cell_indicies.shape[0], 4))
+    for i in range(cStart,cEnd):
+        sIndex = sIndicies[i]
+        if len(sIndex)==4:
+            cell = list(set(cell_indicies[i]))
+            A = np.zeros((3,3))
+            A[0,0] = (coordinates[cell[1]]-coordinates[cell[0]])[0]
+            A[0,1] = (coordinates[cell[1]]-coordinates[cell[0]])[1]
+            A[0,2] = (coordinates[cell[1]]-coordinates[cell[0]])[2]
+            A[1,0] = (coordinates[cell[2]]-coordinates[cell[1]])[0]
+            A[1,1] = (coordinates[cell[2]]-coordinates[cell[1]])[1]
+            A[1,2] = (coordinates[cell[2]]-coordinates[cell[1]])[2]
+            A[2,0] = (coordinates[cell[3]]-coordinates[cell[2]])[0]
+            A[2,1] = (coordinates[cell[3]]-coordinates[cell[2]])[1]
+            A[2,2] = (coordinates[cell[3]]-coordinates[cell[2]])[2]
+            if np.linalg.det(A) > 0:
+                cells[i] = cell
             else:
-                raise RuntimeError("We only support tets.")
-        return cells
+                cells[i] = np.array([cell[0], cell[1], cell[2], cell[2]])
+        else:
+            raise RuntimeError("We only support tets.")
+    return cells
 
 def create2DNetgenMesh(ngMesh, coordinates, plex, geoInfo):
     """