pull code

docs/en_US/NAS/Advanced.md

@@ -94,7 +94,7 @@ For advanced usages, e.g., users want to manipulate the way modules in `LayerCho
 
 ## Implemented a Distributed NAS Tuner
 
-Before learning how to write a one-shot NAS tuner, users should first learn how to write a general tuner. read [Customize Tuner](../Tuner/CustomizeTuner.md) for tutorials.
+Before learning how to write a distributed NAS tuner, users should first learn how to write a general tuner. read [Customize Tuner](../Tuner/CustomizeTuner.md) for tutorials.
 
 When users call "[nnictl ss_gen](../Tutorial/Nnictl.md)" to generate search space file, a search space file like this will be generated:
 
@@ -129,4 +129,4 @@ This is the exact search space tuners will receive in `update_search_space`. It'
 }
 ```
 
-Send it through `generate_parameters`, and the tuner would look like any HPO tuner. Refer to [SPOS](./SPOS.md) example code for an example.
+Send it through `generate_parameters`, and the tuner would look like any HPO tuner. Refer to [SPOS](./SPOS.md) example code for an example.

src/nni_manager/package.json

@@ -65,7 +65,8 @@
     "node.extend": "^1.1.7",
     "hoek": "^4.2.1",
     "js-yaml": "^3.13.1",
-    "npm": "^6.13.4"
+    "npm": "^6.13.4",
+    "acorn": ">=7.1.1"
   },
   "engines": {
     "node": ">=10.0.0"

src/nni_manager/yarn.lock

@@ -380,9 +380,10 @@ acorn-jsx@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
 
-acorn@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
+acorn@>=7.1.1, acorn@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
+  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
 
 agent-base@4, agent-base@^4.3.0:
   version "4.3.0"

src/sdk/pynni/nni/platform/local.py

@@ -63,9 +63,8 @@ def get_next_parameter():
 
 def send_metric(string):
     if _nni_platform != 'local':
-        data = (string).encode('utf8')
-        assert len(data) < 1000000, 'Metric too long'
-        print('NNISDK_ME%s' % (data), flush=True)
+        assert len(string) < 1000000, 'Metric too long'
+        print("NNISDK_MEb'%s'" % (string), flush=True)
     else:
         data = (string + '\n').encode('utf8')
         assert len(data) < 1000000, 'Metric too long'

src/sdk/pynni/nni/trial.py

@@ -125,8 +125,9 @@ def report_final_result(metric):
 
     Parameters
     ----------
-    metric:
-        serializable object.
+    metric: serializable object
+        Usually (for built-in tuners to work), it should be a number, or
+        a dict with key "default" (a number), and any other extra keys.
     """
     assert _params or trial_env_vars.NNI_PLATFORM is None, \
         'nni.get_next_parameter() needs to be called before report_final_result'