Unverified Commit 8a20c348 authored by SparkSnail's avatar SparkSnail Committed by GitHub
Browse files

add trial job detail link (#2703)

parent 2e4a9d98
...@@ -45,9 +45,10 @@ export class PAITrialJobDetail implements TrialJobDetail { ...@@ -45,9 +45,10 @@ export class PAITrialJobDetail implements TrialJobDetail {
public form: TrialJobApplicationForm; public form: TrialJobApplicationForm;
public logPath: string; public logPath: string;
public isEarlyStopped?: boolean; public isEarlyStopped?: boolean;
public paiJobDetailUrl?: string;
constructor(id: string, status: TrialJobStatus, paiJobName: string, constructor(id: string, status: TrialJobStatus, paiJobName: string,
submitTime: number, workingDirectory: string, form: TrialJobApplicationForm, logPath: string) { submitTime: number, workingDirectory: string, form: TrialJobApplicationForm, logPath: string, paiJobDetailUrl?: string) {
this.id = id; this.id = id;
this.status = status; this.status = status;
this.paiJobName = paiJobName; this.paiJobName = paiJobName;
...@@ -56,5 +57,6 @@ export class PAITrialJobDetail implements TrialJobDetail { ...@@ -56,5 +57,6 @@ export class PAITrialJobDetail implements TrialJobDetail {
this.form = form; this.form = form;
this.tags = []; this.tags = [];
this.logPath = logPath; this.logPath = logPath;
this.paiJobDetailUrl = paiJobDetailUrl;
} }
} }
...@@ -84,7 +84,7 @@ export class PAIJobInfoCollector { ...@@ -84,7 +84,7 @@ export class PAIJobInfoCollector {
if (response.body.jobStatus.appTrackingUrl) { if (response.body.jobStatus.appTrackingUrl) {
paiTrialJob.url = response.body.jobStatus.appTrackingUrl; paiTrialJob.url = response.body.jobStatus.appTrackingUrl;
} else { } else {
paiTrialJob.url = paiTrialJob.logPath; paiTrialJob.url = paiTrialJob.paiJobDetailUrl;
} }
} }
break; break;
......
...@@ -124,6 +124,7 @@ class PAIK8STrainingService extends PAITrainingService { ...@@ -124,6 +124,7 @@ class PAIK8STrainingService extends PAITrainingService {
const trialWorkingFolder: string = path.join(this.expRootDir, 'trials', trialJobId); const trialWorkingFolder: string = path.join(this.expRootDir, 'trials', trialJobId);
const paiJobName: string = `nni_exp_${this.experimentId}_trial_${trialJobId}`; const paiJobName: string = `nni_exp_${this.experimentId}_trial_${trialJobId}`;
const logPath: string = path.join(this.paiTrialConfig.nniManagerNFSMountPath, this.experimentId, trialJobId); const logPath: string = path.join(this.paiTrialConfig.nniManagerNFSMountPath, this.experimentId, trialJobId);
const paiJobDetailUrl: string = `${this.protocol}://${this.paiClusterConfig.host}/job-detail.html?username=${this.paiClusterConfig.userName}&jobName=${paiJobName}`;
const trialJobDetail: PAITrialJobDetail = new PAITrialJobDetail( const trialJobDetail: PAITrialJobDetail = new PAITrialJobDetail(
trialJobId, trialJobId,
'WAITING', 'WAITING',
...@@ -131,7 +132,8 @@ class PAIK8STrainingService extends PAITrainingService { ...@@ -131,7 +132,8 @@ class PAIK8STrainingService extends PAITrainingService {
Date.now(), Date.now(),
trialWorkingFolder, trialWorkingFolder,
form, form,
logPath); logPath,
paiJobDetailUrl);
this.trialJobsMap.set(trialJobId, trialJobDetail); this.trialJobsMap.set(trialJobId, trialJobDetail);
this.jobQueue.push(trialJobId); this.jobQueue.push(trialJobId);
......
...@@ -362,6 +362,7 @@ class TrialDispatcher implements TrainingService { ...@@ -362,6 +362,7 @@ class TrialDispatcher implements TrainingService {
liveTrialsCount++; liveTrialsCount++;
continue; continue;
} }
trial.url = environment.trackingUrl;
const environmentStatus = environment.status; const environmentStatus = environment.status;
// any node exit, then make sure the whole trial stopped. // any node exit, then make sure the whole trial stopped.
......
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