clean-up

megvii-research · Nov 24, 2022 · b022b39 · b022b39
1 parent 8299d9d
commit b022b39
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/sparsebit/quantization/tools/calibration.py b/sparsebit/quantization/tools/calibration.py
@@ -82,13 +82,8 @@ def feature_layerwise_calibration(self, device):
                 for inp_node in node.all_input_nodes:
                     inp_tensors = self.builder.storage.get_output(inp_node.target)
                     for inp_tensor in inp_tensors:
-<<<<<<< HEAD
                         if isinstance(inp_tensor, torch.Tensor):
                             module.input_quantizer.update_observer(inp_tensor)
-=======
-                        module.input_quantizer.update_observer(inp_tensor)
-                    break #only take first input of operator into consideration
->>>>>>> ac38fea... WIP
                 module.input_quantizer.calc_qparams()
                 module.input_quantizer.observer.data_cache.reset()