Merge pull request #1869 from nouiz/fixup

doc/library/tensor/nnet/conv.txt

@@ -27,7 +27,7 @@ TODO: Give examples for how to use these things! They are pretty complicated.
 - Conv implemented
     - :func:`signal.conv2d <theano.tensor.signal.conv.conv2d>`.
     - :func:`nnet.conv2d <theano.tensor.nnet.conv.conv2d>`.
-    - :func:`conv3D <theano.tensor.nnet.Conv3D.conv3D>`.
+    - :func:`conv3D <theano.tensor.nnet.Conv3D.conv3D>`. Doesn't work on the GPU.
     - :func:`conv3d2d <theano.tensor.nnet.conv3d2d.conv3d>`
       Another conv3d implementation that uses the conv2d with data reshaping.
       It is faster in some cases than conv3d, specifically on the GPU.

theano/gof/opt.py

@@ -1822,7 +1822,7 @@ class EquilibriumOptimizer(NavigatorOptimizer):
         loop_timing = merge_list(prof1[1], prof2[1])
 
         loop_process_count = list(prof1[2])
-        for i in range(len(loop_process_count)):
+        for i in range(min(len(loop_process_count), len(prof2[2]))):
             process_count = loop_process_count[i]
             for process, count in prof2[2][i].iteritems():
                 if process in process_count:

theano/misc/check_blas.py

@@ -223,11 +223,11 @@ if __name__ == "__main__":
         GTX 660                  0.18s  0.20s  0.23s
         GTX 560                                0.30s
         GTX 650 Ti                      0.27s
+        GTX 765M          0.27s
         GTX 460                         0.37s                0.45s
         GTX 285                  0.42s         0.452s        0.452s        0.40s # cuda 3.0 seems faster? driver version?
         750M                            0.49s
         GTX 550 Ti                                           0.57s
-        GTX 765M          1.2s
         GT 520                                 2.68s                3.06s
         520M                            2.44s                       3.19s        # with bumblebee on Ubuntu 12.04
         GT 220                                                      3.80s