Update Gluon example folder (#12951)

* Reorganized the Gluon folder in example * trigger CI * update reference * fix out of place accumulation
apache · Nov 6, 2018 · c169b14 · c169b14
1 parent 94676b0
commit c169b14
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 75 deletions.
diff --git a/docs/tutorials/unsupervised_learning/gan.md b/docs/tutorials/unsupervised_learning/gan.md
@@ -394,7 +394,7 @@ As a result, we have created two neural nets: a Generator, which is able to crea
 Along the way, we have learned how to do the image manipulation and visualization that is associated with the training of deep neural nets. We have also learned how to use MXNet's Module APIs to perform advanced model training functionality to fit the model.
 
 ## Acknowledgements
-This tutorial is based on [MXNet DCGAN codebase](https://github.com/apache/incubator-mxnet/blob/master/example/gluon/dcgan.py),
+This tutorial is based on [MXNet DCGAN codebase](https://github.com/apache/incubator-mxnet/blob/master/example/gluon/dc_gan/dcgan.py),
 [The original paper on GANs](https://arxiv.org/abs/1406.2661), as well as [this paper on deep convolutional GANs](https://arxiv.org/abs/1511.06434).
 
 <!-- INSERT SOURCE DOWNLOAD BUTTONS -->
diff --git a/example/gluon/actor_critic.py → example/gluon/actor_critic/actor_critic.py b/example/gluon/actor_critic.py → example/gluon/actor_critic/actor_critic.py
diff --git a/example/gluon/DCGAN/README.md → example/gluon/dc_gan/README.md b/example/gluon/DCGAN/README.md → example/gluon/dc_gan/README.md
diff --git a/example/gluon/DCGAN/__init__.py → example/gluon/dc_gan/__init__.py b/example/gluon/DCGAN/__init__.py → example/gluon/dc_gan/__init__.py
diff --git a/example/gluon/DCGAN/dcgan.py → example/gluon/dc_gan/dcgan.py b/example/gluon/DCGAN/dcgan.py → example/gluon/dc_gan/dcgan.py
diff --git a/example/gluon/DCGAN/inception_score.py → example/gluon/dc_gan/inception_score.py b/example/gluon/DCGAN/inception_score.py → example/gluon/dc_gan/inception_score.py
diff --git a/...e/gluon/kaggle_k_fold_cross_validation.py → ..._prices/kaggle_k_fold_cross_validation.py b/...e/gluon/kaggle_k_fold_cross_validation.py → ..._prices/kaggle_k_fold_cross_validation.py
diff --git a/example/gluon/learning_rate_manipulation.py b/example/gluon/learning_rate_manipulation.py
diff --git a/example/gluon/lstm_crf.py → example/gluon/lstm_crf/lstm_crf.py b/example/gluon/lstm_crf.py → example/gluon/lstm_crf/lstm_crf.py
@@ -21,8 +21,8 @@
 import mxnet.optimizer as optim
 import sys
 
-# This example demonstrates how LSTM-CRF model can be implemented in Gluon to perform
-# noun-phrase chunking as a sequence labeling task.
+# This example demonstrates how the LSTM-CRF model can be implemented 
+# in Gluon to perform noun-phrase chunking as a sequence labeling task.
 
 mx.random.seed(1)
 
@@ -208,7 +208,9 @@ def forward(self, sentence):  # dont confuse this with _forward_alg above.
 
 # Make sure prepare_sequence from earlier in the LSTM section is loaded
 for epoch in range(300):  # again, normally you would NOT do 300 epochs, it is toy data
-    for sentence, tags in training_data:
+
+    neg_log_likelihood_acc = 0.
+    for i, (sentence, tags) in enumerate(training_data):
         # Step 1. Get our inputs ready for the network, that is,
         # turn them into Variables of word indices.
         # Remember to use autograd to record the calculation.
@@ -223,6 +225,8 @@ def forward(self, sentence):  # dont confuse this with _forward_alg above.
             # calling optimizer.step()
             neg_log_likelihood.backward()
         optimizer.step(1)
+        neg_log_likelihood_acc += neg_log_likelihood.mean()
+    print("Epoch [{}], Negative Log Likelihood {:.4f}".format(epoch, neg_log_likelihood_acc.asscalar()/(i+1)))
 
 # Check predictions after training
 precheck_sent = prepare_sequence(training_data[0][0], word2idx)

diff --git a/example/gluon/mnist.py → example/gluon/mnist/mnist.py b/example/gluon/mnist.py → example/gluon/mnist/mnist.py
diff --git a/example/gluon/sn_gan/data.py b/example/gluon/sn_gan/data.py
@@ -17,7 +17,7 @@
 
 # This example is inspired by https://github.com/jason71995/Keras-GAN-Library,
 # https://github.com/kazizzad/DCGAN-Gluon-MxNet/blob/master/MxnetDCGAN.ipynb
-# https://github.com/apache/incubator-mxnet/blob/master/example/gluon/DCGAN/dcgan.py
+# https://github.com/apache/incubator-mxnet/blob/master/example/gluon/dc_gan/dcgan.py
 
 import numpy as np
 

diff --git a/example/gluon/sn_gan/model.py b/example/gluon/sn_gan/model.py
@@ -17,7 +17,7 @@
 
 # This example is inspired by https://github.com/jason71995/Keras-GAN-Library,
 # https://github.com/kazizzad/DCGAN-Gluon-MxNet/blob/master/MxnetDCGAN.ipynb
-# https://github.com/apache/incubator-mxnet/blob/master/example/gluon/DCGAN/dcgan.py
+# https://github.com/apache/incubator-mxnet/blob/master/example/gluon/dc_gan/dcgan.py
 
 import mxnet as mx
 from mxnet import nd

diff --git a/example/gluon/sn_gan/train.py b/example/gluon/sn_gan/train.py
@@ -17,7 +17,7 @@
 
 # This example is inspired by https://github.com/jason71995/Keras-GAN-Library,
 # https://github.com/kazizzad/DCGAN-Gluon-MxNet/blob/master/MxnetDCGAN.ipynb
-# https://github.com/apache/incubator-mxnet/blob/master/example/gluon/DCGAN/dcgan.py
+# https://github.com/apache/incubator-mxnet/blob/master/example/gluon/dc_gan/dcgan.py
 
 
 import os

diff --git a/example/gluon/sn_gan/utils.py b/example/gluon/sn_gan/utils.py
@@ -17,7 +17,7 @@
 
 # This example is inspired by https://github.com/jason71995/Keras-GAN-Library,
 # https://github.com/kazizzad/DCGAN-Gluon-MxNet/blob/master/MxnetDCGAN.ipynb
-# https://github.com/apache/incubator-mxnet/blob/master/example/gluon/DCGAN/dcgan.py
+# https://github.com/apache/incubator-mxnet/blob/master/example/gluon/dc_gan/dcgan.py
 
 import math
 

diff --git a/example/gluon/super_resolution.py → ...luon/super_resolution/super_resolution.py b/example/gluon/super_resolution.py → ...luon/super_resolution/super_resolution.py
diff --git a/example/notebooks/README.md b/example/notebooks/README.md