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

Fix kubeflow pipeline and reuse command #4009

Merged
merged 21 commits into from
Aug 4, 2021
Merged

Fix kubeflow pipeline and reuse command #4009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3a78225
add log
SparkSnail Jul 28, 2021
1ec7194
add log
SparkSnail Jul 28, 2021
26602b4
add log
SparkSnail Jul 28, 2021
b0eb69d
add log
SparkSnail Jul 28, 2021
897f8c9
add log
SparkSnail Jul 29, 2021
b3b3c93
add log
SparkSnail Jul 29, 2021
83f928b
add log
SparkSnail Jul 29, 2021
5b4c335
debug
SparkSnail Jul 29, 2021
c18cdc9
fix error
SparkSnail Jul 29, 2021
a439164
fix validation
SparkSnail Jul 29, 2021
33cccf2
fix build
SparkSnail Jul 29, 2021
703c01b
remove unused code
SparkSnail Jul 29, 2021
f849147
fix build
SparkSnail Jul 29, 2021
4284a50
Merge branch 'master' of https://github.com/microsoft/nni into dev-pi…
SparkSnail Aug 2, 2021
7b94f9a
update test yaml
SparkSnail Aug 2, 2021
548a2c0
fix build
SparkSnail Aug 2, 2021
e5a00b6
fix build
SparkSnail Aug 2, 2021
0d4edb5
fix config
SparkSnail Aug 2, 2021
450b71b
fix build
SparkSnail Aug 2, 2021
1eef029
fix build
SparkSnail Aug 2, 2021
fb97e9e
fix pipeline
SparkSnail Aug 3, 2021
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 pipelines/integration-test-frameworkcontroller.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ jobs:
cd test
python3 nni_test/nnitest/generate_ts_config.py \
--ts frameworkcontroller \
--keyvault_vaultname NNIKeyVault \
--keyvault_name AzureStorageAccountKey \
--azs_account nniazurestorage \
--azs_share nni \
--keyvault_vaultname $(keyvault_vaultname}) \
--keyvault_name $(keyvault_name) \
--azs_account $(azs_account) \
--azs_share $(azs_share) \
--nni_docker_image nnidev/nni-nightly \
--nni_manager_ip $(manager_ip)
python3 nni_test/nnitest/run_tests.py --config config/integration_tests.yml --ts frameworkcontroller --exclude multi-phase,multi-thread
Expand Down
8 changes: 4 additions & 4 deletions pipelines/integration-test-kubeflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ jobs:
cd test
python3 nni_test/nnitest/generate_ts_config.py \
--ts kubeflow \
--keyvault_vaultname NNIKeyVault \
--keyvault_name AzureStorageAccountKey \
--azs_account nniazurestorage \
--azs_share nni \
--keyvault_vaultname $(keyvault_vaultname) \
--keyvault_name $(keyvault_name) \
--azs_account $(azs_account) \
--azs_share $(azs_share) \
--nni_docker_image nnidev/nni-nightly \
--nni_manager_ip $(manager_ip)
python3 nni_test/nnitest/run_tests.py --config config/integration_tests.yml --ts kubeflow --exclude multi-phase,multi-thread
Expand Down
4 changes: 3 additions & 1 deletion ...i_manager/training_service/reusable/environments/kubernetes/kubeflowEnvironmentService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ export class KubeflowEnvironmentService extends KubernetesEnvironmentService {
if (this.createStoragePromise) {
await this.createStoragePromise;
}
environment.command = `mv envs outputs/envs && cd outputs && ${environment.command}`;
const expFolder = `${this.CONTAINER_MOUNT_PATH}/nni/${this.experimentId}`;
environment.command = `cd ${expFolder} && ${environment.command} \
1>${expFolder}/envs/${environment.id}/trialrunner_stdout 2>${expFolder}/envs/${environment.id}/trialrunner_stderr`;
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggest add indent.

if (this.config.deprecated && this.config.deprecated.useActiveGpu !== undefined) {
environment.useActiveGpu = this.config.deprecated.useActiveGpu;
}
Expand Down