diff --git a/.github/workflows/mo-pylint.yml b/.github/workflows/mo.yml similarity index 73% rename from .github/workflows/mo-pylint.yml rename to .github/workflows/mo.yml index 886169e41da..c3eee39f946 100644 --- a/.github/workflows/mo-pylint.yml +++ b/.github/workflows/mo.yml @@ -1,4 +1,4 @@ -name: Pylint +name: MO on: push: paths: @@ -6,8 +6,9 @@ on: pull_request: paths: - 'model-optimizer/**' + jobs: - MO: + Pylint & UT: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -31,11 +32,24 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools + # For Pylint pip install tensorflow==1.14.0 tensorboard==1.14.0 tensorflow-estimator==1.14.0 + # For UT + pip install unittest-xml-reporting==3.0.2 + # MO requirements pip install -r requirements.txt pip install -r requirements_dev.txt working-directory: model-optimizer - - name: Run pylint + - name: Pylint run: pylint -d C,R,W mo/ mo.py extensions/ working-directory: model-optimizer + + - name: UT + run: | + export PYTHONPATH=$PYTHONPATH:`pwd` + export MO_ROOT=`pwd` + env + mkdir ../mo-ut-logs + python3 -m xmlrunner discover -p *_test.py --output=../mo-ut-logs + working-directory: model-optimizer diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8fa5354e985..0d87895498e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,28 +1,4 @@ jobs: - -# MO_UT -- job: MO_UT - timeoutInMinutes: 0 - pool: - vmImage: 'ubuntu-18.04' - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.6' - - script: | - cd model-optimizer - mkdir ../mo-ut-logs - python3 -m pip install setuptools - python3 -m pip install unittest-xml-reporting - python3 -m pip install -r requirements.txt - python3 -m pip install -r requirements_dev.txt - export PYTHONPATH=$PYTHONPATH:`pwd` - export MO_ROOT=`pwd` - env - python3 -m xmlrunner discover -p *_test.py --output=../mo-ut-logs - displayName: 'MO UT' - -# Lin - job: Lin timeoutInMinutes: 0 pool: @@ -65,57 +41,56 @@ jobs: - script: ../bin/intel64/$(BUILD_TYPE)/unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU* workingDirectory: dldt-build displayName: 'nGraph UT' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/InferenceEngineUnitTests workingDirectory: dldt-build displayName: 'IE UT old' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/ieUnitTests workingDirectory: dldt-build displayName: 'IE UT' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/cpuUnitTests workingDirectory: dldt-build displayName: 'CPU UT' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/gnaUnitTests workingDirectory: dldt-build displayName: 'GNA UT' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/vpuUnitTests workingDirectory: dldt-build displayName: 'VPU UT' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/ieFuncTests workingDirectory: dldt-build displayName: 'IE FuncTests' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/cpuFuncTests workingDirectory: dldt-build displayName: 'CPU FuncTests' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/MklDnnBehaviorTests workingDirectory: dldt-build displayName: 'MklDnnBehaviorTests' - continueOnError: true + continueOnError: false - script: git clone https://github.com/openvinotoolkit/testdata.git displayName: 'Clone testdata' - script: | export DATA_PATH=`pwd`/../testdata export MODELS_PATH=`pwd`/../testdata - ../bin/intel64/$(BUILD_TYPE)/MklDnnFunctionalTests + ../bin/intel64/$(BUILD_TYPE)/MklDnnFunctionalTests --gtest_filter=-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* workingDirectory: dldt-build displayName: 'MklDnnFunctionalTests' - continueOnError: true + continueOnError: false - script: | export DATA_PATH=`pwd`/../testdata export MODELS_PATH=`pwd`/../testdata ../bin/intel64/$(BUILD_TYPE)/InferenceEngineCAPITests workingDirectory: dldt-build displayName: 'IE CAPITests' - continueOnError: true + continueOnError: false -# Mac - job: Mac timeoutInMinutes: 0 pool: @@ -161,53 +136,52 @@ jobs: - script: ../bin/intel64/$(BUILD_TYPE)/unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU*:IE_CPU.onnx_model_sigmoid workingDirectory: dldt-build displayName: 'nGraph UT' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/InferenceEngineUnitTests workingDirectory: dldt-build displayName: 'IE UT old' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/ieUnitTests workingDirectory: dldt-build displayName: 'IE UT' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/cpuUnitTests workingDirectory: dldt-build displayName: 'CPU UT' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/vpuUnitTests workingDirectory: dldt-build displayName: 'VPU UT' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/ieFuncTests workingDirectory: dldt-build displayName: 'IE FuncTests' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/cpuFuncTests workingDirectory: dldt-build displayName: 'CPU FuncTests' - continueOnError: true + continueOnError: false - script: ../bin/intel64/$(BUILD_TYPE)/MklDnnBehaviorTests workingDirectory: dldt-build displayName: 'MklDnnBehaviorTests' - continueOnError: true + continueOnError: false - script: git clone https://github.com/openvinotoolkit/testdata.git displayName: 'Clone testdata' - script: | export DATA_PATH=`pwd`/../testdata export MODELS_PATH=`pwd`/../testdata - ../bin/intel64/$(BUILD_TYPE)/MklDnnFunctionalTests --gtest_filter=-*smoke_SingleLayerTransformationsTestFP16/SingleLayerTransformationsTest.LPT/PoolingTestModel*:*smoke_Inception/ModelTransformationsTest.LPT/inception_v3_tf_batch1_inPluginDisabled_inTestDisabled_asymmetric* + ../bin/intel64/$(BUILD_TYPE)/MklDnnFunctionalTests --gtest_filter=-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* workingDirectory: dldt-build displayName: 'MklDnnFunctionalTests' - continueOnError: true + continueOnError: false - script: | export DATA_PATH=`pwd`/../testdata export MODELS_PATH=`pwd`/../testdata ../bin/intel64/$(BUILD_TYPE)/InferenceEngineCAPITests workingDirectory: dldt-build displayName: 'IE CAPITests' - continueOnError: true + continueOnError: false -# Win - job: Win timeoutInMinutes: 0 pool: @@ -247,55 +221,55 @@ jobs: ..\bin\intel64\$(BUILD_TYPE)\unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU* workingDirectory: dldt-build displayName: 'nGraph UT' - continueOnError: true + continueOnError: false - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% ..\bin\intel64\$(BUILD_TYPE)\InferenceEngineUnitTests workingDirectory: dldt-build displayName: 'IE UT old' - continueOnError: true + continueOnError: false - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% ..\bin\intel64\$(BUILD_TYPE)\ieUnitTests workingDirectory: dldt-build displayName: 'IE UT' - continueOnError: true + continueOnError: false - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% ..\bin\intel64\$(BUILD_TYPE)\cpuUnitTests workingDirectory: dldt-build displayName: 'CPU UT' - continueOnError: true + continueOnError: false - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% ..\bin\intel64\$(BUILD_TYPE)\gnaUnitTests workingDirectory: dldt-build displayName: 'GNA UT' - continueOnError: true + continueOnError: false - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% ..\bin\intel64\$(BUILD_TYPE)\vpuUnitTests workingDirectory: dldt-build displayName: 'VPU UT' - continueOnError: true + continueOnError: false - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% ..\bin\intel64\$(BUILD_TYPE)\ieFuncTests workingDirectory: dldt-build displayName: 'IE FuncTests' - continueOnError: true - - script: | - set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% - ..\bin\intel64\$(BUILD_TYPE)\cpuFuncTests - workingDirectory: dldt-build - displayName: 'CPU FuncTests' - continueOnError: true + continueOnError: false +# - script: | +# set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% +# ..\bin\intel64\$(BUILD_TYPE)\cpuFuncTests +# workingDirectory: dldt-build +# displayName: 'CPU FuncTests' +# continueOnError: false - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% ..\bin\intel64\$(BUILD_TYPE)\MklDnnBehaviorTests workingDirectory: dldt-build displayName: 'MklDnnBehaviorTests' - continueOnError: true + continueOnError: false - script: git clone https://github.com/openvinotoolkit/testdata.git workingDirectory: $(BUILD_DIR) displayName: 'Clone testdata' @@ -303,10 +277,10 @@ jobs: set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;$(Build.Repository.LocalPath)\inference-engine\temp\opencv_4.3.0\opencv\bin;%PATH% set DATA_PATH=$(BUILD_DIR)\testdata set MODELS_PATH=$(BUILD_DIR)\testdata - ..\bin\intel64\$(BUILD_TYPE)\MklDnnFunctionalTests + ..\bin\intel64\$(BUILD_TYPE)\MklDnnFunctionalTests --gtest_filter=-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* workingDirectory: dldt-build displayName: 'MklDnnFunctionalTests' - continueOnError: true + continueOnError: false - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;$(Build.Repository.LocalPath)\inference-engine\temp\opencv_4.3.0\opencv\bin;%PATH% set DATA_PATH=$(BUILD_DIR)\testdata @@ -314,4 +288,4 @@ jobs: ..\bin\intel64\$(BUILD_TYPE)\InferenceEngineCAPITests workingDirectory: dldt-build displayName: 'IE CAPITests' - continueOnError: true + continueOnError: false diff --git a/model-optimizer/del_me.txt b/model-optimizer/del_me.txt new file mode 100644 index 00000000000..6f670c0fb53 --- /dev/null +++ b/model-optimizer/del_me.txt @@ -0,0 +1 @@ +test 1