You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2021/02/03 13:17:17 UTC
[incubator-datalab] 02/02: [DATALAB-2246]: Show notebooks with GPU
on Env. managment page. Added GPU count
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2246
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 9e5e37f92e53ffd4f46471f71343cc54fd9117ce
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Wed Feb 3 15:16:29 2021 +0200
[DATALAB-2246]: Show notebooks with GPU on Env. managment page. Added GPU count
---
.../management/management-grid/management-grid.component.html | 6 +++++-
.../webapp/src/app/administration/management/management.model.ts | 4 ++++
.../create-environment/create-environment.component.html | 4 ++--
.../exploratory/create-environment/create-environment.component.ts | 6 +++---
.../exploratory/detail-dialog/detail-dialog.component.html | 1 +
.../src/app/resources/resources-grid/resources-grid.component.html | 1 +
.../webapp/src/app/resources/resources-grid/resources-grid.model.ts | 6 ++++--
7 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 1838e8a..4a35629 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -122,7 +122,11 @@
<span [hidden]="filtering && filterForm.shapes.length > 0 && !collapsedFilterRow">more_vert</span>
</i>
</button> </th>
- <td mat-cell *matCellDef="let element" class="shape">{{ element.shape || element.ip }}</td>
+ <td mat-cell *matCellDef="let element" class="shape">
+ <div>{{ element.shape || element.ip }}</div>
+ <div *ngIf="element.gpu_type">{{ element.gpu_type }}</div>
+ <div *ngIf="element.gpu_count">GPU count: {{ element.gpu_count }}</div>
+ </td>
</ng-container>
<ng-container matColumnDef="status">
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts
index 52e5ee9..7e9dda2 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts
@@ -29,6 +29,8 @@ export class EnvironmentModel {
public project?: string,
public endpoint?: string,
public cloud_provider?: string,
+ public gpu_type?: string,
+ public gpu_count?: string,
public exploratory_urls?: Array<any>
) { }
@@ -45,6 +47,8 @@ export class EnvironmentModel {
value.project,
value.endpoint,
value.cloud_provider,
+ value.gpu_type,
+ value.gpu_count,
value.exploratory_urls
));
}
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 4d28c7d..8adce23 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
@@ -183,7 +183,7 @@
<mat-form-field>
<mat-label>Select GPU type</mat-label>
<mat-select formControlName="gpuType" disableOptionCentering [disabled]="!createExploratoryForm.controls['shape'].value"
- panelClass="create-resources-shapes" placeholder="GPU type">
+ panelClass="create-resources-dialog" placeholder="GPU type">
<mat-option *ngFor="let list_item of gpuTypes" [value]="list_item.Gpu_type" (click)="setCount('', list_item.Gpu_type)">
<strong class="highlight icon-label">{{ list_item.Size }}</strong> {{ list_item.Gpu_type }}
</mat-option>
@@ -208,7 +208,7 @@
<mat-form-field>
<mat-label>Select GPU count</mat-label>
<mat-select formControlName="gpuCount" disableOptionCentering [disabled]="!createExploratoryForm.controls['gpuType'].value"
- panelClass="create-resources-shapes" placeholder="GPU count">
+ panelClass="create-resources-dialog" placeholder="GPU count">
<mat-option *ngFor="let list_item of gpuCount" [value]="list_item">
{{ list_item }}
</mat-option>
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 08da61c..7dbf226 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
@@ -130,9 +130,9 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit {
}
public getShapes(template) {
- if (this.selectedCloud === 'gcp' && template.image === 'docker.datalab-jupyter') {
- this.gpuTypes = template.gpu_types;
- }
+ // if (this.selectedCloud === 'gcp' && template.image === 'docker.datalab-jupyter') {
+ // this.gpuTypes = template.gpu_types;
+ // }
this.currentTemplate = template;
const allowed: any = ['GPU optimized'];
if (template.exploratory_environment_versions[0].template_name.toLowerCase().indexOf('tensorflow') === -1
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index f76c290..ec91cb0 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
@@ -48,6 +48,7 @@
<td>
<div>{{notebook.shape}}</div>
<div *ngIf="notebook.gpu_type">{{notebook.gpu_type}}</div>
+ <div *ngIf="notebook.gpu_count">GPU count: {{notebook.gpu_count}}</div>
</td>
</tr>
</table>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index 51ae9d7..4c67d8e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -140,6 +140,7 @@
<td class="shape-col">
<div>{{ element.shape }}</div>
<div *ngIf="element.gpu_type">{{ element.gpu_type }}</div>
+ <div *ngIf="element.gpu_count">GPU count: {{ element.gpu_count }}</div>
</td>
<td class="tag-col selection">
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
index 146a5e7..2e990ad 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
@@ -52,7 +52,8 @@ export class ExploratoryModel {
public tags: any,
public edgeNodeStatus: string,
public activeCompute: boolean,
- public gpu_type?: string
+ public gpu_type?: string,
+ public gpu_count?: string
) { }
public static loadEnvironments(data: Array<any>) {
@@ -182,7 +183,8 @@ export class ExploratoryModel {
el.tags,
value.shared[el.endpoint].status,
!!el.computational_resources.filter(resource => resource.status !== 'terminated' && resource.status !== 'failed').length,
- el.gpuType
+ el.gpuType,
+ el.gpuCount,
);
})
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org