[UT] mv compression ut to full test (#4936)

microsoft · Jun 20, 2022 · 45af1d6 · 45af1d6
1 parent 8978659
commit 45af1d6
Show file tree

Hide file tree

Showing 20 changed files with 17 additions and 15 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -111,6 +111,7 @@
     r'https://1drv\.ms/',                                   # OneDrive (shortcut)
     r'https://onedrive\.live\.com/',                        # OneDrive
     r'https://www\.openml\.org/',                           # OpenML
+    r'https://ml\.informatik\.uni-freiburg\.de/'
 ]
 
 # Ignore all links located in release.rst

diff --git a/pipelines/fast-test.yml b/pipelines/fast-test.yml
@@ -13,7 +13,7 @@ resources:
       endpoint: github-filter-connection
 
 variables:
-  filter.modified.globs: '!.github/**,!docs/**,!examples/**'
+  filter.modified.globs: 'pipelines/fast-test.yml,!.github/**,!docs/**,!examples/**'
   filter.prbody.heading: '#### Test Options'
   filter.prbody.optionIndex: 0
 
@@ -150,15 +150,7 @@ stages:
         set -e
         mkdir -p coverage
         cd test
-        python -m pytest ut --cov-config=.coveragerc \
-          --ignore=ut/compression/v1/test_pruners.py \
-          --ignore=ut/compression/v1/test_compressor_tf.py \
-          --ignore=ut/compression/v1/test_compressor_torch.py \
-          --ignore=ut/compression/v1/test_model_speedup.py
-        python -m pytest ut/compression/v1/test_pruners.py --cov-config=.coveragerc --cov-append
-        python -m pytest ut/compression/v1/test_compressor_tf.py --cov-config=.coveragerc --cov-append
-        python -m pytest ut/compression/v1/test_compressor_torch.py --cov-config=.coveragerc --cov-append
-        python -m pytest ut/compression/v1/test_model_speedup.py --cov-config=.coveragerc --cov-append
+        python -m pytest ut --cov-config=.coveragerc
         cp coverage.xml ../coverage/python.xml
       displayName: Python unit test
 

diff --git a/pipelines/full-test-compression.yml b/pipelines/full-test-compression.yml
@@ -13,7 +13,7 @@ resources:
       endpoint: github-filter-connection
 
 variables:
-  filter.modified.globs: 'examples/model_compress/**,nni/algorithms/compression/**,nni/compression/**'
+  filter.modified.globs: 'examples/model_compress/**,nni/algorithms/compression/**,nni/compression/**,pipelines/full-test-compression.yml,test/algo/compression/**'
   filter.prbody.heading: '#### Test Options'
   filter.prbody.optionIndex: 3
 
@@ -44,6 +44,11 @@ stages:
 
     - template: templates/download-test-data.yml
 
+    - script: |
+        cd test/algo
+        python -m pytest compression
+      displayName: compression unit test
+
     - script: |
         cd test
         source scripts/model_compression.sh

diff --git a/test/ut/compression/__init__.py → test/algo/compression/__init__.py b/test/ut/compression/__init__.py → test/algo/compression/__init__.py
diff --git a/test/ut/compression/v1/__init__.py → test/algo/compression/v1/__init__.py b/test/ut/compression/v1/__init__.py → test/algo/compression/v1/__init__.py
diff --git a/.../compression/v1/test_compression_utils.py → .../compression/v1/test_compression_utils.py b/.../compression/v1/test_compression_utils.py → .../compression/v1/test_compression_utils.py
diff --git a/test/ut/compression/v1/test_compressor_tf.py → ...algo/compression/v1/test_compressor_tf.py b/test/ut/compression/v1/test_compressor_tf.py → ...algo/compression/v1/test_compressor_tf.py
diff --git a/...t/compression/v1/test_compressor_torch.py → ...o/compression/v1/test_compressor_torch.py b/...t/compression/v1/test_compressor_torch.py → ...o/compression/v1/test_compressor_torch.py
diff --git a/...ut/compression/v1/test_dependecy_aware.py → ...go/compression/v1/test_dependecy_aware.py b/...ut/compression/v1/test_dependecy_aware.py → ...go/compression/v1/test_dependecy_aware.py
diff --git a/test/ut/compression/v1/test_model_speedup.py → ...algo/compression/v1/test_model_speedup.py b/test/ut/compression/v1/test_model_speedup.py → ...algo/compression/v1/test_model_speedup.py
diff --git a/test/ut/compression/v1/test_pruners.py → test/algo/compression/v1/test_pruners.py b/test/ut/compression/v1/test_pruners.py → test/algo/compression/v1/test_pruners.py
@@ -15,8 +15,8 @@
     TaylorFOWeightFilterPruner, NetAdaptPruner, SimulatedAnnealingPruner, ADMMPruner, \
     AutoCompressPruner, AMCPruner
 
-sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
-from sdk.models.pytorch_models.mobilenet import MobileNet
+sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))))
+from ut.sdk.models.pytorch_models.mobilenet import MobileNet
 
 def validate_sparsity(wrapper, sparsity, bias=False):
     masks = [wrapper.weight_mask]

diff --git a/...ompression/v1/test_transformer_pruners.py → ...ompression/v1/test_transformer_pruners.py b/...ompression/v1/test_transformer_pruners.py → ...ompression/v1/test_transformer_pruners.py
@@ -13,8 +13,8 @@
 
 from nni.algorithms.compression.pytorch.pruning import TransformerHeadPruner
 
-sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
-from sdk.models.pytorch_models.transformer import TransformerEncoder
+sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))))
+from ut.sdk.models.pytorch_models.transformer import TransformerEncoder
 
 
 def validate_sparsity(wrapper, sparsity, bias=False):

diff --git a/test/ut/compression/v2/__init__.py → test/algo/compression/v2/__init__.py b/test/ut/compression/v2/__init__.py → test/algo/compression/v2/__init__.py
diff --git a/...ression/v2/test_iterative_pruner_torch.py → ...ression/v2/test_iterative_pruner_torch.py b/...ression/v2/test_iterative_pruner_torch.py → ...ression/v2/test_iterative_pruner_torch.py
diff --git a/test/ut/compression/v2/test_pruner_torch.py → .../algo/compression/v2/test_pruner_torch.py b/test/ut/compression/v2/test_pruner_torch.py → .../algo/compression/v2/test_pruner_torch.py
diff --git a/...ompression/v2/test_pruning_tools_torch.py → ...ompression/v2/test_pruning_tools_torch.py b/...ompression/v2/test_pruning_tools_torch.py → ...ompression/v2/test_pruning_tools_torch.py
diff --git a/...ut/compression/v2/test_pruning_wrapper.py → ...go/compression/v2/test_pruning_wrapper.py b/...ut/compression/v2/test_pruning_wrapper.py → ...go/compression/v2/test_pruning_wrapper.py
diff --git a/test/ut/compression/v2/test_scheduler.py → test/algo/compression/v2/test_scheduler.py b/test/ut/compression/v2/test_scheduler.py → test/algo/compression/v2/test_scheduler.py
diff --git a/.../ut/compression/v2/test_task_generator.py → ...lgo/compression/v2/test_task_generator.py b/.../ut/compression/v2/test_task_generator.py → ...lgo/compression/v2/test_task_generator.py
diff --git a/test/ut/conftest.py b/test/ut/conftest.py
@@ -0,0 +1,4 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+# NOTE: Don't remove this file. This file ensures that `../ut/__init__.py` is loaded first.