Merge branch 'nouiz-doc_str'

doc/extending/cop.txt

@@ -54,7 +54,16 @@ There are less methods to define for an Op than for a Type:
 
     .. method:: c_support_code()
 
-      Allows you to specify helper functions/structs that the type needs. See :ref:`op`.
+      Allows you to specify helper functions/structs that the
+      :ref:`op` needs.  That code will be reused for each apply of
+      this op. It will be inserted at global scope.
+
+    .. method:: c_support_code_apply(node, name)
+
+      Allows you to specify helper functions/structs specialized for a
+      particular apply of an :ref:`op`. Use `c_support_code` if the
+      code is the same for each apply of an op.
+      It will be inserted at global scope.
 
     .. method:: infer_shape(node, (i0_shapes,i1_shapes,...))
 
@@ -66,6 +75,14 @@ There are less methods to define for an Op than for a Type:
       (node, ((x0,x1), (y0,y1))) and should return [(x0, y1)]. Both the
       inputs and the return value may be theano variables.
 
+    .. method:: c_code_cache_version()
+
+       Should return a tuple of hashable objects like integers. This
+       specifies the version of the code. It is used to cache the
+       compiled code. You MUST change the returned tuple for each
+       change in the code. If you don't want to cache the compiled code
+       return an empty tuple or don't implement it.
+
 The ``name`` argument is currently given an invalid value, so steer
 away from it. As was the case with Type, ``sub['fail']`` provides
 failure code that you *must* use if you want to raise an exception,

doc/extending/ctype.txt

@@ -78,15 +78,35 @@ the most important ones:
         When we are done using the data, clean up whatever we allocated and
         decrease the appropriate reference counts.
 
+    .. method:: c_headers()
+                c_libraries()
+                c_header_dirs()
+                c_lib_dirs()
+
+        Allows you to specify headers, libraries and associated directories.
+
     .. method:: c_compile_args()
                 c_no_compile_args()
-                  c_headers()
-                  c_libraries()
-                  c_support_code()
 
-        Allows you to specify headers, libraries, 
-        special g++ arguments to add/exclude or
-        helper functions/structs that the type needs. See :ref:`type`.
+        Allows to specify special compiler arguments to add/exclude.
+
+    .. method:: c_support_code()
+
+        Allows to add helper functions/structs that the :ref:`type` needs.
+
+    .. method:: c_compiler()
+
+        Allows to specify a special compiler. This will force this compiler
+        for the current compilation block (a particular op or the full graph).
+        This is used for the GPU code.
+
+    .. method:: c_code_cache_version()
+
+       Should return a tuple of hashable objects like integers. This
+       specifies the version of the code. It is used to cache the
+       compiled code. You MUST change the returned tuple for each
+       change in the code. If you don't want to cache the compiled code
+       return an empty tuple or don't implement it.
 
 
 Each of these functions take two arguments, ``name`` and ``sub`` which