Merge pull request #1200 from delallea/minor

doc/install.txt

@@ -105,7 +105,7 @@ Brian Vandenberg emailed `installation instructions on Gentoo
 <http://groups.google.com/d/msg/theano-dev/-8WCMn2FMR0/bJPasoZXaqoJ>`_,
 focusing on how to install the appropriate dependencies.
 
-Nicolas Pinto provide `ebuild scripts <https://github.com/npinto/sekyfsr-gentoo-overlay/tree/master/sci-libs/Theano>`_.
+Nicolas Pinto provides `ebuild scripts <https://github.com/npinto/sekyfsr-gentoo-overlay/tree/master/sci-libs/Theano>`_.
 
 Alternative installation on Mandriva 2010.2
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -657,9 +657,9 @@ Theano dependencies is easy, but be aware that it will take a long time
 Homebrew
 ~~~~~~~~
 
-There is some :ref:`instruction
-<https://github.com/samueljohn/homebrew-python>` on how to install
-Theano dependencies with Homebrew instead of MacPort by Samuel John.
+There are some :ref:`instructions
+<https://github.com/samueljohn/homebrew-python>` by Samuel John on how to install
+Theano dependencies with Homebrew instead of MacPort.
 
 
 .. _gpu_macos:

doc/tutorial/using_gpu.txt

@@ -284,13 +284,13 @@ Tips for Improving Performance on GPU
   Check the line similar to *Spent Xs(X%) in cpu op, Xs(X%) in gpu op and Xs(X%) in transfer op*.
   This can tell you if not enough of your graph is on the GPU or if there
   is too much memory transfer.
-* Use nvcc options. nvcc support those options to speed up some
+* Use nvcc options. nvcc supports those options to speed up some
   computations: `-ftz=true` to `flush denormals values to
   zeros. <https://developer.nvidia.com/content/cuda-pro-tip-flush-denormals-confidence>`_,
-  `--prec-div=false` and `--prec-sqrt=false` option to speed up
+  `--prec-div=false` and `--prec-sqrt=false` options to speed up
   division and square root operation by being less precise. You can
-  enable all of them with with the `nvcc.flags=--use_fast_math` Theano
-  flags or you can enable them individually as in this example
+  enable all of them with the `nvcc.flags=--use_fast_math` Theano
+  flag or you can enable them individually as in this example:
   `nvcc.flags=-ftz=true --prec-div=false`.
 
 .. _gpu_async:

theano/gof/cmodule.py

@@ -892,8 +892,8 @@ class ModuleCache(object):
             key_data = None
             # We have never seen this key before.
 
-            # We acquire the lock later only if we where able to
-            # generate c code Otherwise, we would take the lock for op
+            # We acquire the lock later only if we were able to
+            # generate C code. Otherwise, we would take the lock for ops
             # that have only a perform().
             lock_taken = False
             # This try/finally block ensures that the lock is released once we
@@ -920,7 +920,7 @@ class ModuleCache(object):
                     src_code = compile_steps.next()
                     module_hash = get_module_hash(src_code, key)
 
-                    # The op have c_code, so take the lock.
+                    # The op has c_code, so take the lock.
                     compilelock.get_lock()
                     lock_taken = True
                     assert os.path.exists(location), (
@@ -1506,7 +1506,7 @@ class GCC_compiler(object):
         :returns: dynamically-imported python module of the compiled code.
         """
         #TODO: Do not do the dlimport in this function
-        
+
         if not theano.config.cxx:
             raise MissingGXX("g++ not available! We can't compile c code.")
 

theano/gof/compiledir.py

@@ -42,7 +42,7 @@ compiledir_format_dict = {"platform": platform.platform(),
                           "numpy_version": numpy.__version__,
                           "gxx_version": gcc_version_str.replace(" ", "_"),
                          }
-compiledir_format_keys = ", ".join(compiledir_format_dict.keys())
+compiledir_format_keys = ", ".join(sorted(compiledir_format_dict.keys()))
 default_compiledir_format =\
                     "compiledir_%(platform)s-%(processor)s-%(python_version)s"