From 74751073470bcd8c0d2b5cf14dea0f59fc227f50 Mon Sep 17 00:00:00 2001 From: Igor Salnikov Date: Tue, 5 Apr 2022 22:19:52 +0300 Subject: [PATCH 1/3] Unskip tests for not annotated datasets --- client/e2e/resources.json | 2 +- client/e2e/src/accuracy-reports.e2e-spec.ts | 8 ++++---- client/e2e/src/int8-basic-cases.e2e-spec.ts | 17 +++++++---------- ...ot-annotated-model-visualization.e2e-spec.ts | 3 +-- client/e2e/src/pages/configuration-wizard.po.ts | 4 +++- ...parent-predictions-visualization.e2e-spec.ts | 3 +-- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/client/e2e/resources.json b/client/e2e/resources.json index b440cf25..e0f3d148 100644 --- a/client/e2e/resources.json +++ b/client/e2e/resources.json @@ -2725,7 +2725,7 @@ "imageNetNotAnnotated": { "path": "datasets/imagenet_notannotated_200.zip", "name": "ImageNetNotAnnotated", - "format": "ImageNet", + "format": "Not Annotated", "type": "dataset", "accuracyData": { "type": "Not Annotated", diff --git a/client/e2e/src/accuracy-reports.e2e-spec.ts b/client/e2e/src/accuracy-reports.e2e-spec.ts index 382b1775..bbbf4653 100644 --- a/client/e2e/src/accuracy-reports.e2e-spec.ts +++ b/client/e2e/src/accuracy-reports.e2e-spec.ts @@ -271,7 +271,7 @@ describe('UI tests on Accuracy Reports', () => { } ); - // TODO: 70558, 83248 + // TODO: 70558 xit( 'should download a semantic segmentation model (deeplabv3), not-annotated dataset' + 'int8 calibration, check that predictions comparison is available and that tensor comparison is available, ' + @@ -323,7 +323,7 @@ describe('UI tests on Accuracy Reports', () => { } ); - // TODO: 73953, 83248 + // TODO: 73953 xit( 'should create a project with a generic model, calibrate it, configure accuracy (OD), ' + 'create accuracy report (predictions comparison)', @@ -374,7 +374,7 @@ describe('UI tests on Accuracy Reports', () => { } ); - // TODO: 73953, 83248 + // TODO: 73953 xit( 'should create a project with a generic model and not-annotated dataset, calibrate, ' + 'create another project with annotated dataset, ' + @@ -448,7 +448,7 @@ describe('UI tests on Accuracy Reports', () => { } ); - // TODO: 73953, 83248 + // TODO: 73953 xit( 'should create a project with a classification model & ' + 'not-annotated dataset, calibrate it, create accuracy report (predictions comparison), ' + diff --git a/client/e2e/src/int8-basic-cases.e2e-spec.ts b/client/e2e/src/int8-basic-cases.e2e-spec.ts index 1c16a62f..2a198a86 100644 --- a/client/e2e/src/int8-basic-cases.e2e-spec.ts +++ b/client/e2e/src/int8-basic-cases.e2e-spec.ts @@ -32,11 +32,10 @@ describe('UI tests on Running Int8 Calibration', () => { datasetFileVOC.name = testUtils.helpers.generateName(); datasetFileImageNet.name = testUtils.helpers.generateName(); notAnnotatedDataset.name = testUtils.helpers.generateName(); - await testUtils.uploadDataset(datasetFileVOC); - await testUtils.uploadDataset(datasetFileImageNet); - await testUtils.uploadDataset(datasetWiderFace); - // TODO: 83248 - // await testUtils.uploadDataset(notAnnotatedDataset); + // await testUtils.uploadDataset(datasetFileVOC); + // await testUtils.uploadDataset(datasetFileImageNet); + // await testUtils.uploadDataset(datasetWiderFace); + await testUtils.uploadDataset(notAnnotatedDataset); // TODO: 73948 // await testUtils.uploadDataset(datasetCityScapes); }); @@ -54,7 +53,7 @@ describe('UI tests on Running Int8 Calibration', () => { await calibrationUtils.runInt8PipelineThroughUpload(modelFile, datasetFileVOC, inferenceTarget); }); - // TODO: 76569, 83248 + // TODO: 76569 xit( 'Upload FP32 Mobilenet SSD Lite V2, use Not Annotated dataset, ' + 'infer (CPU), int8 calibrate - Simplified Mode, infer (CPU)', @@ -65,8 +64,7 @@ describe('UI tests on Running Int8 Calibration', () => { } ); - // TODO: 83248 - xit( + it( 'Should upload original Caffe model, convert to IR V10, run inference, run Int-8 Tune with Not Annotated dataset, ' + 'Simplified Mode', async () => { @@ -76,8 +74,7 @@ describe('UI tests on Running Int8 Calibration', () => { } ); - // TODO: 83248 - xit( + it( 'Select squeezenet1.1 from table + Not Annotated dataset, infer (CPU), int8 Simplified Mode, ' + 'check wait message ', async () => { diff --git a/client/e2e/src/not-annotated-model-visualization.e2e-spec.ts b/client/e2e/src/not-annotated-model-visualization.e2e-spec.ts index 68792e7b..af6caa19 100644 --- a/client/e2e/src/not-annotated-model-visualization.e2e-spec.ts +++ b/client/e2e/src/not-annotated-model-visualization.e2e-spec.ts @@ -8,8 +8,7 @@ import { VisualizeInferenceResultPage } from './pages/inference-test-image.po'; import { TargetMachines, DevCloudTargets } from './pages/target-machines.po'; import { Helpers } from './pages/helpers'; -// TODO: 83248 -xdescribe('UI tests on visualization for model with not annotated dataset', () => { +describe('UI tests on visualization for model with not annotated dataset', () => { const testUtils = new TestUtils(); const inferenceUtils = new InferenceUtils(testUtils); const visualizeInferenceResultPage = new VisualizeInferenceResultPage(); diff --git a/client/e2e/src/pages/configuration-wizard.po.ts b/client/e2e/src/pages/configuration-wizard.po.ts index 852ea946..49495d68 100644 --- a/client/e2e/src/pages/configuration-wizard.po.ts +++ b/client/e2e/src/pages/configuration-wizard.po.ts @@ -967,9 +967,11 @@ export class ConfigurationWizardPage { await this.selectDatasetFile(datasetFile, resourceDir); + const selectTypes = await TestUtils.getElementByDataTestId('datasettype-form-field'); if (datasetFile['format'] === DatasetTypeNames.CITYSCAPES) { - const selectTypes = await TestUtils.getElementByDataTestId('datasettype-form-field'); await this.selectValueFromDropdown(selectTypes, DatasetTypeNames.CITYSCAPES); + } else if (datasetFile['format'] === DatasetTypeNames.NOT_ANNOTATED) { + await this.selectValueFromDropdown(selectTypes, DatasetTypeNames.NOT_ANNOTATED); } await this.uploadButton.click(); diff --git a/client/e2e/src/parent-predictions-visualization.e2e-spec.ts b/client/e2e/src/parent-predictions-visualization.e2e-spec.ts index 7b192754..8b35773a 100644 --- a/client/e2e/src/parent-predictions-visualization.e2e-spec.ts +++ b/client/e2e/src/parent-predictions-visualization.e2e-spec.ts @@ -47,8 +47,7 @@ describe('UI tests on parent predictions visualization', () => { dataSetFileSemantic.name = testUtils.helpers.generateName(); await testUtils.uploadDataset(datasetFileVOC); await testUtils.uploadDataset(datasetFileImageNet); - // TODO: 83248 - // await testUtils.uploadDataset(dataSetFileSemantic); + await testUtils.uploadDataset(dataSetFileSemantic); }); beforeEach(async () => { From dfca4e8e07be4996e41fe111db9423660622b452 Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Fri, 3 Feb 2023 12:19:20 +0000 Subject: [PATCH 2/3] unskip dataset uploading --- client/e2e/src/int8-basic-cases.e2e-spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/e2e/src/int8-basic-cases.e2e-spec.ts b/client/e2e/src/int8-basic-cases.e2e-spec.ts index 2a198a86..d2935c61 100644 --- a/client/e2e/src/int8-basic-cases.e2e-spec.ts +++ b/client/e2e/src/int8-basic-cases.e2e-spec.ts @@ -32,9 +32,9 @@ describe('UI tests on Running Int8 Calibration', () => { datasetFileVOC.name = testUtils.helpers.generateName(); datasetFileImageNet.name = testUtils.helpers.generateName(); notAnnotatedDataset.name = testUtils.helpers.generateName(); - // await testUtils.uploadDataset(datasetFileVOC); - // await testUtils.uploadDataset(datasetFileImageNet); - // await testUtils.uploadDataset(datasetWiderFace); + await testUtils.uploadDataset(datasetFileVOC); + await testUtils.uploadDataset(datasetFileImageNet); + await testUtils.uploadDataset(datasetWiderFace); await testUtils.uploadDataset(notAnnotatedDataset); // TODO: 73948 // await testUtils.uploadDataset(datasetCityScapes); From f1f7626a23d7c0d87a858d6b96ee91724101bf01 Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Tue, 7 Feb 2023 10:36:49 +0000 Subject: [PATCH 3/3] client deps --- client/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index d745af50..1dd02240 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -9207,9 +9207,9 @@ "dev": true }, "http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", "dev": true }, "http-deceiver": {