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/01/28 09:50:55 UTC
[incubator-datalab] 11/11: [DATALAB-2233]: Added GPU parameters for
Dataproc
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2233
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 24cf73d6c0a510d107d92cf01bbb8e40fc64ee45
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Jan 28 11:46:16 2021 +0200
[DATALAB-2233]: Added GPU parameters for Dataproc
---
.../computational-resource-create-dialog.component.html | 12 ++++++------
.../computational-resource-create-dialog.component.ts | 12 ++++++------
.../computational-resource-create.model.ts | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
index 2bac0c2..b39ecd4 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
@@ -148,7 +148,7 @@
</div>
<div class="checkbox-group control-group"
*ngIf="PROVIDER === 'gcp' && selectedImage?.image === 'docker.datalab-dataengine-service'">
- <div class="d-flex cursor-pointer label m-bott-20" (click)="openBlock('gpu')">
+ <div class="d-flex cursor-pointer label m-bott-20" (click)="addAdditionalParams('gpu')">
<div class="empty-checkbox ml-10" [ngClass]="{'checked': isSelected.gpu}">
<span class="checked-checkbox" *ngIf="isSelected.gpu"></span>
</div>
@@ -171,7 +171,7 @@
[disabled]="!resourceForm.controls['shape_master'].value">
<mat-option *ngFor="let type of selectedImage.gpu_types"
[value]="type.Gpu_type" (click)="setCount('master', type.Gpu_type)">
- <strong class="highlight icon-label">{{ type.size }}</strong> {{ type.Gpu_type }}
+ <strong class="highlight icon-label">{{ type.Size }}</strong> {{ type.Gpu_type }}
</mat-option>
<mat-option *ngIf="!clusterTypes.length" class="multiple-select ml-10" disabled>Master GPU types list
is empty</mat-option>
@@ -222,7 +222,7 @@
<mat-label>Select slave GPU type</mat-label>
<mat-select formControlName="slave_GPU_type" disableOptionCentering [disabled]="!resourceForm.controls['shape_slave'].value">
<mat-option *ngFor="let type of selectedImage.gpu_types" [value]="type.Gpu_type" (click)="setCount('slave', type.Gpu_type)">
- {{ type.Gpu_type }}
+ <strong class="highlight icon-label">{{ type.Size }}</strong> {{ type.Gpu_type }}
</mat-option>
<mat-option *ngIf="!selectedImage.gpu_types?.length" class="multiple-select ml-10" disabled>Slave GPU types list is empty</mat-option>
</mat-select>
@@ -263,7 +263,7 @@
</div>
<div class="preemptible checkbox-group control-group"
*ngIf="PROVIDER === 'gcp' && selectedImage?.image === 'docker.datalab-dataengine-service'">
- <div class="d-flex cursor-pointer label" (click)="openBlock('preemptible')">
+ <div class="d-flex cursor-pointer label" (click)="addAdditionalParams('preemptible')">
<div class="empty-checkbox ml-10" [ngClass]="{'checked': isSelected.preemptible}" (click)="selectPreemptibleNodes(isSelected.preemptible)">
<span class="checked-checkbox" *ngIf="isSelected.preemptible"></span>
</div>
@@ -287,7 +287,7 @@
<div class="checkbox-group control-group m-top-15" *ngIf="PROVIDER === 'aws'" [hidden]="!selectedImage.templates.length">
- <div class="d-flex cursor-pointer label" (click)="openBlock('spotInstances')">
+ <div class="d-flex cursor-pointer label" (click)="addAdditionalParams('spotInstances')">
<div class="empty-checkbox ml-10" [ngClass]="{'checked': isSelected.spotInstances}" (click)="selectSpotInstances()">
<span class="checked-checkbox" *ngIf="isSelected.spotInstances"></span>
</div>
@@ -308,7 +308,7 @@
<div class="checkbox-group m-top-20 control-group"
[hidden]="PROVIDER === 'gcp' && selectedImage?.image === 'docker.datalab-dataengine-service'"
*ngIf="notebook_instance?.image !== 'docker.datalab-zeppelin'">
- <div class="d-flex cursor-pointer label" (click)="openBlock('configuration')">
+ <div class="d-flex cursor-pointer label" (click)="addAdditionalParams('configuration')">
<div class="empty-checkbox ml-10" [ngClass]="{'checked': isSelected.configuration}" (click)="selectConfiguration()">
<span class="checked-checkbox" *ngIf="isSelected.configuration"></span>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
index 25d6e00..4822dc0 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
@@ -163,10 +163,10 @@ export class ComputationalResourceCreateDialogComponent implements OnInit {
instance_price: [0, [this.validInstanceSpotRange.bind(this)]],
configuration_parameters: ['', [this.validConfiguration.bind(this)]],
custom_tag: [this.notebook_instance.tags.custom_tag],
- master_GPU_type: ['', [Validators.required]],
- slave_GPU_type: ['', [Validators.required]],
- master_GPU_count: ['', [Validators.required]],
- slave_GPU_count: ['', [Validators.required]],
+ master_GPU_type: [''],
+ slave_GPU_type: [''],
+ master_GPU_count: [''],
+ slave_GPU_count: [''],
});
}
@@ -329,7 +329,7 @@ export class ComputationalResourceCreateDialogComponent implements OnInit {
}
}
- public openBlock(block: string) {
+ public addAdditionalParams(block: string) {
this.isSelected[block] = !this.isSelected[block];
if (block === 'gpu') {
const controls = ['master_GPU_type', 'master_GPU_count', 'slave_GPU_type', 'slave_GPU_count'];
@@ -370,7 +370,7 @@ export class ComputationalResourceCreateDialogComponent implements OnInit {
return count;
}
- public setCount(type: any, gpuType: any) {
+ public setCount(type: any, gpuType: any): void {
if (type === 'master') {
const masterShape = this.resourceForm.controls['shape_master'].value;
this.masterGPUcount = this.setGPUCount(masterShape, gpuType);
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts
index e61b1ee..93eff8d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts
@@ -62,10 +62,10 @@ export class ComputationalResourceModel {
config: config,
project: env.project,
custom_tag: parameters.custom_tag,
- masterGPUType: parameters.master_GPU_type,
- slaveGPUType: parameters.slave_GPU_type,
- masterGPUCount: parameters.master_GPU_count,
- slaveGPUCount: parameters.slave_GPU_count,
+ masterGPUType: gpu ? parameters.master_GPU_type : null,
+ slaveGPUType: gpu ? parameters.slave_GPU_type : null,
+ masterGPUCount: gpu ? parameters.master_GPU_count : null,
+ slaveGPUCount: gpu ? parameters.slave_GPU_count : null,
gpu_enabled: gpu
}, provider);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org