Fix warnings in doc generation

lamblin · notoraptor · commit ef57f6bda7ab · 2017-12-14T11:52:46.000-05:00
diff --git a/doc/cnn_1D_segm.txt b/doc/cnn_1D_segm.txt
@@ -28,7 +28,8 @@ The `BigBrain <https://bigbrain.loris.ca/main.php>`__ dataset is a 3D ultra-high
 We are interested in the outer part of the brain, the cortex.
 More precisely, we are interested in segmenting the 6 different layers of the cortex in 3D.
 Creating an expertly labelled training dataset with each 2D section (shown in figure 1) is unfeasible. Instead of giving as input a 2D image of one section of the brain, we give as input 1D vectors with information from across the cortex, extracted from smaller portions of manually labelled cortex
-as shown in Figure 2. The actual dataset can be found `here TODO: link the dataset <>`_ .
+as shown in Figure 2. The final dataset is not available yet, a preliminary version
+is available `here <http://www.iro.umontreal.ca/~lisa/deep/data/TODO>`_ .
 
 .. figure:: images/big_brain_section.png
     :align: center
diff --git a/doc/conf.py b/doc/conf.py
@@ -25,11 +25,14 @@
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo']
 
 try:
-    from sphinx.ext import pngmath
-    extensions.append('sphinx.ext.pngmath')
+    from sphinx.ext import imgmath
+    extensions.append('sphinx.ext.imgmath')
 except ImportError:
-    print >>sys.stderr, 'Warning: could not import sphinx.ext.pngmath'
-    pass
+    try:
+        from sphinx.ext import pngmath
+        extensions.append('sphinx.ext.pngmath')
+    except ImportError:
+        pass
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['.templates']
@@ -155,12 +158,16 @@
 
 # Options for LaTeX output
 # ------------------------
+latex_elements = {
+    # The paper size ('letter' or 'a4').
+    #latex_paper_size = 'letter',
 
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
+    # The font size ('10pt', '11pt' or '12pt').
+    'pointsize': '11pt',
 
-# The font size ('10pt', '11pt' or '12pt').
-latex_font_size = '11pt'
+    # Additional stuff for the LaTeX preamble.
+    #latex_preamble = '',
+}
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
