Make sure the compilelock gets released

theano/gof/cutils.py

@@ -11,56 +11,57 @@ if os.path.exists(os.path.join(config.compiledir,'cutils_ext.so')):
 # directory. This is important to prevent multiple processes from trying to
 # compile the cutils_ext module simultaneously.
 get_lock()
-
 try:
-    from cutils_ext.cutils_ext import *
-except ImportError:
-    import cmodule
+    try:
+        from cutils_ext.cutils_ext import *
+    except ImportError:
+        import cmodule
 
-    code = """
-#include <Python.h>
-extern "C"{
-static PyObject *
-run_cthunk(PyObject *self, PyObject *args)
-{
-  PyObject *py_cthunk = NULL;
-  if(!PyArg_ParseTuple(args,"O",&py_cthunk))
-    return NULL;
+        code = """
+    #include <Python.h>
+    extern "C"{
+    static PyObject *
+    run_cthunk(PyObject *self, PyObject *args)
+    {
+      PyObject *py_cthunk = NULL;
+      if(!PyArg_ParseTuple(args,"O",&py_cthunk))
+        return NULL;
 
-  if (!PyCObject_Check(py_cthunk)) {
-    PyErr_SetString(PyExc_ValueError,
-                   "Argument to run_cthunk must be a PyCObject.");
-    return NULL;
-  }
-  void * ptr_addr = PyCObject_AsVoidPtr(py_cthunk);
-  int (*fn)(void*) = (int (*)(void*))(ptr_addr);
-  void* it = PyCObject_GetDesc(py_cthunk);
-  int failure = fn(it);
+      if (!PyCObject_Check(py_cthunk)) {
+        PyErr_SetString(PyExc_ValueError,
+                       "Argument to run_cthunk must be a PyCObject.");
+        return NULL;
+      }
+      void * ptr_addr = PyCObject_AsVoidPtr(py_cthunk);
+      int (*fn)(void*) = (int (*)(void*))(ptr_addr);
+      void* it = PyCObject_GetDesc(py_cthunk);
+      int failure = fn(it);
 
-  return Py_BuildValue("i", failure);
-}
+      return Py_BuildValue("i", failure);
+    }
 
-static PyMethodDef CutilsExtMethods[] = {
-    {"run_cthunk",  run_cthunk, METH_VARARGS|METH_KEYWORDS,
-     "Run a theano cthunk."},
-    {NULL, NULL, 0, NULL}        /* Sentinel */
-};
+    static PyMethodDef CutilsExtMethods[] = {
+        {"run_cthunk",  run_cthunk, METH_VARARGS|METH_KEYWORDS,
+         "Run a theano cthunk."},
+        {NULL, NULL, 0, NULL}        /* Sentinel */
+    };
 
-PyMODINIT_FUNC
-initcutils_ext(void)
-{
-  (void) Py_InitModule("cutils_ext", CutilsExtMethods);
-}
-}
-"""
+    PyMODINIT_FUNC
+    initcutils_ext(void)
+    {
+      (void) Py_InitModule("cutils_ext", CutilsExtMethods);
+    }
+    }
+    """
 
-    loc = os.path.join(config.compiledir, 'cutils_ext')
-    if not os.path.exists(loc):
-        os.mkdir(loc)
+        loc = os.path.join(config.compiledir, 'cutils_ext')
+        if not os.path.exists(loc):
+            os.mkdir(loc)
 
-    cmodule.gcc_module_compile_str('cutils_ext', code, location=loc)
-    from cutils_ext.cutils_ext import *
+        cmodule.gcc_module_compile_str('cutils_ext', code, location=loc)
+        from cutils_ext.cutils_ext import *
 
-# Release lock on compilation directory.
-release_lock()
+finally:
+    # Release lock on compilation directory.
+    release_lock()