Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
nni
Commits
8a20c348
Unverified
Commit
8a20c348
authored
Jul 30, 2020
by
SparkSnail
Committed by
GitHub
Jul 30, 2020
Browse files
add trial job detail link (#2703)
parent
2e4a9d98
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
src/nni_manager/training_service/pai/paiConfig.ts
src/nni_manager/training_service/pai/paiConfig.ts
+3
-1
src/nni_manager/training_service/pai/paiJobInfoCollector.ts
src/nni_manager/training_service/pai/paiJobInfoCollector.ts
+1
-1
src/nni_manager/training_service/pai/paiK8S/paiK8STrainingService.ts
...ager/training_service/pai/paiK8S/paiK8STrainingService.ts
+3
-1
src/nni_manager/training_service/reusable/trialDispatcher.ts
src/nni_manager/training_service/reusable/trialDispatcher.ts
+1
-0
No files found.
src/nni_manager/training_service/pai/paiConfig.ts
View file @
8a20c348
...
@@ -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
;
}
}
}
}
src/nni_manager/training_service/pai/paiJobInfoCollector.ts
View file @
8a20c348
...
@@ -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
;
...
...
src/nni_manager/training_service/pai/paiK8S/paiK8STrainingService.ts
View file @
8a20c348
...
@@ -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
);
...
...
src/nni_manager/training_service/reusable/trialDispatcher.ts
View file @
8a20c348
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment