Merge branch 'master' into xinhe/benchmark

Author: xin3he

.azure-pipelines/docker/Dockerfile.devel

@@ -36,7 +36,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
 
 RUN ln -sf $(which python3) /usr/bin/python
 
-RUN python -m pip --no-cache-dir install --upgrade pip
+RUN python -m pip install pip==24.0
 RUN python -m pip install --no-cache-dir setuptools
 
 RUN pip list

.azure-pipelines/model-test.yml

@@ -57,7 +57,7 @@ parameters:
   - name: PyTorchModelList
     type: object
     default:
-      - resnet18
+#      - resnet18
       - resnet18_fx
   - name: ONNXModelList
     type: object

.github/checkgroup.yml

@@ -51,7 +51,6 @@ subprojects:
       - "Model-Test"
       - "Model-Test (Generate Report GenerateReport)"
       - "Model-Test (Run ONNX Model resnet50-v1-12)"
-      - "Model-Test (Run PyTorch Model resnet18)"
       - "Model-Test (Run PyTorch Model resnet18_fx)"
       - "Model-Test (Run TensorFlow Model resnet50v1.5)"
       - "Model-Test (Run TensorFlow Model ssd_resnet50_v1)"

examples/onnxrt/nlp/huggingface_model/token_classification/layoutlmv2/quantization/ptq_dynamic/main.py

@@ -216,8 +216,6 @@ def _process_dataset(self):
         self.label = []
         self.onnx_inputs = []
         for inputs in self.dataset:
-            # import pdb;
-            # pdb.set_trace()
             onnx_inputs = []
             has_labels = all(inputs.get(k) is not None for k in self.label_names)
             if has_labels:
@@ -237,8 +235,6 @@ def _process_dataset(self):
             }
             """
             for key in self.onnx_input_names:
-                # import pdb;
-                # pdb.set_trace()
                 if key in inputs:
                     # onnx_inputs[key] = np.array([inputs[key]])
                     onnx_inputs.append(np.array(inputs[key]))

examples/onnxrt/nlp/huggingface_model/token_classification/layoutlmv2/quantization/ptq_static/main.py

@@ -216,8 +216,6 @@ def _process_dataset(self):
         self.label = []
         self.onnx_inputs = []
         for inputs in self.dataset:
-            # import pdb;
-            # pdb.set_trace()
             onnx_inputs = []
             has_labels = all(inputs.get(k) is not None for k in self.label_names)
             if has_labels:
@@ -237,8 +235,6 @@ def _process_dataset(self):
             }
             """
             for key in self.onnx_input_names:
-                # import pdb;
-                # pdb.set_trace()
                 if key in inputs:
                     # onnx_inputs[key] = np.array([inputs[key]])
                     onnx_inputs.append(np.array(inputs[key]))

examples/pytorch/object_detection/ssd_resnet34/quantization/ptq/fx/python/models/utils.py

@@ -59,7 +59,6 @@ def _compute_padding(self, input, dim):
         return additional_padding, total_padding
 
     def forward(self, input):
-        #import pdb; pdb.set_trace()
         if self.padding == "VALID":
             return F.conv2d(
                 input,
@@ -180,7 +179,6 @@ def decode_boxes(rel_codes, boxes, weights):
     dh = dh / wh
 
     pred_ctr_x = dx * widths + ctr_x
-    #import pdb; pdb.set_trace()
     pred_ctr_y = dy * heights + ctr_y
     pred_w = torch.exp(dw) * widths
     pred_h = torch.exp(dh) * heights
@@ -194,5 +192,4 @@ def decode_boxes(rel_codes, boxes, weights):
         ],
         dim=2,
     )
-    #import pdb; pdb.set_trace()
     return pred_boxes

neural_coder/coders/tensorflow/amp.py

@@ -22,8 +22,6 @@ def __init__(self, file) -> None:
         self.keras_edited_flag = False
 
     def transform(self):
-        # import pdb
-        # pdb.set_trace()
         lines = self.file.split("\n")
         for line in lines:
             if self.is_modify(line):

neural_coder/coders/tensorflow/inc.py

@@ -21,8 +21,6 @@ def __init__(self, file) -> None:
         self.result = []
 
     def transform(self):
-        # import pdb
-        # pdb.set_trace()
         lines = self.file.split("\n")
         for line in lines:
             if self.is_modify(line):

neural_compressor/adaptor/keras.py

@@ -24,7 +24,6 @@
 import numpy as np
 import yaml
 
-from ..conf.dotdict import deep_get
 from ..data.dataloaders.base_dataloader import BaseDataLoader
 from ..utils import logger
 from ..utils.utility import (
@@ -34,6 +33,7 @@
     Dequantize,
     LazyImport,
     Statistics,
+    deep_get,
     dump_elapsed_time,
     singleton,
     version1_lt_version2,

neural_compressor/adaptor/mxnet.py

@@ -446,13 +446,6 @@ def _one_shot_query(self):
                 raise ValueError(
                     "Please check if the format of {} follows Neural Compressor yaml schema.".format(self.cfg)
                 )
-        self._update_cfg_with_usr_definition()
-
-    def _update_cfg_with_usr_definition(self):
-        from neural_compressor.conf.pythonic_config import mxnet_config
-
-        if mxnet_config.precisions is not None:
-            self.cur_config["precisions"]["names"] = ",".join(mxnet_config.precisions)
 
     def _get_specified_version_cfg(self, data):
         """Get the configuration for the current runtime.