Removed private members from docs + some ultraminor changes.

VladislavZavadskyy · May 21, 2018 · 5f3f807 · 5f3f807
1 parent 41de48f
commit 5f3f807
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 16 deletions.
diff --git a/docs/source/architect.rst b/docs/source/architect.rst
@@ -3,4 +3,3 @@ Architect
 
 .. automodule:: nasframe.architect
    :members:
-   :private-members:
diff --git a/docs/source/coaches.rst b/docs/source/coaches.rst
@@ -8,25 +8,21 @@ Base
 
 .. autoclass:: nasframe.coaches.CoachBase
    :members:
-   :private-members:
 
 Architect
 ^^^^^^^^^^^^^^^^^^^^^
 
 .. autoclass:: nasframe.coaches.ArchitectCoach
    :members:
-   :private-members:
 
 Feed Forward
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. autoclass:: nasframe.coaches.FeedForwardCoach
    :members:
-   :private-members:
 
 Recurrent
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. autoclass:: nasframe.coaches.RecurrentCoach
    :members:
-   :private-members:
diff --git a/docs/source/loaders.rst b/docs/source/loaders.rst
@@ -8,5 +8,4 @@ Text loader
 
 .. autoclass:: TextLoader
    :members:
-   :private-members:
 
diff --git a/docs/source/scripts.rst b/docs/source/scripts.rst
@@ -4,13 +4,11 @@ Scripts
 Reusable training functions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. automodule:: nasframe.scripts.train_generic
+.. automodule:: nasframe.scripts.generic
    :members:
-   :private-members:
 
 Jigsaw Toxic Comment dataset training
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. automodule:: nasframe.scripts.train_toxic
+.. automodule:: nasframe.scripts.toxiccomment
    :members:
-   :private-members:
diff --git a/docs/source/searchspaces.rst b/docs/source/searchspaces.rst
@@ -6,18 +6,15 @@ Base
 
 .. autoclass:: nasframe.searchspaces.SearchSpace
    :members:
-   :private-members:
 
 Multilayer Perceptron
 ^^^^^^^^^^^^^^^^^^^^^
 
 .. autoclass:: nasframe.searchspaces.MLPSpace
    :members:
-   :private-members:
 
 Recurrent Neural Network
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. autoclass:: nasframe.searchspaces.RNNSpace
    :members:
-   :private-members:
diff --git a/docs/source/storage.rst b/docs/source/storage.rst
@@ -6,11 +6,10 @@ Plain Storage
 
 .. autoclass:: nasframe.storage.Storage
    :members:
-   :private-members:
+
 
 Curriculum Storage
 ^^^^^^^^^^^^^^^^^^
 
 .. autoclass:: nasframe.storage.CurriculumStorage
    :members:
-   :private-members:
diff --git a/nasframe/scripts/cli.py b/nasframe/scripts/cli.py
@@ -62,7 +62,7 @@ def find_best(filename, config, preprocess, draw, save_to):
     if preprocess:
         description = space.preprocess(description, input_shape)
         pcount = space.parameter_count(description)
-        click.echo(f'Parameter count: {pcount[1]/1e+6:.2f} million')
+        click.echo(f'Parameter count: {pcount[1]:.3E}')
 
     make_dirs(save_to)
     with open(join(save_to, 'description.json'), 'w+') as f:

diff --git a/nasframe/scripts/generic.py b/nasframe/scripts/generic.py
@@ -772,6 +772,7 @@ def baseline_worker(device_idx, config, reward_metric, name):
                                             pin_memory=not keep_data_on_device)
 
                 space_coach = FeedForwardCoach(model, loaders,
+                                               name=name,
                                                logger=logger,
                                                log_dir=log_dir,
                                                tensorboard=summary_writer,