bug fixes

cisco-open · Aug 7, 2024 · 0a89751 · 0a89751
1 parent d771bcb
commit 0a89751
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/.../modules/shared/components/ms-panel-model-training/ms-panel-model-training.component.html b/.../modules/shared/components/ms-panel-model-training/ms-panel-model-training.component.html
@@ -22,13 +22,13 @@
 	<div class="form-field-container" [formGroupName]="controlKey">
 		<mat-form-field appearance="outline" subscriptSizing="dynamic">
 			<mat-select formControlName="model" placeholder="Select a model...">
-				<mat-optgroup label="Predefined Models">
-					<mat-option>
-						<ngx-mat-select-search [formControl]="searchModel"> </ngx-mat-select-search>
-					</mat-option>
+				<mat-option>
+					<ngx-mat-select-search [formControl]="searchModel"> </ngx-mat-select-search>
+				</mat-option>
 
+				<mat-optgroup label="Predefined Models">
 					@if (filteredModels | async; as models) { @for (model of models; track model.name) {
-					<mat-option [value]="model.name">
+					<mat-option [value]="model.name" [disabled]="!model.isTrained">
 						{{ model.name }}
 						@if (!model.isTrained) {
 						<mat-icon class="mat-error" fontSet="ms" fontIcon="icon-X"></mat-icon>

diff --git a/frontend/src/app/modules/shared/components/ms-panel-model/ms-panel-model.component.html b/frontend/src/app/modules/shared/components/ms-panel-model/ms-panel-model.component.html
@@ -31,11 +31,11 @@
 	<div class="form-field-container" [formGroupName]="controlKey">
 		<mat-form-field appearance="outline" subscriptSizing="dynamic">
 			<mat-select formControlName="model" placeholder="Select a model...">
-				<mat-optgroup label="Predefined Models">
-					<mat-option>
-						<ngx-mat-select-search [formControl]="searchModel"> </ngx-mat-select-search>
-					</mat-option>
+				<mat-option>
+					<ngx-mat-select-search [formControl]="searchModel"> </ngx-mat-select-search>
+				</mat-option>
 
+				<mat-optgroup label="Predefined Models">
 					@if (filteredModels | async; as models) { @for (model of models; track model.name) {
 					<mat-option [value]="model.name" [disabled]="!model.isTrained">
 						{{ model.name }}

diff --git a/frontend/src/app/modules/shared/components/ms-panel-model/ms-panel-model.component.ts b/frontend/src/app/modules/shared/components/ms-panel-model/ms-panel-model.component.ts
@@ -16,7 +16,7 @@
 
 import { CommonModule } from '@angular/common';
 import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, inject } from '@angular/core';
-import { ControlContainer, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+import { ControlContainer, FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { MatCardModule } from '@angular/material/card';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
@@ -44,12 +44,13 @@ import { MsSpiningIndicatorComponent } from '../ms-spining-indicator/ms-spining-
 	selector: 'ms-panel-model',
 	standalone: true,
 	imports: [
+		CommonModule,
+		FormsModule,
 		ReactiveFormsModule,
 		MatCardModule,
 		MatFormFieldModule,
 		MatSelectModule,
 		MatIconModule,
-		CommonModule,
 		NgxMatSelectSearchModule,
 		RouterLink,
 		MatProgressSpinnerModule,

diff --git a/frontend/src/app/styles/theme/components/_ms-components.scss b/frontend/src/app/styles/theme/components/_ms-components.scss
@@ -26,3 +26,4 @@
 @forward './ms-tooltip';
 @forward './ms-snackbar';
 @forward './ms-drawer';
+@forward './ms-select';
diff --git a/frontend/src/app/styles/theme/components/_ms-select.scss b/frontend/src/app/styles/theme/components/_ms-select.scss
@@ -0,0 +1,7 @@
+.mdc-list-item__primary-text {
+	width: 100%;
+}
+
+.mat-mdc-optgroup-label {
+	padding: 5px 16px;
+}
diff --git a/machine_learning_core/multiflow/prune.py b/machine_learning_core/multiflow/prune.py
@@ -209,6 +209,8 @@ def main(args):
     runtimes = pd.DataFrame(runtimes)
     runtimes.to_csv(os.path.join(args.output_dir, f"{args.model}_{args.pruner}_seed{args.seed}_runtimes.csv"), index=False)
 
+    print(f"Pruning task completed successfully! The pruned weights are saved in the directory: {args.output_dir}")
+
 if __name__ == "__main__":
     parser = ArgumentParser()
     parser.add_argument('-p', '--pruner', type=str, required=True, choices=available_pruners)