v1.2.0 release bump.

ChangeLog

@@ -1,5 +1,19 @@
 # ChangeLog
 
+## v1.2.0 (2016-01-29):
+
+### Modifications
+
+* kepler GPU kernel support [#80]
+* new dataloader format, updated docs [#115, #170]
+* new serialization format
+* FastRCNN implementation, ROI pooling support [#135]
+* deep residual nets implementation and example
+* expanded model zoo
+* Ticker dataset and copy, repeat copy tasks
+* autodiff transport support [#173]
+* numerous bug fixes and documentation updates.
+
 ## v1.1.5 (2016-01-13):
 
 ### Modifications

examples/mnist_branch.py

@@ -45,7 +45,7 @@
 from neon.layers import GeneralizedCost, Affine, BranchNode, Multicost, Tree
 from neon.models import Model
 from neon.optimizers import GradientDescentMomentum
-from neon.transforms import Rectlin, Logistic, Misclassification, Softmax
+from neon.transforms import Rectlin, Logistic, Softmax
 from neon.transforms import CrossEntropyBinary, CrossEntropyMulti
 from neon.util.argparser import NeonArgparser
 
@@ -111,7 +111,7 @@
 # run fit
 mlp.fit(train_set, optimizer=optimizer, num_epochs=args.epochs, cost=cost, callbacks=callbacks)
 
-# TODO: introduce Multicost metric support.  The line below currently failes
+# TODO: introduce Multicost metric support.  The line below currently fails
 # since the Misclassification metric expects a single Tensor not a list of
 # Tensors
 # print('Misclassification error = %.1f%%' % (mlp.eval(valid_set, metric=Misclassification())*100))

setup.py

@@ -19,7 +19,7 @@
 import subprocess
 
 # Define version information
-VERSION = '1.1.5'
+VERSION = '1.2.0'
 FULLVERSION = VERSION
 write_version = True