Fix integration tests (#2234)

microsoft · Mar 25, 2020 · c2e4901 · c2e4901
1 parent 4e2c0aa
commit c2e4901
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 37 deletions.
diff --git a/examples/model_compress/model_prune_torch.py b/examples/model_compress/model_prune_torch.py
@@ -53,7 +53,7 @@
             'op_types': ['Conv2d']
         }]
     },
-    'l1': {
+    'l1filter': {
         'dataset_name': 'cifar10',
         'model_name': 'vgg16',
         'pruner_class': L1FilterPruner,

diff --git a/test/config/integration_tests.yml b/test/config/integration_tests.yml
@@ -77,16 +77,15 @@ testCases:
     kwargs:
       expected_result_file: expected_metrics.json
 
-# to be enabled
-#- name: metrics-dict
-#  configFile: test/config/metrics_test/config_dict_metrics.yml
-#  config:
-#    maxTrialNum: 1
-#    trialConcurrency: 1
-#  validator:
-#    class: MetricsValidator
-#    kwargs:
-#      expected_result_file: expected_metrics_dict.json
+- name: metrics-dict
+  configFile: test/config/metrics_test/config_dict_metrics.yml
+  config:
+    maxTrialNum: 1
+    trialConcurrency: 1
+  validator:
+    class: MetricsValidator
+    kwargs:
+      expected_result_file: expected_metrics_dict.json
 
 - name: nnicli
   configFile: test/config/examples/sklearn-regression.yml

diff --git a/test/config/pr_tests.yml b/test/config/pr_tests.yml
@@ -31,16 +31,15 @@ testCases:
     kwargs:
       expected_result_file: expected_metrics.json
 
-# to be enabled
-#- name: metrics-dict
-#  configFile: test/config/metrics_test/config_dict_metrics.yml
-#  config:
-#    maxTrialNum: 1
-#    trialConcurrency: 1
-#  validator:
-#    class: MetricsValidator
-#    kwargs:
-#      expected_result_file: expected_metrics_dict.json
+- name: metrics-dict
+  configFile: test/config/metrics_test/config_dict_metrics.yml
+  config:
+    maxTrialNum: 1
+    trialConcurrency: 1
+  validator:
+    class: MetricsValidator
+    kwargs:
+      expected_result_file: expected_metrics_dict.json
 
 - name: nnicli
   configFile: test/config/examples/sklearn-regression.yml

diff --git a/test/scripts/model_compression.sh b/test/scripts/model_compression.sh
@@ -6,22 +6,14 @@ echo ""
 echo "===========================Testing: pruning and speedup==========================="
 cd ${CWD}/../examples/model_compress
 
-echo "testing slim pruning and speedup..."
-python3 model_prune_torch.py --pruner_name slim --pretrain_epochs 1 --prune_epochs 1
-python3 model_speedup.py --example_name slim --model_checkpoint ./checkpoints/pruned_vgg19_cifar10_slim.pth \
-    --masks_file ./checkpoints/mask_vgg19_cifar10_slim.pth
-
-echo "testing l1 pruning and speedup..."
-python3 model_prune_torch.py --pruner_name l1 --pretrain_epochs 1 --prune_epochs 1
-python3 model_speedup.py --example_name l1filter --model_checkpoint ./checkpoints/pruned_vgg16_cifar10_l1.pth \
-    --masks_file ./checkpoints/mask_vgg16_cifar10_l1.pth
-
-echo "testing apoz pruning and speedup..."
-python3 model_prune_torch.py --pruner_name apoz --pretrain_epochs 1 --prune_epochs 1
-python3 model_speedup.py --example_name apoz --model_checkpoint ./checkpoints/pruned_vgg16_cifar10_apoz.pth \
-    --masks_file ./checkpoints/mask_vgg16_cifar10_apoz.pth
-
-for name in level fpgm mean_activation
+for name in fpgm slim l1filter apoz
+do
+    echo "testing $name pruning and speedup..."
+    python3 model_prune_torch.py --pruner_name $name --pretrain_epochs 1 --prune_epochs 1
+    python3 model_speedup.py --example_name $name
+done
+
+for name in level mean_activation
 do
     echo "testing $name pruning..."
     python3 model_prune_torch.py --pruner_name $name --pretrain_epochs 1 --prune_epochs 1