You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by mh...@apache.org on 2022/03/07 13:26:54 UTC
[incubator-datalab] branch gcp-jupyter-highgpu-template-1 updated: Updated files for jupyter-gpu-conda(template 2)
This is an automated email from the ASF dual-hosted git repository.
mhladun pushed a commit to branch gcp-jupyter-highgpu-template-1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/gcp-jupyter-highgpu-template-1 by this push:
new 7c63c72 Updated files for jupyter-gpu-conda(template 2)
7c63c72 is described below
commit 7c63c72d6b899d0501f091139608c52d1c72b6f0
Author: Marian_Hladun <ma...@gmail.com>
AuthorDate: Mon Mar 7 15:26:43 2022 +0200
Updated files for jupyter-gpu-conda(template 2)
---
infrastructure-provisioning/src/general/conf/datalab.ini | 2 +-
.../src/general/scripts/gcp/ssn_configure.py | 1 +
.../src/ssn/files/gcp/mongo_roles.json | 10 ++++++++++
infrastructure-provisioning/src/ssn/scripts/docker_build.py | 1 +
.../backendapi/core/commands/CommandExecutorMock.java | 1 +
.../com/epam/datalab/backendapi/domain/NotebookTemplate.java | 1 +
.../java/com/epam/datalab/backendapi/util/BillingUtils.java | 2 +-
.../src/main/resources/mongo/gcp/mongo_roles.json | 12 ++++++++++++
8 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini b/infrastructure-provisioning/src/general/conf/datalab.ini
index 5970912..5eeccc6 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -391,7 +391,7 @@ slave_instance_spot_pct_price = 70
### Count of slave nodes for Data Engine
# instance_count =
### Type of notebooks for creating Data Engine from notebook images
-image_notebooks = jupyter,jupyter-gpu,jupyterlab,rstudio,zeppelin,tensor,tensor-rstudio,deeplearning
+image_notebooks = jupyter,jupyter-gpu,jupyter-gpu-conda,jupyterlab,rstudio,zeppelin,tensor,tensor-rstudio,deeplearning
### Persent of RAM allocated for an operating system
os_memory = 75
### Explicit allocation RAM for an operating system
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index f96c911..a7fbe2a 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -203,6 +203,7 @@ if __name__ == "__main__":
{"name": "edge", "tag": "latest"},
{"name": "jupyter", "tag": "latest"},
{"name": "jupyter-gpu", "tag": "latest"},
+ {"name": "jupyter-gpu-conda", "tag": "latest"},
{"name": "jupyterlab", "tag": "latest"},
{"name": "rstudio", "tag": "latest"},
{"name": "zeppelin", "tag": "latest"},
diff --git a/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json b/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json
index 18fdb22..8ed47e3 100644
--- a/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json
+++ b/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json
@@ -110,6 +110,16 @@
]
},
{
+ "_id": "nbCreateJupyterGpuConda",
+ "description": "Create Notebook Jupyter Gpu with Anaconda",
+ "exploratories": [
+ "docker.datalab-jupyter-gpu-conda"
+ ],
+ "groups": [
+ "$anyuser"
+ ]
+ },
+ {
"_id": "nbCreateJupyterLab",
"description": "Create Notebook JupyterLab",
"exploratories": [
diff --git a/infrastructure-provisioning/src/ssn/scripts/docker_build.py b/infrastructure-provisioning/src/ssn/scripts/docker_build.py
index ac23a2c..17ad490 100644
--- a/infrastructure-provisioning/src/ssn/scripts/docker_build.py
+++ b/infrastructure-provisioning/src/ssn/scripts/docker_build.py
@@ -36,6 +36,7 @@ if sys.argv[1] == 'all':
'project',
'jupyter',
'jupyter-gpu',
+ 'jupyter-gpu-conda',
'jupyterlab',
'rstudio',
'zeppelin',
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java
index a058060..c795c6e 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java
@@ -79,6 +79,7 @@ public class CommandExecutorMock implements ICommandExecutor {
"docker.datalab-deeplearning:latest",
"docker.datalab-jupyter:latest",
"docker.datalab-jupyter-gpu:latest",
+ "docker.datalab-jupyter-gpu-condaN:latest",
"docker.datalab-jupyterlab:latest",
"docker.datalab-superset:latest",
"docker.datalab-rstudio:latest",
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java
index f3abcc5..eb58e8e 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java
@@ -27,6 +27,7 @@ import lombok.Getter;
public enum NotebookTemplate {
JUPYTER("Jupyter notebook 6.1.6"),
JUPYTER_GPU("Jupyter with GPU notebook 6.1.6"),
+ JUPYTER_GPU_CONDA("Jupyter with GPU and Anaconda notebook 6.1.6"),
JUPYTER_LAB("JupyterLab 0.35.6"),
ZEPPELIN("Apache Zeppelin 0.9.1"),
DEEP_LEARNING("Deep Learning 2.4"),
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/BillingUtils.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/BillingUtils.java
index 58d2488..3d4fc63 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/BillingUtils.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/BillingUtils.java
@@ -39,7 +39,7 @@ import static com.epam.datalab.dto.billing.BillingResourceType.*;
@Slf4j
public class BillingUtils {
- private static final String[] AVAILABLE_NOTEBOOKS = {"zeppelin", "tensor-rstudio", "rstudio", "tensor", "superset", "jupyterlab", "jupyter", "jupyter-gpu","deeplearning"};
+ private static final String[] AVAILABLE_NOTEBOOKS = {"zeppelin", "tensor-rstudio", "rstudio", "tensor", "superset", "jupyterlab", "jupyter", "jupyter-gpu", "jupyter-gpu-conda", "deeplearning"};
private static final String[] BILLING_FILTERED_REPORT_HEADERS = {"DataLab ID", "Project", "DataLab Resource Type", "Status", "Shape", "Product", "Cost"};
private static final String[] COMPLETE_REPORT_REPORT_HEADERS = {"DataLab ID", "User", "Project", "DataLab Resource Type", "Status", "Shape", "Product", "Cost"};
diff --git a/services/self-service/src/main/resources/mongo/gcp/mongo_roles.json b/services/self-service/src/main/resources/mongo/gcp/mongo_roles.json
index a914f34..3fa018f 100644
--- a/services/self-service/src/main/resources/mongo/gcp/mongo_roles.json
+++ b/services/self-service/src/main/resources/mongo/gcp/mongo_roles.json
@@ -132,6 +132,18 @@
]
},
{
+ "_id": "nbCreateJupyterGpuConda",
+ "description": "Create Notebook Jupyter Gpu with Anaconda",
+ "type": "NOTEBOOK",
+ "cloud": "GCP",
+ "exploratories": [
+ "docker.datalab-jupyter-gpu-conda"
+ ],
+ "groups": [
+ "$anyuser"
+ ]
+ },
+ {
"_id": "nbCreateJupyterLab",
"description": "Create Notebook JupyterLab",
"type": "NOTEBOOK",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org