onnxslim 0.1.73__py3-none-any.whl → 0.1.75__py3-none-any.whl

onnxslim/core/pattern/fusion/convbn.py

@@ -36,21 +36,21 @@ class ConvBatchNormMatcher(PatternMatcher):
             bn_bias = bn_node.inputs[2].values
             bn_running_mean = bn_node.inputs[3].values
             bn_running_var = bn_node.inputs[4].values
-            bn_eps = bn_node.attrs["epsilon"]
+            bn_eps = bn_node.attrs.get("epsilon", 1.0e-5)
 
             if len(conv_transpose_node.inputs) == 2:
                 conv_transpose_bias = np.zeros_like(bn_running_mean)
             else:
                 conv_transpose_bias = conv_transpose_node.inputs[2].values
 
-            bn_var_rsqrt = 1.0 / np.sqrt(bn_running_var + bn_eps)
+            bn_var_rsqrt = bn_scale / np.sqrt(bn_running_var + bn_eps)
             shape = [1] * len(conv_transpose_weight.shape)
             if bn_node.i(0).op == "Conv":
                 shape[0] = -1
             else:
                 shape[1] = -1
-            conv_w = conv_transpose_weight * (bn_scale * bn_var_rsqrt).reshape(shape)
-            conv_b = (conv_transpose_bias - bn_running_mean) * bn_var_rsqrt * bn_scale + bn_bias
+            conv_w = conv_transpose_weight * bn_var_rsqrt.reshape(shape)
+            conv_b = (conv_transpose_bias - bn_running_mean) * bn_var_rsqrt + bn_bias
 
             inputs = []
             inputs.append(next(iter(conv_transpose_node.inputs)))

onnxslim/core/pattern/fusion/padconv.py

@@ -68,9 +68,10 @@ class PadConvMatcher(PatternMatcher):
                         pad_node.inputs.clear()
                         pad_node.outputs.clear()
 
-                    conv_pads = attrs["pads"]
                     pads = pad_value[2:conv_weight_dim] + pad_value[conv_weight_dim + 2 :]
-                    pads = [pad + conv_pad for pad, conv_pad in zip(pads, conv_pads)]
+                    if hasattr(attrs, "pads"):
+                        conv_pads = attrs["pads"]
+                        pads = [pad + conv_pad for pad, conv_pad in zip(pads, conv_pads)]
 
                     attrs["pads"] = pads
                     match_case[conv_node.name] = {

onnxslim/third_party/symbolic_shape_infer.py

@@ -359,6 +359,7 @@ class SymbolicShapeInference:
                 for i in self.out_mp_.graph.initializer
             }
         )
+        self.known_vi_.update({i.name: i for i in list(self.out_mp_.graph.output)})
 
     def _merge_symbols(self, dims):
         """Merge dimension symbols, handling automatic merging and validation of symbolic dimensions."""
@@ -532,6 +533,7 @@ class SymbolicShapeInference:
             initializers = []
             if (get_opset(self.out_mp_) >= 9) and (
                 node.op_type == "Unsqueeze" or node.op_type == "ReduceMax" or node.op_type == "ReduceMean"
+                or node.op_type == "DFT" or node.op_type == "ReduceL2" or node.op_type == "ReduceMin"
             ):
                 initializers = [
                     self.initializers_[name]
@@ -581,9 +583,13 @@ class SymbolicShapeInference:
         for i_o in range(len(node.output)):
             o = node.output[i_o]
             if o:  # skip optional output
+                out = model.graph.output[i_o]
+                if not out.type.WhichOneof("value") and o in self.known_vi_: # if empty and already had
+                    continue
+
                 vi = self.out_mp_.graph.value_info.add()
                 if not skip_infer:
-                    vi.CopyFrom(model.graph.output[i_o])
+                    vi.CopyFrom(out)
                 else:
                     vi.name = o
                 self.known_vi_[o] = vi
@@ -1843,7 +1849,7 @@ class SymbolicShapeInference:
             scales = self._try_get_value(node, 2)
             sizes = self._try_get_value(node, 3)
             if sizes is not None:
-                new_sympy_shape = [sympy.simplify(sympy.floor(s)) for s in sizes]
+                new_sympy_shape = [sympy.simplify(round(s)) for s in sizes]
                 self._update_computed_dims(new_sympy_shape)
             elif scales is not None:
                 rank = len(scales)
@@ -1859,7 +1865,7 @@ class SymbolicShapeInference:
                 else:
                     scales = list(scales)
                 new_sympy_shape = [
-                    (sympy.floor(d * (end - start) * scale))
+                    (round(d * (end - start) * scale))
                     for d, start, end, scale in zip(input_sympy_shape, roi_start, roi_end, scales)
                 ]
                 self._update_computed_dims(new_sympy_shape)

onnxslim/version.py

@@ -1 +1 @@
-__version__ = "0.1.73"
+__version__ = "0.1.75"

{onnxslim-0.1.73.dist-info → onnxslim-0.1.75.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnxslim
-Version: 0.1.73
+Version: 0.1.75
 Summary: OnnxSlim: A Toolkit to Help Optimize Onnx Model
 Home-page: https://github.com/inisis/OnnxSlim
 Author: inisis
@@ -36,7 +36,7 @@ Dynamic: summary
 
 <p align="center">
     <a href="https://pypi.org/project/onnxslim">
-        <img src="https://badgen.net/pypi/v/onnxslim?color=blue" />
+        <img src="https://img.shields.io/pypi/v/onnxslim?color=blue" />
     </a>
     <a href="https://pypi.org/project/onnxslim">
         <img src="https://static.pepy.tech/badge/onnxslim/week" />
@@ -131,6 +131,7 @@ For more usage, see onnxslim -h or refer to our [examples](./examples)
 - <img src="https://avatars.githubusercontent.com/u/126587470?s=48&v=4" width="22" height="22"/>[deepghs/imgutils](https://github.com/deepghs/imgutils)
 - <img src="https://avatars.githubusercontent.com/u/48153283?s=48&v=4" width="22" height="22"/>[sunsmarterjie/yolov12](https://github.com/sunsmarterjie/yolov12)
 - <img src="https://avatars.githubusercontent.com/u/147458884?s=48&v=4" width="22" height="22"/>[nndeploy/nndeploy](https://github.com/nndeploy/nndeploy)
+- <img src="https://avatars.githubusercontent.com/u/111754012?s=48&v=4" width="22" height="22"/>[CVCUDA/CV-CUDA](https://github.com/CVCUDA/CV-CUDA)
 
 # References
 

{onnxslim-0.1.73.dist-info → onnxslim-0.1.75.dist-info}/RECORD

@@ -2,7 +2,7 @@ onnxslim/__init__.py,sha256=ECHGdxzg4b-4SZaPhxM_KulBi-xDbVcVUbpJc8i6a60,571
 onnxslim/__main__.py,sha256=FgDcl6xX8kV_52rB-jPVsmGqidlVhkpe_YhXK75-nFU,75
 onnxslim/argparser.py,sha256=pFv3nEZH2BiHO9ejS4Iq5ZuZ3GrpdyRQJypAyR0xF7w,8942
 onnxslim/utils.py,sha256=Z39vRKAtD7o18NFbf3Qrws9xDg81uBJ9F-RYEFAfqM8,28095
-onnxslim/version.py,sha256=B2xptQoAZtCL_O_fLMSWF71JDtlCZp8jLmdtHyMdosE,23
+onnxslim/version.py,sha256=FJWQjdyjCSq1G0xvL-leZBsVKT8Trwi_Y3BZDT0-Bus,23
 onnxslim/cli/__init__.py,sha256=kxK27cDgWotBOWRs86rbRQf_dtmniKr1GZJeasxfESE,42
 onnxslim/cli/_main.py,sha256=jEKv9q7y_y9g0GsrfXcnk_wyMVej6jhe9QNPChE7yTs,5550
 onnxslim/core/__init__.py,sha256=uDg-Eu29Ezb3txwZf5mN0zQRVuqF-K9BvktE8WBYS4E,8825
@@ -21,16 +21,16 @@ onnxslim/core/pattern/elimination/unsqueeze.py,sha256=v7Rin3qB6F49ETrxXWEQQxUgtl
 onnxslim/core/pattern/fusion/__init__.py,sha256=3ajHvRurL7WHL4tfNsBoLQh6Sq2fyiqH-VsPuftYMGg,183
 onnxslim/core/pattern/fusion/concat_reshape.py,sha256=LvknixTAsSUqUkGSuoEA1QpC-TmBrsx6AHZoeT0gTbI,1615
 onnxslim/core/pattern/fusion/convadd.py,sha256=P1GI7hJAHgDBO17aDDghNxMEhWkFIcqGLIfnpTMGhWk,2432
-onnxslim/core/pattern/fusion/convbn.py,sha256=1wI0nPCRj_3y2Ozortrm6gGDvy6qwH6CwHlyYLl_lRI,3340
+onnxslim/core/pattern/fusion/convbn.py,sha256=696Ev3X9-G2eQbnSqpqkQQeWG8Lrb-3elpQiOQ6MAXE,3333
 onnxslim/core/pattern/fusion/convmul.py,sha256=W2C6H3kWSDUg0he0jfR4tXI5GMi7gsyylQR4aSh-rik,2581
 onnxslim/core/pattern/fusion/gelu.py,sha256=uR67AJ_tL1gboY6VsTdqajHxW3Pbu656UMhCe1mQZDY,1469
 onnxslim/core/pattern/fusion/gemm.py,sha256=Ti9yZAfEprFRvW1FiAD0zvewELOJbRjposIk3yjjXfQ,12928
-onnxslim/core/pattern/fusion/padconv.py,sha256=O2DtY1XxP7-3k3vRBRPiNh4TuAyFW1n1-mPebwMdcXc,3597
+onnxslim/core/pattern/fusion/padconv.py,sha256=eOutev5rOrHuyyw-BRIFzMjcvu9MxXj73kY215GaeG8,3652
 onnxslim/core/pattern/fusion/reduce.py,sha256=dMC7CPlFglrJxugsJWjcc-jQCIa_GIbW1y9K2FRvvcE,2755
 onnxslim/misc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onnxslim/misc/tabulate.py,sha256=Pg5uU0UP18HbwG-c8LlA82LbIb_5JWQeuIB1AnturbM,99695
 onnxslim/third_party/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-onnxslim/third_party/symbolic_shape_infer.py,sha256=KbdxXuRnjhj1vJGDR4SCIwq-sdUKPsSnc0ZrzAtaQ8s,152390
+onnxslim/third_party/symbolic_shape_infer.py,sha256=lMqHUSC1c6J3j_cLC5264RxvJrhV8rrephsxE4d-4Zc,152724
 onnxslim/third_party/_sympy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onnxslim/third_party/_sympy/functions.py,sha256=s3pKzyjYCKnvlddLFR_H8UmbbcdMB51PRxqhe9zGI9E,8876
 onnxslim/third_party/_sympy/numbers.py,sha256=w1dJJcQkKRzLDCJMn70YTwPtrEWPFrhCJpAsZhukJOk,11383
@@ -56,10 +56,10 @@ onnxslim/third_party/onnx_graphsurgeon/logger/logger.py,sha256=L12rrwn33RHH-2WLv
 onnxslim/third_party/onnx_graphsurgeon/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onnxslim/third_party/onnx_graphsurgeon/util/exception.py,sha256=KrsHbKEQ4237UbjlODsUzvkXoAY72LZi23ApBeFANWg,786
 onnxslim/third_party/onnx_graphsurgeon/util/misc.py,sha256=kyxInD2SCRLU4wHMeiDEYEHB3871fGks6kQTuF9uATY,8960
-onnxslim-0.1.73.dist-info/licenses/LICENSE,sha256=oHZXw-yrBwdNVGu4JtlZhMgmQHKIZ7BJJlJdhu1HKvI,1062
-onnxslim-0.1.73.dist-info/METADATA,sha256=NZ6PTQNwmexVWSCO0kplgCbKwpG13zfFmCKeqAyxJSk,7621
-onnxslim-0.1.73.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-onnxslim-0.1.73.dist-info/entry_points.txt,sha256=O2QgceCVeGeRhnxRSDRcGiFd0ZNfElwrTiRo1W2V7KA,47
-onnxslim-0.1.73.dist-info/top_level.txt,sha256=EWFTb99i0kc6cC9akqNKp88ipzg17_VZzYN7z1kQNlA,9
-onnxslim-0.1.73.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-onnxslim-0.1.73.dist-info/RECORD,,
+onnxslim-0.1.75.dist-info/licenses/LICENSE,sha256=oHZXw-yrBwdNVGu4JtlZhMgmQHKIZ7BJJlJdhu1HKvI,1062
+onnxslim-0.1.75.dist-info/METADATA,sha256=g6eZ9ALOW_kVXS-7OHcD_DDIpAWYClDye_oNQdRazM8,7773
+onnxslim-0.1.75.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+onnxslim-0.1.75.dist-info/entry_points.txt,sha256=O2QgceCVeGeRhnxRSDRcGiFd0ZNfElwrTiRo1W2V7KA,47
+onnxslim-0.1.75.dist-info/top_level.txt,sha256=EWFTb99i0kc6cC9akqNKp88ipzg17_VZzYN7z1kQNlA,9
+onnxslim-0.1.75.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+onnxslim-0.1.75.dist-info/RECORD,,