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
e85f029b
"library/vscode:/vscode.git/clone" did not exist on "63af525c06363f398b851967da2740a2ace382b5"
Unverified
Commit
e85f029b
authored
Apr 02, 2021
by
SparkSnail
Committed by
GitHub
Apr 02, 2021
Browse files
Fix env folder (#3472)
parent
4338bcb7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
ts/nni_manager/training_service/reusable/environments/remoteEnvironmentService.ts
...service/reusable/environments/remoteEnvironmentService.ts
+6
-7
No files found.
ts/nni_manager/training_service/reusable/environments/remoteEnvironmentService.ts
View file @
e85f029b
...
...
@@ -34,6 +34,7 @@ export class RemoteEnvironmentService extends EnvironmentService {
private
readonly
log
:
Logger
;
private
sshConnectionPromises
:
any
[];
private
experimentRootDir
:
string
;
private
remoteExperimentRootDir
:
string
=
""
;
private
experimentId
:
string
;
constructor
()
{
...
...
@@ -249,16 +250,14 @@ export class RemoteEnvironmentService extends EnvironmentService {
this
.
environmentExecutorManagerMap
.
set
(
environment
.
id
,
executorManager
);
const
executor
=
await
this
.
getExecutor
(
environment
.
id
);
if
(
environment
.
useSharedStorage
)
{
const
environmentRoot
=
component
.
get
<
SharedStorageService
>
(
SharedStorageService
).
remoteWorkingRoot
;
environment
.
runnerWorkingFolder
=
executor
.
joinPath
(
environmentRoot
,
'
envs
'
,
environment
.
id
)
this
.
remoteExperimentRootDir
=
component
.
get
<
SharedStorageService
>
(
SharedStorageService
).
remoteWorkingRoot
;
const
remoteMountCommand
=
component
.
get
<
SharedStorageService
>
(
SharedStorageService
).
remoteMountCommand
;
await
executor
.
executeScript
(
remoteMountCommand
,
false
,
false
);
}
else
{
environment
.
runnerWorkingFolder
=
executor
.
joinPath
(
executor
.
getRemoteExperimentRootDir
(
getExperimentId
()),
'
envs
'
,
environment
.
id
)
this
.
remoteExperimentRootDir
=
executor
.
getRemoteExperimentRootDir
(
getExperimentId
());
}
environment
.
command
=
`cd
${
environment
.
runnerWorkingFolder
}
&& \
environment
.
runnerWorkingFolder
=
executor
.
joinPath
(
this
.
remoteExperimentRootDir
,
'
envs
'
,
environment
.
id
);
environment
.
command
=
`cd
${
this
.
remoteExperimentRootDir
}
&& \
${
environment
.
command
}
--job_pid_file
${
environment
.
runnerWorkingFolder
}
/pid \
1>
${
environment
.
runnerWorkingFolder
}
/trialrunner_stdout 2>
${
environment
.
runnerWorkingFolder
}
/trialrunner_stderr \
&& echo $?
\`
date +%s%3N
\`
>
${
environment
.
runnerWorkingFolder
}
/code`
;
...
...
@@ -278,7 +277,7 @@ export class RemoteEnvironmentService extends EnvironmentService {
await
fs
.
promises
.
writeFile
(
path
.
join
(
environmentLocalTempFolder
,
executor
.
getScriptName
(
"
run
"
)),
environment
.
command
,
{
encoding
:
'
utf8
'
});
// Copy files in codeDir to remote working directory
await
executor
.
copyDirectoryToRemote
(
environmentLocalTempFolder
,
environment
.
runnerWorkingFolde
r
);
await
executor
.
copyDirectoryToRemote
(
environmentLocalTempFolder
,
this
.
remoteExperimentRootDi
r
);
// Execute command in remote machine, set isInteractive=true to run script in conda environment
executor
.
executeScript
(
executor
.
joinPath
(
environment
.
runnerWorkingFolder
,
executor
.
getScriptName
(
"
run
"
)),
true
,
true
);
...
...
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