Merge from dogfood branch to master

8314d6ee · Deshui Yu · fishyds · 98530fd2 · 8314d6ee · 8314d6ee
Commit 8314d6ee authored Sep 07, 2018 by Deshui Yu Committed by fishyds Sep 07, 2018
20 changed files
--- a/test/naive/run.py
+++ b/test/naive/run.py
--- a/tools/nni_annotation/README.md
+++ b/tools/nni_annotation/README.md
--- a/tools/nni_annotation/__init__.py
+++ b/tools/nni_annotation/__init__.py
--- a/tools/nni_annotation/code_generator.py
+++ b/tools/nni_annotation/code_generator.py
--- a/tools/nni_annotation/examples/mnist_generated.py
+++ b/tools/nni_annotation/examples/mnist_generated.py
--- a/tools/nni_annotation/examples/mnist_with_annotation.json
+++ b/tools/nni_annotation/examples/mnist_with_annotation.json
--- a/tools/nni_annotation/examples/mnist_with_annotation.py
+++ b/tools/nni_annotation/examples/mnist_with_annotation.py
--- a/tools/nni_annotation/examples/mnist_without_annotation.json
+++ b/tools/nni_annotation/examples/mnist_without_annotation.json
--- a/tools/nni_annotation/examples/mnist_without_annotation.py
+++ b/tools/nni_annotation/examples/mnist_without_annotation.py
--- a/tools/nni_annotation/search_space_generator.py
+++ b/tools/nni_annotation/search_space_generator.py
--- a/tools/nni_annotation/test_annotation.py
+++ b/tools/nni_annotation/test_annotation.py
--- a/tools/nni_annotation/testcase/annotated/dir/simple.py
+++ b/tools/nni_annotation/testcase/annotated/dir/simple.py
--- a/tools/nni_annotation/testcase/annotated/handwrite.py
+++ b/tools/nni_annotation/testcase/annotated/handwrite.py
+h_conv1 = 1
+conv_size = nni.choice(2, 3, 5, 7, name='conv_size')
+h_pool1 = nni.function_choice(lambda : max_pool(h_conv1),
+    lambda : h_conv1,
+    lambda : avg_pool
+    (h_conv2, h_conv3)
+)
+tmp = nni.qlognormal(1.2, 3, 4.5)
+test_acc = 1
+nni.report_intermediate_result(test_acc)
+test_acc = 2
+nni.report_final_result(test_acc)
+nni.choice(foo, bar)(1)
--- a/tools/nni_annotation/testcase/annotated/mnist.py
+++ b/tools/nni_annotation/testcase/annotated/mnist.py
--- a/tools/nni_annotation/testcase/searchspace.json
+++ b/tools/nni_annotation/testcase/searchspace.json
--- a/tools/nni_annotation/testcase/usercode/dir/simple.py
+++ b/tools/nni_annotation/testcase/usercode/dir/simple.py
--- a/tools/nni_annotation/testcase/usercode/mnist.py
+++ b/tools/nni_annotation/testcase/usercode/mnist.py
--- a/tools/nni_annotation/testcase/usercode/nonpy.txt
+++ b/tools/nni_annotation/testcase/usercode/nonpy.txt
--- a/tools/nnicmd/config_utils.py
+++ b/tools/nnicmd/config_utils.py
--- a/tools/nnicmd/launcher.py
+++ b/tools/nnicmd/launcher.py