Merge pull request #776 from nouiz/fix_new_commit

doc/install.txt

@@ -228,7 +228,7 @@ get the code using `Git <http://git-scm.com>`__:
 
     git clone git://github.com/Theano/Theano.git
 
-From here, the easiest way to get started is (this request setuptools_ or distribute_ to be installed):
+From here, the easiest way to get started is (this requires setuptools_ or distribute_ to be installed):
 
 .. code-block:: bash
 

theano/gof/compilelock.py

@@ -42,6 +42,8 @@ def get_lock(lock_dir=None, **kw):
 
     :param kw: Additional arguments to be forwarded to the `lock` function when
     acquiring the lock.
+
+    :note: We can lock only on 1 directory at a time.
     """
     if lock_dir is None:
         lock_dir = os.path.join(config.compiledir, 'lock_dir')

theano/sandbox/cuda/cuda_ndarray.cu

@@ -879,12 +879,14 @@ CudaNdarray_TakeFrom(CudaNdarray * self, PyObject *args){
         if (! clipmode){
             Py_DECREF(indices_obj);
             Py_DECREF(out);
+            free(dims);
             return NULL;
         }
         if (strcmp(clipmode, "raise") != 0) {
             PyErr_SetString(PyExc_NotImplementedError,"CudaNdarray_TakeFrom: only the raise mode is currently supported");
             Py_DECREF(indices_obj);
             Py_DECREF(out);
+            free(dims);
             return NULL;
         }
         Py_DECREF(clipmode_obj);
@@ -903,6 +905,7 @@ CudaNdarray_TakeFrom(CudaNdarray * self, PyObject *args){
         if (!err_var) { // PyErr set by device_malloc
             Py_DECREF(indices_obj);
             Py_DECREF(out);
+            free(dims);
             return NULL;
         }
         cudaError_t err = cudaMemset((void*)err_var, 0, sizeof(int));
@@ -912,10 +915,11 @@ CudaNdarray_TakeFrom(CudaNdarray * self, PyObject *args){
                          cudaGetErrorString(err));
             Py_DECREF(indices_obj);
             Py_DECREF(out);
+            free(dims);
             return NULL;
         }
     }
-    free(dims);
+
     dim3 n_blocks(std::min(CudaNdarray_HOST_DIMS(out)[0],65535),1,1);
     switch (self->nd) {
         case 1:
@@ -997,7 +1001,8 @@ CudaNdarray_TakeFrom(CudaNdarray * self, PyObject *args){
                         "CudaNdarray_TakeFrom: only input with 1, 2 or 3"
                         " dimensions are currently supported");
         
-    }        
+    }
+    free(dims);
     CNDA_THREAD_SYNC;
     cudaError_t err = cudaGetLastError();
     if (cudaSuccess != err) {