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 6205a037cd2ee7889d72dac506e033d1105cb573
Author: leonidfrolov <frolovl...@gmail.com>
AuthorDate: Fri May 29 10:35:02 2020 +0300
[DLAB-1810]: changed caffe2 version and how it is installed
---
infrastructure-provisioning/src/general/conf/dlab.ini | 2 +-
.../src/general/lib/os/debian/notebook_lib.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini
b/infrastructure-provisioning/src/general/conf/dlab.ini
index 4453703..5dbed5d 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -251,7 +251,7 @@ nvidia_version = 418.126.02
### Caffe library version for DeepLearning notebook
caffe_version = 1.0
### Caffe2 library version for DeepLearning notebook
-caffe2_version = 1.4
+caffe2_version = 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 e5aeb7b..e4e03d4 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -460,9 +460,9 @@ 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 v{}'.format(caffe2_version))
- sudo('git submodule update --recursive')
- sudo('mkdir build && cd build && cmake{} .. && make "-j$(nproc)"
install'.format(cmake_version))
+ sudo('git checkout release/1.5')
+ 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-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
