Merge pull request #1812 from delallea/minor

doc/extending/ctype.txt

@@ -558,9 +558,9 @@ default, it will recompile the c code for each process.
 Shape and Shape_i
 =================
 
-We have 2 generic Ops Shape and Shape_i that return the shape of any
-Theano Variable that have a shape attribute and Shape_i return only of
-the element of the shape.
+We have 2 generic Ops, Shape and Shape_i, that return the shape of any
+Theano Variable that has a shape attribute (Shape_i returns only one of
+the elements of the shape).
 
 
 .. code-block:: python
@@ -568,5 +568,5 @@ the element of the shape.
    theano.compile.ops.register_shape_c_code(YOUR_TYPE_CLASS, THE_C_CODE, version=())
    theano.compile.ops.register_shape_i_c_code(YOUR_TYPE_CLASS, THE_C_CODE, version=())
 
-The c code work as the ViewOp. Shape_i have the additional i parameter
-that you can use with %(i)s.
+The C code works as the ViewOp. Shape_i has the additional ``i`` parameter
+that you can use with ``%(i)s``.

doc/install.txt

@@ -234,8 +234,8 @@ From here, the easiest way to get started is (this requires setuptools_ or distr
 
 .. note::
 
-   "python setup.py develop ..." don't work on Python 3 as it don't call
-   the converter from Python2 code to Python 3 code.
+   "python setup.py develop ..." does not work on Python 3 as it does not call
+   the converter from Python 2 code to Python 3 code.
 
 This will install a ``.pth`` file in your ``site-packages`` directory that
 tells Python where to look for your Theano installation (i.e. in the

doc/install_ubuntu.txt

@@ -167,7 +167,7 @@ yourself. Here is some code that will help you.
     make FC=gfortran
     sudo make PREFIX=/usr/local/ install
     # Tell Theano to use OpenBLAS.
-    # This work only for the current user.
+    # This works only for the current user.
     # Each Theano user on that computer should run that line.
     echo -e "\n[blas]\nldflags = -lopenblas\n" >> ~/.theanorc
 

doc/library/config.txt

@@ -216,7 +216,7 @@ import theano and print the config variable, as in:
    Positive int value, default: 200000.
 
    This specifies the vectors minimum size for which elemwise ops
-   use openmp, if openmp is enable.
+   use openmp, if openmp is enabled.
 
 .. attribute:: cast_policy
 

doc/tutorial/multi_cores.txt

@@ -17,8 +17,8 @@ those operations will run in parallel in Theano.
 
 The most frequent way to control the number of threads used is via the
 ``OMP_NUM_THREADS`` environment variable. Set it to the number of
-threads you want to use before starting the python process. Some BLAS
-implementations support other enviroment variables.
+threads you want to use before starting the Python process. Some BLAS
+implementations support other environment variables.
 
 
 Parallel element wise ops with OpenMP
@@ -35,9 +35,9 @@ tensor size for which the operation is parallelized because for short
 tensors using OpenMP can slow down the operation. The default value is
 ``200000``.
 
-For simple(fast) operation you can obtain a speed up with very large
-tensors while for more complex operation you can obtain a good speed
-up also for smaller tensor.
+For simple (fast) operations you can obtain a speed-up with very large
+tensors while for more complex operations you can obtain a good speed-up
+also for smaller tensors.
 
 There is a script ``elemwise_openmp_speedup.py`` in ``theano/misc/``
 which you can use to tune the value of ``openmp_elemwise_minsize`` for
@@ -47,4 +47,4 @@ without OpenMP and shows the time difference between the cases.
 
 The only way to control the number of threads used is via the
 ``OMP_NUM_THREADS`` environment variable. Set it to the number of threads
-you want to use before starting the python process.
+you want to use before starting the Python process.

theano/compile/ops.py

-"""This file contain auxiliary Ops, used during the compilation phase
+"""This file contains auxiliary Ops, used during the compilation phase
 and Ops building class (:class:`FromFunctionOp`) and decorator
 (:func:`as_op`) that help make new Ops more rapidly.
 
@@ -374,7 +374,7 @@ class FromFunctionOp(gof.Op):
     Build a basic Theano Op around a function.
 
     Since the resulting Op is very basic and is missing most of the
-    optional functionality, some optimization may not apply.  If you
+    optional functionalities, some optimizations may not apply.  If you
     want to help, you can supply an infer_shape function that computes
     the shapes of the output given the shapes of the inputs.
 

theano/configdefaults.py

@@ -417,8 +417,8 @@ AddConfigVar('compute_test_value_opt',
              in_c_key=False)
 
 AddConfigVar('unpickle_function',
-             ("Replace unpickled Theano function with None",
-              "This is useful to unpickle old graph that pickled"
+             ("Replace unpickled Theano functions with None. "
+              "This is useful to unpickle old graphs that pickled"
               " them when it shouldn't"),
              BoolParam(True),
              in_c_key=False)
@@ -483,9 +483,9 @@ AddConfigVar('openmp',
          )
 
 AddConfigVar('openmp_elemwise_minsize',
-             "If OpenMP is enable, this is the minimum size of vector "
-             "for which  the openmp parallel for is enable."
-             "Used in element wise ops",
+             "If OpenMP is enabled, this is the minimum size of vectors "
+             "for which the openmp parallelization is enabled "
+             "in element wise ops.",
              IntParam(200000),
              in_c_key=False,
          )

theano/gof/cmodule.py

@@ -1808,7 +1808,7 @@ class GCC_compiler(object):
                 # Python3 compatibility: try to cast Py3 strings as Py2 strings
                 try:
                     src_code = b(src_code)
-                except:
+                except Exception:
                     pass
                 os.write(fd, src_code)
                 os.close(fd)

theano/misc/elemwise_openmp_speedup.py

@@ -9,7 +9,7 @@ parser = OptionParser(usage='%prog <options>\n Compute time for'
                       ' fast and slow elemwise operations')
 parser.add_option('-N', '--N', action='store', dest='N',
                   default=theano.config.openmp_elemwise_minsize, type="int",
-                  help="Number of vector element")
+                  help="Number of vector elements")
 
 
 def runScript(N):

theano/misc/elemwise_time_test.py

@@ -11,7 +11,7 @@ parser = OptionParser(usage='%prog <options>\n Compute time for'
                       ' fast and slow elemwise operations')
 parser.add_option('-N', '--N', action='store', dest='N',
                   default=theano.config.openmp_elemwise_minsize, type="int",
-                  help="Number of vector element")
+                  help="Number of vector elements")
 parser.add_option('--script', action='store_true', dest='script',
                   default=False,
                   help="Run program as script and print results on stdoutput")

theano/scalar/basic.py

@@ -71,9 +71,9 @@ def upcast(dtype, *dtypes):
 
 def get_scalar_type(dtype):
     """
-    Return an Scalar(dtype) object.
+    Return a Scalar(dtype) object.
 
-    This cache objects to save allocation and run time.
+    This caches objects to save allocation and run time.
     """
     if dtype not in get_scalar_type.cache:
         get_scalar_type.cache[dtype] = Scalar(dtype=dtype)