Merge pull request #184 from microsoft/master

merge master

Merge pull request #184 from microsoft/master
merge master
d48ad027 · SparkSnail · GitHub · 9352cc88 · 22993e5d · d48ad027
Unverified Commit d48ad027 authored Jun 20, 2019 by SparkSnail Committed by GitHub Jun 20, 2019
20 changed files
--- a/examples/trials/network_morphism/cifar10/config.yml
+++ b/examples/trials/network_morphism/cifar10/config.yml
--- a/examples/trials/network_morphism/cifar10/config_pai.yml
+++ b/examples/trials/network_morphism/cifar10/config_pai.yml
--- a/examples/trials/sklearn/classification/main.py
+++ b/examples/trials/sklearn/classification/main.py
--- a/examples/trials/sklearn/regression/main.py
+++ b/examples/trials/sklearn/regression/main.py
--- a/examples/trials/weight_sharing/ga_squad/config_remote.yml
+++ b/examples/trials/weight_sharing/ga_squad/config_remote.yml
--- a/examples/trials/weight_sharing/ga_squad/graph_to_tf.py
+++ b/examples/trials/weight_sharing/ga_squad/graph_to_tf.py
--- a/examples/tuners/ga_customer_tuner/README.md
+++ b/examples/tuners/ga_customer_tuner/README.md
--- a/examples/tuners/weight_sharing/ga_customer_tuner/README.md
+++ b/examples/tuners/weight_sharing/ga_customer_tuner/README.md
--- a/src/nni_manager/common/restServer.ts
+++ b/src/nni_manager/common/restServer.ts
--- a/src/nni_manager/common/trainingService.ts
+++ b/src/nni_manager/common/trainingService.ts
@@ -91,6 +91,7 @@ interface TrialJobMetric {
 * define TrainingServiceError
 */
 class TrainingServiceError extends Error {
+
    private errCode: number;

    constructor(errorCode: number, errorMessage: string) {
@@ -136,5 +137,3 @@ export {
    TrainingServiceMetadata, TrialJobDetail, TrialJobMetric, HyperParameters,
    HostJobApplicationForm, JobApplicationForm, JobType, NNIManagerIpConfig
 };
-
-
--- a/src/nni_manager/common/utils.ts
+++ b/src/nni_manager/common/utils.ts
--- a/src/nni_manager/config/frameworkcontroller/frameworkcontrollerjob-crd-v1.json
+++ b/src/nni_manager/config/frameworkcontroller/frameworkcontrollerjob-crd-v1.json
--- a/src/nni_manager/config/kubeflow/pytorchjob-crd-v1alpha2.json
+++ b/src/nni_manager/config/kubeflow/pytorchjob-crd-v1alpha2.json
--- a/src/nni_manager/config/kubeflow/pytorchjob-crd-v1beta1.json
+++ b/src/nni_manager/config/kubeflow/pytorchjob-crd-v1beta1.json
--- a/src/nni_manager/config/kubeflow/tfjob-crd-v1alpha2.json
+++ b/src/nni_manager/config/kubeflow/tfjob-crd-v1alpha2.json
--- a/src/nni_manager/config/kubeflow/tfjob-crd-v1beta1.json
+++ b/src/nni_manager/config/kubeflow/tfjob-crd-v1beta1.json
--- a/src/nni_manager/core/nnimanager.ts
+++ b/src/nni_manager/core/nnimanager.ts
--- a/src/nni_manager/core/test/ipcInterface.test.ts
+++ b/src/nni_manager/core/test/ipcInterface.test.ts
--- a/src/nni_manager/core/test/mockedTrainingService.ts
+++ b/src/nni_manager/core/test/mockedTrainingService.ts
--- a/src/nni_manager/core/test/nnimanager.test.ts
+++ b/src/nni_manager/core/test/nnimanager.test.ts