Merge remote-tracking branch 'origin/super-dev' into super-dev

CONTRIBUTING.rst

@@ -111,3 +111,29 @@ Tips
 To run a subset of tests::
 
     $ python -m unittest tests.test_inferno
+
+
+
+Sphinx Apidoc
+--------------
+before building the documentation
+one needs to generate the auto-generated
+sphinxs api documentation.
+These files need to be in the github repository.
+
+.. code:: bash
+  
+    cd docs
+    sphinx-apidoc -o inferno-apidoc ../inferno
+
+.. warning::
+
+    Do not make changes to `inferno/docs/inferno-apidoc` This folder is auto-generated
+    by the above mentioned command.
+
+The following combines all the commands necessary to build the html documentation:
+
+.. code:: bash
+  
+    ./build_docs.sh
+

HISTORY.rst

@@ -45,3 +45,9 @@ History
 ------------------
 
 * setup.py critical bugix in install procedure
+
+
+
+CURRENT CHANGES
+-----------------
+* Flexible Unet

README.rst

@@ -8,18 +8,13 @@ Inferno
 .. image:: https://img.shields.io/pypi/v/inferno.svg
         :target: https://pypi.python.org/pypi/inferno-pytorch
 
-.. image:: https://img.shields.io/travis/infern-pytorch/inferno.svg
+.. image:: https://travis-ci.org/inferno-pytorch/inferno.svg?branch=master
         :target: https://travis-ci.org/inferno-pytorch/inferno
 
 .. image:: https://readthedocs.org/projects/inferno-pytorch/badge/?version=latest
         :target: http://inferno-pytorch.readthedocs.io/en/latest/?badge=latest
         :alt: Documentation Status
 
-.. image:: https://pyup.io/repos/github/inferno-pytorch/inferno/shield.svg
-     :target: https://pyup.io/repos/github/inferno-pytorch/inferno/
-     :alt: Updates
-
-
 
 .. image:: http://svgshare.com/i/2j7.svg
 
@@ -34,7 +29,7 @@ It's a work-in-progress, but the first stable release (0.2) is underway!
 
 
 * Free software: Apache Software License 2.0
-* Documentation: https://pytorch-inferno.readthedocs.io (Work in progress).
+* Documentation: http://inferno-pytorch.readthedocs.io (Work in Progress).
 
 
 Features
@@ -53,7 +48,7 @@ Current features include:
   *   `various utility layers <https://github.com/nasimrahaman/inferno/tree/master/inferno/extensions/layers>`_ with more underway,
   *   `a submodule <https://github.com/nasimrahaman/inferno/blob/master/inferno/io/volumetric>`_ for volumetric datasets, and more!
 
-
+  
 
 
 
@@ -131,11 +126,11 @@ and navigate to `localhost:6007` with your browser.
 Installation
 ------------------------
 
-Conda packages for linux and mac (only python 3) are available via
+Conda packages for linux (only python 3) are available via
 
 .. code:: bash
 
-  $ conda install -c inferno-pytorch inferno
+  $ conda install -c pytorch -c conda-forge inferno
 
 
 
@@ -152,10 +147,9 @@ Planned features include:
 Credits
 ---------
 All contributors are listed here_. 
+.. _here: https://inferno-pytorch.github.io/inferno/html/authors.html
 
-.. _here: https://pytorch-inferno.readthedocs.io/en/latest/authors.html
-
-This packag was partially generated with Cookiecutter_ and the `audreyr/cookiecutter-pypackage`_ project template + lots of work by Thorsten. 
+This package was partially generated with Cookiecutter_ and the `audreyr/cookiecutter-pypackage`_ project template + lots of work by Thorsten. 
 
 .. _Cookiecutter: https://github.com/audreyr/cookiecutter
 .. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage

build_docs.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+cd docs
+rm -r -f inferno-apidoc
+sphinx-apidoc -o inferno-apidoc ../inferno
+make html
+cd ..

conda-recipe/meta.yaml

@@ -27,10 +27,13 @@ requirements:
         - pyyaml
         - scipy
         - scikit-image
+        - scikit-learn
         - h5py
         - dill
         - networkx 1.11
         - tensorboardx
+        - sphinx_rtd_theme
+
 
 test:
     imports:

docs/conf.py

@@ -62,6 +62,9 @@ def __getattr__(cls, name):
 
 import inferno
 import inferno.extensions
+import inferno.extensions.layers
+from inferno.extensions.layers import *
+from inferno.extensions.layers.reshape import *
 
 # -- General configuration ---------------------------------------------
 
@@ -81,7 +84,8 @@ def __getattr__(cls, name):
     'sphinx.ext.graphviz',
     'sphinx_gallery.gen_gallery',
     'sphinxcontrib.bibtex',
-    'sphinx.ext.napoleon'
+    'sphinx.ext.napoleon',
+    'sphinxcontrib.inlinesyntaxhighlight'
 ]
 
 
@@ -98,7 +102,7 @@ def __getattr__(cls, name):
     'scan_used_functions':
         True,
     'doc_module' :
-        ('inferno'),
+        ('inferno','inferno.extensions','inferno.extensions.layers','inferno.extensions.layers.convolutional'),
 
     'docs_resolv': True,
 
@@ -148,7 +152,7 @@ def __getattr__(cls, name):
 
 # General information about the project.
 project = u'inferno'
-copyright = u"2017, Nasim Rahaman"
+copyright = u"2018, f"
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
@@ -203,7 +207,7 @@ def __getattr__(cls, name):
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a
 # theme further.  For a list of options available for each theme, see the
@@ -302,7 +306,7 @@ def __getattr__(cls, name):
 latex_documents = [
     ('index', 'inferno.tex',
      u'inferno Documentation',
-     u'Nasim Rahaman', 'manual'),
+     u'Inferno Team', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at
@@ -333,7 +337,7 @@ def __getattr__(cls, name):
 man_pages = [
     ('index', 'inferno',
      u'inferno Documentation',
-     [u'Nasim Rahaman'], 1)
+     [u'Inferno Team'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -348,7 +352,7 @@ def __getattr__(cls, name):
 texinfo_documents = [
     ('index', 'inferno',
      u'inferno Documentation',
-     u'Nasim Rahaman',
+     u'Inferno Team',
      'inferno',
      'One line description of project.',
      'Miscellaneous'),

docs/environment.yml

@@ -18,4 +18,4 @@ dependencies:
      - sphinx-gallery
      - sphinxcontrib-napoleon
      - sphinxcontrib-bibtex
-
+     - sphinxcontrib-inlinesyntaxhighlight

docs/index.rst

@@ -4,13 +4,12 @@ Welcome to inferno's documentation!
 Contents:
 
 .. toctree::
-   :maxdepth: 4
+   :maxdepth: 1
 
    readme
    installation
    usage
    examples
-   modules
    contributing
    inferno-apidoc/modules
    authors

docs/inferno-apidoc/inferno.extensions.containers.rst

@@ -1,19 +1,19 @@
-inferno\.extensions\.containers package
-=======================================
+inferno.extensions.containers package
+=====================================
 
 Submodules
 ----------
 
-inferno\.extensions\.containers\.graph module
----------------------------------------------
+inferno.extensions.containers.graph module
+------------------------------------------
 
 .. automodule:: inferno.extensions.containers.graph
     :members:
     :undoc-members:
     :show-inheritance:
 
-inferno\.extensions\.containers\.sequential module
---------------------------------------------------
+inferno.extensions.containers.sequential module
+-----------------------------------------------
 
 .. automodule:: inferno.extensions.containers.sequential
     :members:

docs/inferno-apidoc/inferno.extensions.criteria.rst

@@ -1,19 +1,35 @@
-inferno\.extensions\.criteria package
-=====================================
+inferno.extensions.criteria package
+===================================
 
 Submodules
 ----------
 
-inferno\.extensions\.criteria\.core module
-------------------------------------------
+inferno.extensions.criteria.core module
+---------------------------------------
 
 .. automodule:: inferno.extensions.criteria.core
     :members:
     :undoc-members:
     :show-inheritance:
 
-inferno\.extensions\.criteria\.set\_similarity\_measures module
----------------------------------------------------------------
+inferno.extensions.criteria.elementwise\_measures module
+--------------------------------------------------------
+
+.. automodule:: inferno.extensions.criteria.elementwise_measures
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+inferno.extensions.criteria.regularized module
+----------------------------------------------
+
+.. automodule:: inferno.extensions.criteria.regularized
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+inferno.extensions.criteria.set\_similarity\_measures module
+------------------------------------------------------------
 
 .. automodule:: inferno.extensions.criteria.set_similarity_measures
     :members:

docs/inferno-apidoc/inferno.extensions.initializers.rst

@@ -1,19 +1,19 @@
-inferno\.extensions\.initializers package
-=========================================
+inferno.extensions.initializers package
+=======================================
 
 Submodules
 ----------
 
-inferno\.extensions\.initializers\.base module
-----------------------------------------------
+inferno.extensions.initializers.base module
+-------------------------------------------
 
 .. automodule:: inferno.extensions.initializers.base
     :members:
     :undoc-members:
     :show-inheritance:
 
-inferno\.extensions\.initializers\.presets module
--------------------------------------------------
+inferno.extensions.initializers.presets module
+----------------------------------------------
 
 .. automodule:: inferno.extensions.initializers.presets
     :members: