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/09 10:43:02 UTC
[incubator-datalab] branch gcp-jupyter-highgpu-template-1 updated: added to ui files
This is an automated email from the ASF dual-hosted git repository.
olehmykolaishyn 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 8a3083b added to ui files
8a3083b is described below
commit 8a3083b39b7ae70ff87139518fa450684dc63fcf
Author: oleh_mykolaishyn <ow...@gmail.com>
AuthorDate: Wed Mar 9 12:42:43 2022 +0200
added to ui files
---
.../epam/datalab/backendapi/core/commands/CommandExecutorMock.java | 2 +-
.../exploratory/create-environment/create-environment.component.html | 5 ++++-
.../exploratory/create-environment/create-environment.component.ts | 4 +++-
3 files changed, 8 insertions(+), 3 deletions(-)
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 c795c6e..69c8719 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,7 +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-jupyter-gpu-conda:latest",
"docker.datalab-jupyterlab:latest",
"docker.datalab-superset:latest",
"docker.datalab-rstudio:latest",
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
index 24d57b7..0b2a4e9 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
@@ -254,6 +254,7 @@
[ngIf]="selectedCloud === 'gcp'
&& (currentTemplate?.image === 'docker.datalab-jupyter'
|| currentTemplate?.image === 'docker.datalab-jupyter-gpu'
+ || currentTemplate?.image === 'docker.datalab-jupyter-gpu-conda'
|| currentTemplate?.image === 'docker.datalab-deeplearning'
|| currentTemplate?.image === 'docker.datalab-tensor')"
>
@@ -272,9 +273,11 @@
[ngIf]="this.additionalParams.gpu ||
currentTemplate?.image === 'docker.datalab-deeplearning' ||
currentTemplate?.image === 'docker.datalab-jupyter-gpu' ||
+ currentTemplate?.image === 'docker.datalab-jupyter-gpu-conda' ||
currentTemplate?.image === 'docker.datalab-tensor'"
>
- <div *ngIf="currentTemplate?.image !== 'docker.datalab-jupyter-gpu'" class="control-group">
+ <!---<div *ngIf="currentTemplate?.image !== 'docker.datalab-jupyter-gpu'" class="control-group"> --->
+ <div class="control-group">
<label class="label">GPU type</label>
<div
class="control selector-wrapper"
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
index 52b6459..0b5e4fb 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
@@ -175,12 +175,13 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit {
if (this.selectedCloud === 'gcp' &&
(template?.image === 'docker.datalab-jupyter' ||
template?.image === 'docker.datalab-jupyter-gpu' ||
+ template?.image === 'docker.datalab-jupyter-gpu-conda' ||
template?.image === 'docker.datalab-deeplearning' ||
template?.image === 'docker.datalab-tensor')) {
this.gpuTypes = template?.computationGPU ? HelpUtils.sortGpuTypes(template.computationGPU) : [];
- if(template?.image === 'docker.datalab-tensor' || template?.image === 'docker.datalab-tensor-gpu' || template?.image === 'docker.datalab-deeplearning') {
+ if(template?.image === 'docker.datalab-tensor' || template?.image === 'docker.datalab-jupyter-gpu-conda'|| template?.image === 'docker.datalab-jupyter-gpu' || template?.image === 'docker.datalab-deeplearning') {
this.addGpuFields();
}
}
@@ -191,6 +192,7 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit {
if (template.exploratory_environment_versions[0].template_name.toLowerCase().indexOf('tensorflow') === -1
&& template.exploratory_environment_versions[0].template_name.toLowerCase().indexOf('deeplearning') === -1
&& template.exploratory_environment_versions[0].template_name.toLowerCase().indexOf('jupyter-gpu') === -1
+ && template.exploratory_environment_versions[0].template_name.toLowerCase().indexOf('jupyter-gpu-conda') === -1
&& template.exploratory_environment_versions[0].template_name.toLowerCase().indexOf('deep learning') === -1
&& template.exploratory_environment_versions[0].template_name.toLowerCase().indexOf('data science') === -1
) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org