Merge pull request #1052 from apache/dev

Dev

NOTICE

@@ -5,3 +5,28 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 Codebase originally donated by National University of Singapore.
+
+The following images or media files were contributed by 
+developers of Apache SINGA under Apache License, Version 2.0.
+
+./CITATION.cff
+./doc/_static/apache.png
+./doc/_static/awsmp.gif
+./doc/_static/docker.png
+./doc/_static/github.png
+./doc/_static/jupyter.png
+./doc/_static/singa-logo-updated.ai
+./doc/_static/singa-logo-v3.ai
+./doc/_static/singa-logo-v3.png
+./doc/_static/singa.png
+./doc/_static/images/benchmark.png
+./doc/_static/images/imda2019_1.png
+./doc/_static/images/imda2019_2.png
+./doc/_static/images/mlp-net.png
+./doc/_static/images/model-category.png
+./doc/_static/images/overview.png
+./doc/_static/images/partition_fc.png
+./doc/_static/images/rbm-rnn.png
+./doc/_static/images/sgd.png
+./doc/_static/images/singa.png
+./doc/_static/images/singav1-sw.png

examples/cifar_distributed_cnn/run-rtx.sh

@@ -29,10 +29,12 @@ mpiexec -np 8 python train_mpi.py cnn mnist -l 0.015 -b 32
 mpiexec -np 8 python train_mpi.py cnn cifar10 -l 0.015 -b 32
 mpiexec -np 8 python train_mpi.py cnn cifar100 -l 0.015 -b 32
 
-# mlp 
+# mlp
+mpiexec -np 8 python train_mpi.py mlp mnist -l 0.015 -b 32
 mpiexec -np 8 python train_mpi.py mlp cifar10 -l 0.015 -b 32
 mpiexec -np 8 python train_mpi.py mlp cifar100 -l 0.015 -b 32
 
 # alexnet 
+mpiexec -np 8 python train_mpi.py alexnet mnist -l 0.015 -b 32
 mpiexec -np 8 python train_mpi.py alexnet cifar10 -l 0.015 -b 32
 mpiexec -np 8 python train_mpi.py alexnet cifar100 -l 0.015 -b 32

setup.py

@@ -83,7 +83,7 @@
 from datetime import date
 
 # stable version
-VERSION = '3.3.0'
+VERSION = '4.0.0'
 # get the git hash
 # git_hash = subprocess.check_output(["git", "describe"]).strip().split('-')[-1][1:]
 # comment the next line to build wheel for stable version

tool/conda/singa/meta.yaml

@@ -20,7 +20,7 @@
 # https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#templating-with-jinja
 # {% set data = load_setup_py_data(setup_file='../../../python/singa/setup.py', from_recipe_dir=True) %}
 
-{% set version = "3.3.0" %}
+{% set version = "4.0.0" %}
 
 package:
   name: singa