You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/05/29 12:40:23 UTC
[incubator-dlab] branch DLAB-1810 updated (22c905d -> eb536dd)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1810
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 22c905d [DLAB-1810]: added fix for torch
new 825ffbf [DLAB-1810]: moved pytorch_branch as variable to dlab.ini
new 40f1909 [DLAB-1810]: uncommented superset instance removal on failure
new eb536dd [DLAB-1810]: changed torch git repository link
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
infrastructure-provisioning/src/general/conf/dlab.ini | 2 ++
.../src/general/lib/os/debian/notebook_lib.py | 6 ++----
.../src/general/scripts/gcp/superset_configure.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/03: [DLAB-1810]: changed torch git repository
link
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1810
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit eb536dd5aa8790919a4d65d320137722c9735711
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri May 29 15:40:06 2020 +0300
[DLAB-1810]: changed torch git repository link
---
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index f00d20f..1cfb4ac 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -496,10 +496,8 @@ def install_mxnet(os_user, mxnet_version):
def install_torch(os_user):
if not exists('/home/{}/.ensure_dir/torch_ensured'.format(os_user)):
- run('git clone https://github.com/torch/distro.git ~/torch --recursive')
+ run('git clone https://github.com/nagadomi/distro.git ~/torch --recursive')
with cd('/home/{}/torch/'.format(os_user)):
- sudo("sed -i 's|sudo apt-get install -y python-software-properties|"
- "# sudo apt-get install -y python-software-properties|' /home/{}/torch/install-deps".format(os_user))
run('bash install-deps;')
run('./install.sh -b')
run('source /home/{}/.bashrc'.format(os_user))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/03: [DLAB-1810]: uncommented superset instance
removal on failure
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1810
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 40f190920e167e864e52e9c76ad254357efbfa1c
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri May 29 12:36:37 2020 +0300
[DLAB-1810]: uncommented superset instance removal on failure
---
.../src/general/scripts/gcp/superset_configure.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
index 111f6d4..021eb4c 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
@@ -221,7 +221,7 @@ if __name__ == "__main__":
raise Exception
except Exception as err:
dlab.fab.append_result("Failed to configure superset.", str(err))
- #GCPActions.remove_instance(notebook_config['instance_name'], notebook_config['zone'])
+ GCPActions.remove_instance(notebook_config['instance_name'], notebook_config['zone'])
sys.exit(1)
try:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/03: [DLAB-1810]: moved pytorch_branch as
variable to dlab.ini
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1810
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 825ffbf0d25d9d1d5b39ed2d6542d77dd305382b
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri May 29 10:40:43 2020 +0300
[DLAB-1810]: moved pytorch_branch as variable to dlab.ini
---
infrastructure-provisioning/src/general/conf/dlab.ini | 2 ++
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini
index 5dbed5d..df7a781 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -252,6 +252,8 @@ nvidia_version = 418.126.02
caffe_version = 1.0
### Caffe2 library version for DeepLearning notebook
caffe2_version = 1.5
+### Pytorch branch used during caffe2 installation for DeepLearning notebook
+pytorch_branch = release/1.5
### Cmake version for DeepLearning notebook
cmake_version = 3.15.5
### CNTK library version for DeepLearning notebook
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index f36389c..f00d20f 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -460,7 +460,7 @@ def install_caffe2(os_user, caffe2_version, cmake_version):
with cd('/home/{}/pytorch/'.format(os_user)):
sudo('git submodule update --init')
with settings(warn_only=True):
- sudo('git checkout release/1.5')
+ sudo('git checkout {}'.format(os.environ['notebook_pytorch_branch']))
sudo('git submodule update --init --recursive')
sudo('python3 setup.py install')
sudo('touch /home/' + os_user + '/.ensure_dir/caffe2_ensured')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org