You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by yk...@apache.org on 2021/01/28 14:27:54 UTC
[incubator-datalab] branch DATALAB-2232 updated: DATALAB-2232 --
show param of GPU.
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2232
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2232 by this push:
new e862bae DATALAB-2232 -- show param of GPU.
e862bae is described below
commit e862baeb4db3a30d905cf19b0d1d0725d60f01fe
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Thu Jan 28 16:27:09 2021 +0200
DATALAB-2232 -- show param of GPU.
---
.../src/general/files/gcp/jupyter_description.json | 4 ++++
.../src/general/files/gcp/jupyterlab_description.json | 4 ----
.../datalab/dto/computational/UserComputationalResource.java | 11 +++++++++++
.../dto/gcp/computational/GcpComputationalResource.java | 6 ++++++
.../service/impl/InfrastructureInfoServiceImpl.java | 1 +
5 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json b/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json
index a94ba57..4c759bb 100644
--- a/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json
+++ b/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json
@@ -29,5 +29,9 @@
"version": "jupyter_notebook-6.0.2",
"vendor": "GCP"
}
+ ],
+ "gpu_types": [
+ {"Size": "S", "Gpu_type": "nvidia-tesla-t4"},
+ {"Size": "M", "Gpu_type": "nvidia-tesla-v100"}
]
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json b/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json
index 7615562..3f202f7 100644
--- a/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json
+++ b/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json
@@ -29,9 +29,5 @@
"version": "jupyter_lab-0.35.6",
"vendor": "GCP"
}
- ],
- "gpu_types": [
- {"Size": "S", "Gpu_type": "nvidia-tesla-t4"},
- {"Size": "M", "Gpu_type": "nvidia-tesla-v100"}
]
}
\ No newline at end of file
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/UserComputationalResource.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/UserComputationalResource.java
index 8a52ece..b5c8b13 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/UserComputationalResource.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/UserComputationalResource.java
@@ -72,9 +72,20 @@ public class UserComputationalResource {
@JsonProperty("emr_version")
private String awsClusterVersion;
private int totalInstanceCount;
+ @JsonProperty("masterGPUType")
+ private String masterGPUType;
+ @JsonProperty("slaveGPUType")
+ private String slaveGPUType;
+ @JsonProperty("masterGPUCount")
+ private String masterGPUCount;
+ @JsonProperty("slaveGPUCount")
+ private String slaveGPUCount;
+ private boolean enabledGPU;
+
protected List<ClusterConfig> config;
private Map<String, String> tags;
+
public UserComputationalResource(String computationalName, String computationalId, String imageName,
String templateName, String status, Date uptime, SchedulerJobDTO schedulerData,
boolean reuploadKeyRequired, List<ResourceURL> resourceUrl,
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java
index dea7d4d..70e9a9e 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java
@@ -89,5 +89,11 @@ public class GcpComputationalResource extends UserComputationalResource {
this.slaveGPUCount = slaveGPUCount;
this.slaveGPUType = slaveGPUType;
this.enabledGPU = enabledGPU;
+ super.setMasterGPUCount(masterGPUCount);
+ super.setSlaveGPUCount(slaveGPUCount);
+ super.setMasterGPUType(masterGPUType);
+ super.setSlaveGPUType(slaveGPUType);
+ super.setEnabledGPU(enabledGPU);
+
}
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java
index b7ad081..d758fd4 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java
@@ -21,6 +21,7 @@ package com.epam.datalab.backendapi.service.impl;
import com.epam.datalab.auth.UserInfo;
import com.epam.datalab.backendapi.conf.SelfServiceApplicationConfiguration;
+import com.epam.datalab.backendapi.dao.ComputationalDAO;
import com.epam.datalab.backendapi.dao.ExploratoryDAO;
import com.epam.datalab.backendapi.domain.BillingReport;
import com.epam.datalab.backendapi.domain.EndpointDTO;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org