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/06/01 12:35:26 UTC

[incubator-dlab] branch DLAB-1810 updated: [DLAB-1810]: added cntk version for py2

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


The following commit(s) were added to refs/heads/DLAB-1810 by this push:
     new 7dc705a  [DLAB-1810]: added cntk version for py2
7dc705a is described below

commit 7dc705ad421946edcfd32843ff894ea939561835
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Jun 1 15:35:10 2020 +0300

    [DLAB-1810]: added cntk version for py2
---
 .../src/dataengine/scripts/configure_dataengine.py                     | 3 ++-
 .../src/deeplearning/scripts/configure_deep_learning_node.py           | 3 ++-
 infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py b/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
index e5aacb8..f9974c7 100644
--- a/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
+++ b/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
@@ -53,6 +53,7 @@ caffe_version = os.environ['notebook_caffe_version']
 caffe2_version = os.environ['notebook_caffe2_version']
 cmake_version = os.environ['notebook_cmake_version']
 cntk_version = os.environ['notebook_cntk_version']
+cntk2_version = os.environ['notebook_cntk2_version']
 mxnet_version = os.environ['notebook_mxnet_version']
 python3_version = "3.4"
 scala_link = "http://www.scala-lang.org/files/archive/"
@@ -176,7 +177,7 @@ if __name__ == "__main__":
         print("Installing Torch")
         install_torch(args.os_user)
         print("Install CNTK Python library")
-        install_cntk(args.os_user, cntk_version)
+        install_cntk(args.os_user, cntk2_version, cntk_version)
         print("Installing MXNET")
         install_mxnet(args.os_user, mxnet_version)
 
diff --git a/infrastructure-provisioning/src/deeplearning/scripts/configure_deep_learning_node.py b/infrastructure-provisioning/src/deeplearning/scripts/configure_deep_learning_node.py
index d4d3932..2c1f450 100644
--- a/infrastructure-provisioning/src/deeplearning/scripts/configure_deep_learning_node.py
+++ b/infrastructure-provisioning/src/deeplearning/scripts/configure_deep_learning_node.py
@@ -56,6 +56,7 @@ caffe_version = os.environ['notebook_caffe_version']
 caffe2_version = os.environ['notebook_caffe2_version']
 cmake_version = os.environ['notebook_cmake_version']
 cntk_version = os.environ['notebook_cntk_version']
+cntk2_version = os.environ['notebook_cntk2_version']
 mxnet_version = os.environ['notebook_mxnet_version']
 keras_version = os.environ['notebook_keras_version']
 theano_version = os.environ['notebook_theano_version']
@@ -128,7 +129,7 @@ if __name__ == "__main__":
     print("Installing Torch")
     install_torch(args.os_user)
     print("Install CNTK Python library")
-    install_cntk(args.os_user, cntk_version)
+    install_cntk(args.os_user,cntk2_version, cntk_version)
     print("Installing MXNET")
     install_mxnet(args.os_user, mxnet_version)
 
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 5dc66b9..ad6aa5a 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -466,7 +466,7 @@ def install_caffe2(os_user, caffe2_version, cmake_version):
         sudo('touch /home/' + os_user + '/.ensure_dir/caffe2_ensured')
 
 
-def install_cntk(os_user, cntk_version):
+def install_cntk(os_user, cntk2_version, cntk_version):
     if not exists('/home/{}/.ensure_dir/cntk_ensured'.format(os_user)):
         sudo('pip2 install https://cntk.ai/PythonWheel/GPU/cntk-{}-cp27-cp27mu-linux_x86_64.whl --no-cache-dir'.format(cntk2_version))
         sudo('pip3 install https://cntk.ai/PythonWheel/GPU/cntk_gpu-{}.post1-cp36-cp36m-win_amd64.whl --no-cache-dir'.format(cntk_version))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org