You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by ol...@apache.org on 2022/03/17 10:19:18 UTC
[incubator-datalab] branch gcp-conda updated: changed cuda driver version, added jupyter-gpu and jupyter-conda to Java Group
This is an automated email from the ASF dual-hosted git repository.
olehmykolaishyn pushed a commit to branch gcp-conda
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/gcp-conda by this push:
new f95c169 changed cuda driver version, added jupyter-gpu and jupyter-conda to Java Group
f95c169 is described below
commit f95c169e603161bc6dd1edbba53e63587a3f38fa
Author: oleh_mykolaishyn <ow...@gmail.com>
AuthorDate: Thu Mar 17 12:19:05 2022 +0200
changed cuda driver version, added jupyter-gpu and jupyter-conda to Java Group
---
.../src/general/files/gcp/jupyter-conda_description.json | 2 +-
.../src/general/lib/os/debian/notebook_lib.py | 5 +++++
.../com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/files/gcp/jupyter-conda_description.json b/infrastructure-provisioning/src/general/files/gcp/jupyter-conda_description.json
index 7e09b50..98afe15 100644
--- a/infrastructure-provisioning/src/general/files/gcp/jupyter-conda_description.json
+++ b/infrastructure-provisioning/src/general/files/gcp/jupyter-conda_description.json
@@ -11,7 +11,7 @@
"template_name": "Jupyter notebook 6.1.6 with GPU and Anaconda",
"description": "Base image with jupyter node creation routines",
"environment_type": "exploratory",
- "version": "jupyter_notebook_conda",
+ "version": "jupyter_conda",
"vendor": "GCP"
}
]
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 3246d31..db96ebf 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -407,6 +407,11 @@ def ensure_venv_libs(os_user, libs):
def ensure_pytorch(os_user, gpu=True):
if not exists(datalab.fab.conn, '/home/' + os_user + '/.ensure_dir/pytorch_ensured'):
if gpu:
+ if os.environ['application'] in ('jupyter-gpu', 'jupyter-conda'):
+ datalab.fab.install_venv_pip_pkg('torch==1.10.0+cu111 torchvision==0.10.0+cu111 '
+ 'torchaudio==0.10.0+cu111 -f '
+ 'https://download.pytorch.org/whl/cu111/torch_stable.html')
+ else:
datalab.fab.install_venv_pip_pkg('torch==1.10.2+cu113 torchvision==0.11.3+cu113 '
'torchaudio==0.10.2+cu113 -f '
'https://download.pytorch.org/whl/cu113/torch_stable.html')
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
index c9c9024..8d81f17 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
@@ -160,11 +160,11 @@ public class LibraryServiceImpl implements LibraryService {
final String templateName = userInstanceDTO.getTemplateName();
List<LibraryGroups> groups = new ArrayList<>(Arrays.asList(GROUP_PIP3, GROUP_OTHERS, GROUP_OS_PKG));
- if (isTemplateGroup(templateName, Stream.of(JUPYTER, ZEPPELIN, JUPYTER_GPU, JUPYTER_CONDA))) {
+ if (isTemplateGroup(templateName, Stream.of(JUPYTER, ZEPPELIN))) {
groups.addAll(Arrays.asList(GROUP_R_PKG, GROUP_JAVA));
}
if (isTemplateGroup(templateName, Stream.of(DEEP_LEARNING, TENSOR, TENSOR_GCP,
- DEEP_LEARNING_GCP, DEEP_LEARNING_AWS, DEEP_LEARNING_AZURE))) {
+ DEEP_LEARNING_GCP, DEEP_LEARNING_AWS, DEEP_LEARNING_AZURE, JUPYTER_GPU, JUPYTER_CONDA))) {
groups.add(GROUP_JAVA);
}
if (isTemplateGroup(templateName, Stream.of(RSTUDIO, TENSOR_RSTUDIO))) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org