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/22 11:07:29 UTC
[incubator-dlab] branch v2.1-RC2 updated: [DLAB-475] Parametrise
also keras r package same as python library (for Debian)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch v2.1-RC2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/v2.1-RC2 by this push:
new 9cbb53d [DLAB-475] Parametrise also keras r package same as python library (for Debian)
new 46bbb00 Merge pull request #52 from ioleksandr/DLAB-475
9cbb53d is described below
commit 9cbb53d3c43ead8bb5de54c16508a840fdee8a72
Author: Oleksandr_Isniuk <i....@gmail.com>
AuthorDate: Thu Mar 21 18:07:25 2019 +0200
[DLAB-475] Parametrise also keras r package same as python library
(for Debian)
---
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py | 2 +-
2 files changed, 2 insertions(+), 2 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 3f3aa31..8ddbf14 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -102,7 +102,7 @@ def ensure_r(os_user, r_libs, region, r_mirror):
except:
sudo('R -e "options(download.file.method = "wget");library(\'devtools\');install_github(\'IRkernel/repr\');install_github(\'IRkernel/IRdisplay\');install_github(\'IRkernel/IRkernel\');"')
if os.environ['application'] == 'tensor-rstudio':
- sudo('R -e "library(\'devtools\');install_github(\'rstudio/keras\');"')
+ sudo('R -e "library(\'devtools\');install_version(\'keras\', version = \'{}\', repos = \'{}\');"'.format(os.environ['notebook_keras_version'],r_repository))
sudo('R -e "install.packages(\'RJDBC\',repos=\'{}\',dep=TRUE)"'.format(r_repository))
sudo('touch /home/' + os_user + '/.ensure_dir/r_ensured')
except:
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
index 657d0e6..d03710d 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
@@ -98,7 +98,7 @@ def ensure_r(os_user, r_libs, region, r_mirror):
sudo('R -e "install.packages(\'{}\',repos=\'{}\')"'.format(i, r_repository))
sudo('R -e "library(\'devtools\');install.packages(repos=\'{}\',c(\'rzmq\',\'repr\',\'digest\',\'stringr\',\'RJSONIO\',\'functional\',\'plyr\'))"'.format(r_repository))
sudo('R -e "library(\'devtools\');install_github(\'IRkernel/repr\');install_github(\'IRkernel/IRdisplay\');install_github(\'IRkernel/IRkernel\');"')
- sudo('R -e "library(\'devtools\');install_github(\'rstudio/keras\');"')
+ sudo('R -e "library(\'devtools\');install_version(\'keras\', version = \'{}\', repos = \'{}\');"'.format(os.environ['notebook_keras_version'],r_repository))
sudo('R -e "install.packages(\'RJDBC\',repos=\'{}\',dep=TRUE)"'.format(r_repository))
sudo('touch /home/{}/.ensure_dir/r_ensured'.format(os_user))
except:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org