Unverified Commit 54246db5 authored by QuanluZhang's avatar QuanluZhang Committed by GitHub
Browse files

Merge v0.3 2 (#352)

* Fix pypi package missing python module

* Fix pypi package missing python module

* fix bug in smartparam example (#322)

* Fix nnictl update trialnum and document (#326)

1.Fix restful server of update
2.Update nnictl document of update
3.Add tensorboard in docement

* Update the version numbers from 0.3.2 to 0.3.3

* Update examples (#331)

* update mnist-annotation

* fix mnist-annotation typo

* update mnist example

* update mnist-smartparam

* update mnist-annotation

* update mnist-smartparam

* change learning rate

* update mnist assessor maxTrialNum

* update examples

* update examples

* update maxTrialNum

* fix breaking path in config_assessor.yml

* fix bug in nnimanager (#341)
parent 1afae69b
...@@ -355,6 +355,9 @@ class NNIManager implements Manager { ...@@ -355,6 +355,9 @@ class NNIManager implements Manager {
private async requestTrialJobsStatus(): Promise<number> { private async requestTrialJobsStatus(): Promise<number> {
let finishedTrialJobNum: number = 0; let finishedTrialJobNum: number = 0;
if (this.dispatcher === undefined) {
throw new Error('Error: tuner has not been setup');
}
for (const trialJobId of Array.from(this.trialJobs.keys())) { for (const trialJobId of Array.from(this.trialJobs.keys())) {
const trialJobDetail: TrialJobDetail = await this.trainingService.getTrialJob(trialJobId); const trialJobDetail: TrialJobDetail = await this.trainingService.getTrialJob(trialJobId);
const oldTrialJobDetail: TrialJobDetail | undefined = this.trialJobs.get(trialJobId); const oldTrialJobDetail: TrialJobDetail | undefined = this.trialJobs.get(trialJobId);
...@@ -367,6 +370,7 @@ class NNIManager implements Manager { ...@@ -367,6 +370,7 @@ class NNIManager implements Manager {
case 'USER_CANCELED': case 'USER_CANCELED':
this.trialJobs.delete(trialJobId); this.trialJobs.delete(trialJobId);
finishedTrialJobNum++; finishedTrialJobNum++;
this.dispatcher.sendCommand(TRIAL_END, JSON.stringify({trial_job_id: trialJobDetail.id, event: trialJobDetail.status}));
break; break;
case 'FAILED': case 'FAILED':
case 'SYS_CANCELED': case 'SYS_CANCELED':
...@@ -374,6 +378,7 @@ class NNIManager implements Manager { ...@@ -374,6 +378,7 @@ class NNIManager implements Manager {
// TO DO: push this job to queue for retry // TO DO: push this job to queue for retry
this.trialJobs.delete(trialJobId); this.trialJobs.delete(trialJobId);
finishedTrialJobNum++; finishedTrialJobNum++;
this.dispatcher.sendCommand(TRIAL_END, JSON.stringify({trial_job_id: trialJobDetail.id, event: trialJobDetail.status}));
break; break;
case 'WAITING': case 'WAITING':
case 'RUNNING': case 'RUNNING':
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment