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/21 13:49:30 UTC
[incubator-dlab] branch DLAB-1810 created (now 834cf62)
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.
at 834cf62 [DLAB-1810]: fixed some versions
This branch includes the following new commits:
new 834cf62 [DLAB-1810]: fixed some versions
The 1 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1810]: fixed some versions
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 834cf625089864bda225a5862ea01b6a04ef741b
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu May 21 16:48:58 2020 +0300
[DLAB-1810]: fixed some versions
---
.../deeplearning/scripts/configure_deep_learning_node.py | 14 +++++++-------
infrastructure-provisioning/src/general/conf/dlab.ini | 2 ++
.../src/general/lib/os/debian/notebook_lib.py | 10 +++++-----
3 files changed, 14 insertions(+), 12 deletions(-)
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 741ca18..d4d3932 100644
--- a/infrastructure-provisioning/src/deeplearning/scripts/configure_deep_learning_node.py
+++ b/infrastructure-provisioning/src/deeplearning/scripts/configure_deep_learning_node.py
@@ -57,13 +57,13 @@ caffe2_version = os.environ['notebook_caffe2_version']
cmake_version = os.environ['notebook_cmake_version']
cntk_version = os.environ['notebook_cntk_version']
mxnet_version = os.environ['notebook_mxnet_version']
-keras_version = '2.0.8'
+keras_version = os.environ['notebook_keras_version']
theano_version = os.environ['notebook_theano_version']
-tensorflow_version = '1.4.0'
-cuda_version = '8.0'
-cuda_file_name = 'cuda_8.0.44_linux-run'
-cudnn_version = '6.0'
-cudnn_file_name = 'cudnn-8.0-linux-x64-v6.0.tgz'
+tensorflow_version = os.environ['notebook_tensorflow_version']
+cuda_version = os.environ['notebook_cuda_version']
+cuda_file_name = os.environ['notebook_cuda_file_name']
+cudnn_version = os.environ['notebook_cudnn_version']
+cudnn_file_name = os.environ['notebook_cudnn_file_name']
if args.region == 'cn-north-1':
spark_link = "http://mirrors.hust.edu.cn/apache/spark/spark-" + spark_version + "/spark-" + spark_version + \
@@ -169,7 +169,7 @@ if __name__ == "__main__":
ensure_additional_python_libs(args.os_user)
print("Install Matplotlib")
ensure_matplot(args.os_user)
-
+
#POST INSTALLATION PROCESS
print("Updating pyOpenSSL library")
update_pyopenssl_lib(args.os_user)
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini
index bd65818..c24e0c2 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -280,6 +280,8 @@ ipykernel_version = 4.8.2
ungit_version = 1.4.36
### Numpy version
numpy_version = 1.18.3
+### Numpy version for python 2
+numpy2_version = 1.16.6
### Apache Ivy version
ivy_version = 2.4.0
### Matplotlib 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 0ad64dd..cc2ced7 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -162,7 +162,7 @@ def ensure_matplot(os_user):
sudo('pip2 install matplotlib==2.0.2 --no-cache-dir')
sudo('pip3 install matplotlib==2.0.2 --no-cache-dir')
if os.environ['application'] in ('tensor', 'deeplearning'):
- sudo('python2.7 -m pip install -U numpy==1.16.6 --no-cache-dir')
+ sudo('python2.7 -m pip install -U numpy=={} --no-cache-dir'.format(os.environ['notebook_numpy2_version']))
sudo('python3.6 -m pip install -U numpy=={} --no-cache-dir'.format(os.environ['notebook_numpy_version']))
sudo('touch /home/' + os_user + '/.ensure_dir/matplot_ensured')
except:
@@ -212,7 +212,7 @@ def ensure_additional_python_libs(os_user):
try:
manage_pkg('-y install', 'remote', 'libjpeg8-dev zlib1g-dev')
if os.environ['application'] in ('jupyter', 'zeppelin'):
- sudo('pip2 install NumPy==1.14.3 SciPy pandas Sympy Pillow sklearn --no-cache-dir'.format(os.environ['notebook_numpy_version']))
+ sudo('pip2 install NumPy=={} SciPy pandas Sympy Pillow sklearn --no-cache-dir'.format(os.environ['notebook_numpy2_version']))
sudo('pip3 install NumPy=={} SciPy pandas Sympy Pillow sklearn --no-cache-dir'.format(os.environ['notebook_numpy_version']))
if os.environ['application'] in ('tensor', 'deeplearning'):
sudo('pip2 install opencv-python h5py --no-cache-dir')
@@ -438,7 +438,7 @@ def install_caffe2(os_user, caffe2_version, cmake_version):
env.shell = "/bin/bash -l -c -i"
manage_pkg('update', 'remote', '')
manage_pkg('-y install --no-install-recommends', 'remote', 'build-essential cmake git libgoogle-glog-dev libprotobuf-dev protobuf-compiler python-dev python-pip')
- sudo('pip2 install numpy=={} protobuf --no-cache-dir'.format(os.environ['notebook_numpy_version']))
+ sudo('pip2 install numpy=={} protobuf --no-cache-dir'.format(os.environ['notebook_numpy2_version']))
sudo('pip3 install numpy=={} protobuf --no-cache-dir'.format(os.environ['notebook_numpy_version']))
manage_pkg('-y install --no-install-recommends', 'remote', 'libgflags-dev')
manage_pkg('-y install --no-install-recommends', 'remote', 'libgtest-dev libiomp-dev libleveldb-dev liblmdb-dev libopencv-dev libopenmpi-dev libsnappy-dev openmpi-bin openmpi-doc python-pydot')
@@ -446,8 +446,8 @@ def install_caffe2(os_user, caffe2_version, cmake_version):
'scipy setuptools tornado --no-cache-dir')
sudo('pip3 install flask graphviz hypothesis jupyter matplotlib==2.0.2 pydot python-nvd3 pyyaml requests scikit-image '
'scipy setuptools tornado --no-cache-dir')
- sudo('cp -f /opt/cudnn/include/* /opt/cuda-8.0/include/')
- sudo('cp -f /opt/cudnn/lib64/* /opt/cuda-8.0/lib64/')
+ sudo('cp -f /opt/cudnn/include/* /opt/cuda-{}/include/'.format(cuda_version))
+ sudo('cp -f /opt/cudnn/lib64/* /opt/cuda-{}/lib64/'.format(cuda_version))
sudo('wget https://cmake.org/files/v{2}/cmake-{1}.tar.gz -O /home/{0}/cmake-{1}.tar.gz'.format(
os_user, cmake_version, cmake_version.split('.')[0] + "." + cmake_version.split('.')[1]))
sudo('tar -zxvf cmake-{}.tar.gz'.format(cmake_version))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org