You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/03/06 10:33:35 UTC
[incubator-dlab] branch EPMCDLAB-1186 updated: fixed issues;
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch EPMCDLAB-1186
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/EPMCDLAB-1186 by this push:
new f21e7ee fixed issues;
f21e7ee is described below
commit f21e7ee65f3fa10743fcf1f9e24e46c5bff17961
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Wed Mar 6 12:33:26 2019 +0200
fixed issues;
---
.../src/general/lib/aws/actions_lib.py | 24 ++++++++++++++--------
.../src/general/lib/os/debian/common_lib.py | 4 +++-
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index bb1c9f5..3956cc0 100644
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@ -1434,22 +1434,29 @@ def installing_python(region, bucket, user_name, cluster_name, application='', p
if region == 'cn-north-1':
try:
local(venv_command + ' && sudo -i ' + pip_command +
- ' install -i https://{0}/simple --trusted-host {0} --timeout 60000 -U pip==9.0.3 --no-cache-dir'.format(pip_mirror))
+ ' install -i https://{0}/simple --trusted-host {0} --timeout 60000 -U pip==9.0.3 '
+ '--no-cache-dir'.format(pip_mirror))
+ local(venv_command + ' && sudo -i ' + pip_command +
+ ' install -i https://{0}/simple --trusted-host {0} --timeout 60000 setuptools '
+ '--no-cache-dir'.format(pip_mirror))
local(venv_command + ' && sudo -i ' + pip_command + ' install pyzmq==17.0.0')
local(venv_command + ' && sudo -i ' + pip_command +
- ' install -i https://{0}/simple --trusted-host {0} --timeout 60000 ipython ipykernel --no-cache-dir'.
- format(pip_mirror))
+ ' install -i https://{0}/simple --trusted-host {0} --timeout 60000 ipython ipykernel '
+ '--no-cache-dir'.format(pip_mirror))
local(venv_command + ' && sudo -i ' + pip_command +
- ' install -i https://{0}/simple --trusted-host {0} --timeout 60000 boto boto3 NumPy=={1} SciPy Matplotlib==2.0.2 pandas=={2} Sympy Pillow sklearn --no-cache-dir'.
- format(pip_mirror, numpy_version, pandas_version))
+ ' install -i https://{0}/simple --trusted-host {0} --timeout 60000 boto boto3 NumPy=={1} '
+ 'SciPy Matplotlib==2.0.2 pandas=={2} Sympy Pillow sklearn --no-cache-dir'.format(pip_mirror,
+ numpy_version,
+ pandas_version))
# Need to refactor when we add GPU cluster
if application == 'deeplearning':
local(venv_command + ' && sudo -i ' + pip_command +
- ' install -i https://{0}/simple --trusted-host {0} --timeout 60000 mxnet-cu80 opencv-python keras Theano --no-cache-dir'.format(pip_mirror))
+ ' install -i https://{0}/simple --trusted-host {0} --timeout 60000 mxnet-cu80 opencv-python '
+ 'keras Theano --no-cache-dir'.format(pip_mirror))
python_without_dots = python_version.replace('.', '')
local(venv_command + ' && sudo -i ' + pip_command +
- ' install https://cntk.ai/PythonWheel/GPU/cntk-2.0rc3-cp{0}-cp{0}m-linux_x86_64.whl --no-cache-dir'.
- format(python_without_dots[:2]))
+ ' install https://cntk.ai/PythonWheel/GPU/cntk-2.0rc3-cp{0}-cp{0}m-linux_x86_64.whl '
+ '--no-cache-dir'.format(python_without_dots[:2]))
local('sudo rm /etc/pip.conf')
local('sudo mv /etc/back_pip.conf /etc/pip.conf')
except:
@@ -1459,6 +1466,7 @@ def installing_python(region, bucket, user_name, cluster_name, application='', p
sys.exit(1)
else:
local(venv_command + ' && sudo -i ' + pip_command + ' install -U pip==9.0.3 --no-cache-dir')
+ local(venv_command + ' && sudo -i ' + pip_command + ' install setuptools --no-cache-dir')
local(venv_command + ' && sudo -i ' + pip_command + ' install pyzmq==17.0.0')
try:
local(venv_command + ' && sudo -i ' + pip_command + ' install ipython ipykernel --no-cache-dir')
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
index 2c051a7..f377db7 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -34,9 +34,10 @@ def ensure_pkg(user, requisites='linux-headers-generic python-pip python-dev '
print("Updating repositories "
"and installing requested tools: {}".format(requisites))
apt_proccess = sudo('ps aux | grep apt | grep -v grep | wc -l')
- while apt_proccess == '1':
+ while apt_proccess != '0':
time.sleep(10)
apt_proccess = sudo('ps aux | grep apt | grep -v grep | wc -l')
+ sudo('rm -f /var/lib/apt/lists/lock')
sudo('apt-get update')
sudo('apt-get -y install ' + requisites)
sudo('unattended-upgrades -v')
@@ -48,6 +49,7 @@ def ensure_pkg(user, requisites='linux-headers-generic python-pip python-dev '
def renew_gpg_key():
try:
+ sudo('rm -f /var/lib/apt/lists/lock')
sudo('mv /etc/apt/trusted.gpg /etc/apt/trusted.bkp')
sudo('apt-key update')
except:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org