Merge branch 'integration-test-new' into dev/setup-refactor

.github/workflows/integration-test.yml

@@ -29,7 +29,7 @@ jobs:
           ~/.nn_meter
           /home/runner/work/nn-Meter/data/testmodels
           /opt/hostedtoolcache/Python/3.6.10/x64/lib/python3.6/site-packages
-        key: Data-${{hashFiles('nn_meter/configs/predictors.yaml')}}-${{hashFiles('tests/integration_test.py')}}
+        key: ${{hashFiles('nn_meter/configs/predictors.yaml')}}-${{hashFiles('tests/integration_test.py')}}
 
     - name: Install dependencies
       if: steps.cache.outputs.cache-hit != 'true'

.github/workflows/integration-test_nni_based_torch.yml

@@ -28,20 +28,13 @@ jobs:
         path: |
           ~/.nn_meter
           /home/runner/work/nn-Meter/data/testmodels
-          /opt/hostedtoolcache/Python/3.6.10/x64/lib/python3.6/site-packages
-        key: Data-${{hashFiles('nn_meter/configs/predictors.yaml')}}-${{hashFiles('tests/integration_test.py')}}
+        key: ${{hashFiles('nn_meter/configs/predictors.yaml')}}-${{hashFiles('tests/integration_test.py')}}
 
     - name: Install dependencies
-      if: steps.cache.outputs.cache-hit != 'true'
       run: |
-        pip install tensorflow==1.15.0
-        pip install onnx==1.9.0
         pip install torch==1.9.0
         pip install torchvision==0.10.0
-        pip install onnx-simplifier
-    
-    - name: Install nni
-      run: pip install nni==2.4
+        pip install --extra-index-url https://test.pypi.org/simple/ nni==2.5b1
 
     - name: Install nn-Meter
       run: pip install -U .

.github/workflows/integration-test_onnx_based_torch.yml

@@ -28,13 +28,10 @@ jobs:
         path: |
           ~/.nn_meter
           /home/runner/work/nn-Meter/data/testmodels
-          /opt/hostedtoolcache/Python/3.6.10/x64/lib/python3.6/site-packages
-        key: Data-${{hashFiles('nn_meter/configs/predictors.yaml')}}-${{hashFiles('tests/integration_test.py')}}
+        key: ${{hashFiles('nn_meter/configs/predictors.yaml')}}-${{hashFiles('tests/integration_test.py')}}
 
     - name: Install dependencies
-      if: steps.cache.outputs.cache-hit != 'true'
       run: |
-        pip install tensorflow==1.15.0
         pip install onnx==1.9.0
         pip install torch==1.9.0
         pip install torchvision==0.10.0

tests/data/reference_result_nni_based_torch.txt

@@ -4,8 +4,9 @@ alexnet, torch, cortexA76cpu_tflite21, 1.0, 96.4224
 vgg16, torch, cortexA76cpu_tflite21, 1.0, 1668.2214
 squeezenet, torch, cortexA76cpu_tflite21, 1.0, 98.3081
 inception_v3, torch, cortexA76cpu_tflite21, 1.0, 574.2512
+googlenet, torch, cortexA76cpu_tflite21, 1.0, 165.6168
 shufflenet_v2, torch, cortexA76cpu_tflite21, 1.0, 18.6808
-mobilenet_v2, torch, cortexA76cpu_tflite21, 1.0, 14.7444
+mobilenet_v2, torch, cortexA76cpu_tflite21, 1.0, 43.8198
 resnext50_32x4d, torch, cortexA76cpu_tflite21, 1.0, 1217.2226
 wide_resnet50_2, torch, cortexA76cpu_tflite21, 1.0, 1217.2226
 mnasnet, torch, cortexA76cpu_tflite21, 1.0, 45.6597
@@ -14,8 +15,9 @@ alexnet, torch, adreno640gpu_tflite21, 1.0, 13.1131
 vgg16, torch, adreno640gpu_tflite21, 1.0, 219.2417
 squeezenet, torch, adreno640gpu_tflite21, 1.0, 18.6742
 inception_v3, torch, adreno640gpu_tflite21, 1.0, 127.1236
+googlenet, torch, adreno640gpu_tflite21, 1.0, 31.9394
 shufflenet_v2, torch, adreno640gpu_tflite21, 1.0, 5.4239
-mobilenet_v2, torch, adreno640gpu_tflite21, 1.0, 4.0682
+mobilenet_v2, torch, adreno640gpu_tflite21, 1.0, 9.9207
 resnext50_32x4d, torch, adreno640gpu_tflite21, 1.0, 230.961
 wide_resnet50_2, torch, adreno640gpu_tflite21, 1.0, 230.961
 mnasnet, torch, adreno640gpu_tflite21, 1.0, 11.6306
@@ -24,8 +26,9 @@ alexnet, torch, adreno630gpu_tflite21, 1.0, 16.8274
 vgg16, torch, adreno630gpu_tflite21, 1.0, 286.5241
 squeezenet, torch, adreno630gpu_tflite21, 1.0, 21.095
 inception_v3, torch, adreno630gpu_tflite21, 1.0, 158.4961
+googlenet, torch, adreno630gpu_tflite21, 1.0, 37.1555
 shufflenet_v2, torch, adreno630gpu_tflite21, 1.0, 5.5792
-mobilenet_v2, torch, adreno630gpu_tflite21, 1.0, 3.6944
+mobilenet_v2, torch, adreno630gpu_tflite21, 1.0, 9.9861
 resnext50_32x4d, torch, adreno630gpu_tflite21, 1.0, 277.2564
 wide_resnet50_2, torch, adreno630gpu_tflite21, 1.0, 277.2564
 mnasnet, torch, adreno630gpu_tflite21, 1.0, 11.7263
@@ -34,8 +37,9 @@ alexnet, torch, myriadvpu_openvino2019r2, 1.0, 20.7448
 vgg16, torch, myriadvpu_openvino2019r2, 1.0, 211.2459
 squeezenet, torch, myriadvpu_openvino2019r2, 1.0, 11.0523
 inception_v3, torch, myriadvpu_openvino2019r2, 1.0, 55.1047
+googlenet, torch, myriadvpu_openvino2019r2, 1.0, 15.8047
 shufflenet_v2, torch, myriadvpu_openvino2019r2, 1.0, 8.332
-mobilenet_v2, torch, myriadvpu_openvino2019r2, 1.0, 2.7665
+mobilenet_v2, torch, myriadvpu_openvino2019r2, 1.0, 22.0187
 resnext50_32x4d, torch, myriadvpu_openvino2019r2, 1.0, 122.7097
 wide_resnet50_2, torch, myriadvpu_openvino2019r2, 1.0, 122.7097
 mnasnet, torch, myriadvpu_openvino2019r2, 1.0, 24.3526