Skip to content
This repository has been archived by the owner on Sep 18, 2024. It is now read-only.

Fix remote TrainingService bug, change forEach to "for of" #564

Merged
merged 2 commits into from
Jan 4, 2019
Merged

Fix remote TrainingService bug, change forEach to "for of" #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5dcb1a
fix foreach
Jan 3, 2019
3cbf81a
update
Jan 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/nni_manager/training_service/kubernetes/kubernetesTrainingService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,19 @@ abstract class KubernetesTrainingService {
}
}

public listTrialJobs(): Promise<TrialJobDetail[]> {
public async listTrialJobs(): Promise<TrialJobDetail[]> {
const jobs: TrialJobDetail[] = [];

this.trialJobsMap.forEach(async (value: KubernetesTrialJobDetail, key: string) => {
for (const [key, value] of this.trialJobsMap) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

key, value without type definition, could it pass tslint ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

destructuring assignment does not support declare type.

if (value.form.jobType === 'TRIAL') {
jobs.push(await this.getTrialJob(key));
}
});
};

return Promise.resolve(jobs);
}

public getTrialJob(trialJobId: string): Promise<TrialJobDetail> {
public async getTrialJob(trialJobId: string): Promise<TrialJobDetail> {

const kubernetesTrialJob: TrialJobDetail | undefined = this.trialJobsMap.get(trialJobId);

Expand Down
6 changes: 3 additions & 3 deletions src/nni_manager/training_service/pai/paiTrainingService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,16 @@ class PAITrainingService implements TrainingService {
public async listTrialJobs(): Promise<TrialJobDetail[]> {
const jobs: TrialJobDetail[] = [];

this.trialJobsMap.forEach(async (value: PAITrialJobDetail, key: string) => {
for (const [key, value] of this.trialJobsMap) {
if (value.form.jobType === 'TRIAL') {
jobs.push(await this.getTrialJob(key));
}
});
};

return Promise.resolve(jobs);
}

public getTrialJob(trialJobId: string): Promise<TrialJobDetail> {
public async getTrialJob(trialJobId: string): Promise<TrialJobDetail> {
if(!this.paiClusterConfig) {
throw new Error('PAI Cluster config is not initialized');
}
Expand Down
6 changes: 3 additions & 3 deletions src/nni_manager/training_service/remote_machine/remoteMachineTrainingService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ class RemoteMachineTrainingService implements TrainingService {
/**
* List submitted trial jobs
*/
public listTrialJobs(): Promise<TrialJobDetail[]> {
public async listTrialJobs(): Promise<TrialJobDetail[]> {
const jobs: TrialJobDetail[] = [];
const deferred: Deferred<TrialJobDetail[]> = new Deferred<TrialJobDetail[]>();

this.trialJobsMap.forEach(async (value: RemoteMachineTrialJobDetail, key: string) => {
for (const [key, value] of this.trialJobsMap) {
if (value.form.jobType === 'TRIAL') {
jobs.push(await this.getTrialJob(key));
}
});
};
deferred.resolve(jobs);

return deferred.promise;
Expand Down