docs

hongzhi2015 · Jun 21, 2017 · 059aca8 · 059aca8
1 parent 233e114
commit 059aca8
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 19 deletions.
diff --git a/docs/source/autoencoder.rst b/docs/source/autoencoder.rst
@@ -0,0 +1,2 @@
+Autoencoder
+-----------
diff --git a/docs/source/ensemble_learning.rst b/docs/source/ensemble_learning.rst
@@ -0,0 +1,2 @@
+Ensemble learning
+-----------------
diff --git a/docs/source/feature_extraction.rst b/docs/source/feature_extraction.rst
@@ -0,0 +1,3 @@
+Feature extraction
+------------------
+
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -3,30 +3,37 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
+.. toctree::
+    :maxdepth: 2
+
+    statistical_classification
+    ensemble_learning
+    feature_extraction
+    transfer_learning
+    autoencoder
+
 .. module:: keras_resnet
 
-Layers
+Blocks
 ------
 
-.. autofunction:: keras_resnet.basic
-
-.. autofunction:: keras_resnet.bottleneck
+.. autofunction:: keras_resnet.blocks.basic_2d
 
-.. autofunction:: keras_resnet.shortcut
+.. autofunction:: keras_resnet.blocks.bottleneck_2d
 
 Models
 ------
 
-.. autoclass:: keras_resnet.ResNet
+.. autoclass:: keras_resnet.models.ResNet
 
-.. autoclass:: keras_resnet.ResNet18
+.. autoclass:: keras_resnet.models.ResNet18
 
-.. autoclass:: keras_resnet.ResNet34
+.. autoclass:: keras_resnet.models.ResNet34
 
-.. autoclass:: keras_resnet.ResNet50
+.. autoclass:: keras_resnet.models.ResNet50
 
-.. autoclass:: keras_resnet.ResNet101
+.. autoclass:: keras_resnet.models.ResNet101
 
-.. autoclass:: keras_resnet.ResNet152
+.. autoclass:: keras_resnet.models.ResNet152
 
-.. autoclass:: keras_resnet.ResNet200
+.. autoclass:: keras_resnet.models.ResNet200
diff --git a/docs/source/statistical_classification.rst b/docs/source/statistical_classification.rst
@@ -0,0 +1,11 @@
+Statistical classification
+--------------------------
+
+Audio
+~~~~~
+
+Image
+~~~~~
+
+Video
+~~~~~
diff --git a/docs/source/transfer_learning.rst b/docs/source/transfer_learning.rst
@@ -0,0 +1,3 @@
+Transfer learning
+-----------------
+
diff --git a/keras_resnet/benchmarks/__init__.py b/keras_resnet/benchmarks/__init__.py
@@ -75,8 +75,6 @@ def __main__(benchmark, device, name):
     training_x, validation_x, training_y, validation_y = sklearn.model_selection.train_test_split(training_x, training_y)
 
     generator = keras.preprocessing.image.ImageDataGenerator(
-        featurewise_center=True,
-        featurewise_std_normalization=True,
         horizontal_flip=True
     )
 
@@ -88,10 +86,7 @@ def __main__(benchmark, device, name):
         batch_size=256
     )
 
-    validation_data = keras.preprocessing.image.ImageDataGenerator(
-        featurewise_center=True,
-        featurewise_std_normalization=True
-    )
+    validation_data = keras.preprocessing.image.ImageDataGenerator()
 
     validation_data.fit(validation_x)
 
@@ -111,7 +106,7 @@ def __main__(benchmark, device, name):
 
     pathname = os.path.join("data", "checkpoints", benchmark, "{}.hdf5".format(name))
 
-    pathname = pkg_resources.resource_filename("keras_resnet.data", pathname)
+    pathname = pkg_resources.resource_filename("keras_resnet", pathname)
 
     model_checkpoint = keras.callbacks.ModelCheckpoint(pathname)