From 5eb8bd913ac5ee79a49fefdf195c4080d409f4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20KUBLER?= <gregoire.kubler@proton.me> Date: Mon, 5 Aug 2024 12:46:06 +0200 Subject: [PATCH] chore : simplified syntax --- aidge_onnx/node_export/aidge_converters/add.py | 2 +- aidge_onnx/node_export/aidge_converters/average_pool.py | 2 +- aidge_onnx/node_export/aidge_converters/batchnorm.py | 2 +- aidge_onnx/node_export/aidge_converters/concat.py | 2 +- aidge_onnx/node_export/aidge_converters/conv.py | 2 +- aidge_onnx/node_export/aidge_converters/erf.py | 2 +- aidge_onnx/node_export/aidge_converters/fc.py | 2 +- aidge_onnx/node_export/aidge_converters/gather.py | 2 +- aidge_onnx/node_export/aidge_converters/globalaveragepooling.py | 2 +- aidge_onnx/node_export/aidge_converters/identity.py | 2 +- aidge_onnx/node_export/aidge_converters/maxpooling.py | 2 +- aidge_onnx/node_export/aidge_converters/mul.py | 2 +- aidge_onnx/node_export/aidge_converters/padded_avgpooling.py | 2 +- aidge_onnx/node_export/aidge_converters/padded_conv.py | 2 +- aidge_onnx/node_export/aidge_converters/padded_convdw.py | 2 +- aidge_onnx/node_export/aidge_converters/padded_maxpooling.py | 2 +- aidge_onnx/node_export/aidge_converters/producer.py | 2 +- aidge_onnx/node_export/aidge_converters/reducemean.py | 2 +- aidge_onnx/node_export/aidge_converters/relu.py | 2 +- aidge_onnx/node_export/aidge_converters/reshape.py | 2 +- aidge_onnx/node_export/aidge_converters/slice.py | 2 +- aidge_onnx/node_export/aidge_converters/softmax.py | 2 +- aidge_onnx/node_export/aidge_converters/squeeze.py | 2 +- aidge_onnx/node_export/aidge_converters/sub.py | 2 +- aidge_onnx/node_export/aidge_converters/unsqueeze.py | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/aidge_onnx/node_export/aidge_converters/add.py b/aidge_onnx/node_export/aidge_converters/add.py index 40e6d44..7008744 100644 --- a/aidge_onnx/node_export/aidge_converters/add.py +++ b/aidge_onnx/node_export/aidge_converters/add.py @@ -21,7 +21,7 @@ def export_add( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() diff --git a/aidge_onnx/node_export/aidge_converters/average_pool.py b/aidge_onnx/node_export/aidge_converters/average_pool.py index 16873e1..09814dd 100644 --- a/aidge_onnx/node_export/aidge_converters/average_pool.py +++ b/aidge_onnx/node_export/aidge_converters/average_pool.py @@ -21,7 +21,7 @@ def export_identity( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/batchnorm.py b/aidge_onnx/node_export/aidge_converters/batchnorm.py index 6fa00b5..5b852c7 100644 --- a/aidge_onnx/node_export/aidge_converters/batchnorm.py +++ b/aidge_onnx/node_export/aidge_converters/batchnorm.py @@ -21,7 +21,7 @@ def export_batchnorm( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() diff --git a/aidge_onnx/node_export/aidge_converters/concat.py b/aidge_onnx/node_export/aidge_converters/concat.py index 03f52eb..64871c7 100644 --- a/aidge_onnx/node_export/aidge_converters/concat.py +++ b/aidge_onnx/node_export/aidge_converters/concat.py @@ -21,7 +21,7 @@ def export_concat( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/conv.py b/aidge_onnx/node_export/aidge_converters/conv.py index 6813334..8134770 100644 --- a/aidge_onnx/node_export/aidge_converters/conv.py +++ b/aidge_onnx/node_export/aidge_converters/conv.py @@ -21,7 +21,7 @@ def export_conv( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() #If bias not set, remove bias as an input diff --git a/aidge_onnx/node_export/aidge_converters/erf.py b/aidge_onnx/node_export/aidge_converters/erf.py index 93c01b9..63f90f8 100644 --- a/aidge_onnx/node_export/aidge_converters/erf.py +++ b/aidge_onnx/node_export/aidge_converters/erf.py @@ -21,7 +21,7 @@ def export_erf( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/fc.py b/aidge_onnx/node_export/aidge_converters/fc.py index 033db73..24fc5b6 100644 --- a/aidge_onnx/node_export/aidge_converters/fc.py +++ b/aidge_onnx/node_export/aidge_converters/fc.py @@ -21,7 +21,7 @@ def export_fc( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: onnx_nodes = [] #If bias not set, remove bias as an input diff --git a/aidge_onnx/node_export/aidge_converters/gather.py b/aidge_onnx/node_export/aidge_converters/gather.py index feadc0d..26ee319 100644 --- a/aidge_onnx/node_export/aidge_converters/gather.py +++ b/aidge_onnx/node_export/aidge_converters/gather.py @@ -21,7 +21,7 @@ def export_gather( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/globalaveragepooling.py b/aidge_onnx/node_export/aidge_converters/globalaveragepooling.py index 1f1a224..e003556 100644 --- a/aidge_onnx/node_export/aidge_converters/globalaveragepooling.py +++ b/aidge_onnx/node_export/aidge_converters/globalaveragepooling.py @@ -23,7 +23,7 @@ def export_globalaveragepooling( opset: int = None, verbose: bool = False, **kwargs -) -> List[onnx.helper.NodeProto]: +) -> List[helper.NodeProto]: onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/identity.py b/aidge_onnx/node_export/aidge_converters/identity.py index 333b4c5..ac92897 100644 --- a/aidge_onnx/node_export/aidge_converters/identity.py +++ b/aidge_onnx/node_export/aidge_converters/identity.py @@ -21,7 +21,7 @@ def export_identity( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/maxpooling.py b/aidge_onnx/node_export/aidge_converters/maxpooling.py index 91f7e1a..06db4a7 100644 --- a/aidge_onnx/node_export/aidge_converters/maxpooling.py +++ b/aidge_onnx/node_export/aidge_converters/maxpooling.py @@ -21,7 +21,7 @@ def export_maxpooling( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/mul.py b/aidge_onnx/node_export/aidge_converters/mul.py index 985f599..db97d97 100644 --- a/aidge_onnx/node_export/aidge_converters/mul.py +++ b/aidge_onnx/node_export/aidge_converters/mul.py @@ -21,7 +21,7 @@ def export_mul( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() diff --git a/aidge_onnx/node_export/aidge_converters/padded_avgpooling.py b/aidge_onnx/node_export/aidge_converters/padded_avgpooling.py index 2584b3f..d81a73e 100644 --- a/aidge_onnx/node_export/aidge_converters/padded_avgpooling.py +++ b/aidge_onnx/node_export/aidge_converters/padded_avgpooling.py @@ -23,7 +23,7 @@ def export_identity( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/padded_conv.py b/aidge_onnx/node_export/aidge_converters/padded_conv.py index 9bb39f3..e7bb534 100644 --- a/aidge_onnx/node_export/aidge_converters/padded_conv.py +++ b/aidge_onnx/node_export/aidge_converters/padded_conv.py @@ -21,7 +21,7 @@ def export_padded_conv( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() micro_graph = aidge_operator.get_micro_graph() diff --git a/aidge_onnx/node_export/aidge_converters/padded_convdw.py b/aidge_onnx/node_export/aidge_converters/padded_convdw.py index 612902d..02bed1c 100644 --- a/aidge_onnx/node_export/aidge_converters/padded_convdw.py +++ b/aidge_onnx/node_export/aidge_converters/padded_convdw.py @@ -21,7 +21,7 @@ def export_padded_conv( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() micro_graph = aidge_operator.get_micro_graph() diff --git a/aidge_onnx/node_export/aidge_converters/padded_maxpooling.py b/aidge_onnx/node_export/aidge_converters/padded_maxpooling.py index 06bcd47..3bd52df 100644 --- a/aidge_onnx/node_export/aidge_converters/padded_maxpooling.py +++ b/aidge_onnx/node_export/aidge_converters/padded_maxpooling.py @@ -21,7 +21,7 @@ def export_maxpooling( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() micro_graph = aidge_operator.get_micro_graph() diff --git a/aidge_onnx/node_export/aidge_converters/producer.py b/aidge_onnx/node_export/aidge_converters/producer.py index b3f3f9e..7915713 100644 --- a/aidge_onnx/node_export/aidge_converters/producer.py +++ b/aidge_onnx/node_export/aidge_converters/producer.py @@ -24,7 +24,7 @@ def export_producer( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() diff --git a/aidge_onnx/node_export/aidge_converters/reducemean.py b/aidge_onnx/node_export/aidge_converters/reducemean.py index 6bb3ebc..832512a 100644 --- a/aidge_onnx/node_export/aidge_converters/reducemean.py +++ b/aidge_onnx/node_export/aidge_converters/reducemean.py @@ -21,7 +21,7 @@ def export_reducemean( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/relu.py b/aidge_onnx/node_export/aidge_converters/relu.py index 187d84e..c80c522 100644 --- a/aidge_onnx/node_export/aidge_converters/relu.py +++ b/aidge_onnx/node_export/aidge_converters/relu.py @@ -21,7 +21,7 @@ def export_relu( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/reshape.py b/aidge_onnx/node_export/aidge_converters/reshape.py index d03b405..178652c 100644 --- a/aidge_onnx/node_export/aidge_converters/reshape.py +++ b/aidge_onnx/node_export/aidge_converters/reshape.py @@ -21,7 +21,7 @@ def export_reshape( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/slice.py b/aidge_onnx/node_export/aidge_converters/slice.py index ea84518..3c37c95 100644 --- a/aidge_onnx/node_export/aidge_converters/slice.py +++ b/aidge_onnx/node_export/aidge_converters/slice.py @@ -21,7 +21,7 @@ def export_slice( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/softmax.py b/aidge_onnx/node_export/aidge_converters/softmax.py index f67f282..9340acd 100644 --- a/aidge_onnx/node_export/aidge_converters/softmax.py +++ b/aidge_onnx/node_export/aidge_converters/softmax.py @@ -21,7 +21,7 @@ def export_softmax( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/squeeze.py b/aidge_onnx/node_export/aidge_converters/squeeze.py index c4db74a..0ee8572 100644 --- a/aidge_onnx/node_export/aidge_converters/squeeze.py +++ b/aidge_onnx/node_export/aidge_converters/squeeze.py @@ -19,7 +19,7 @@ def export_squeeze( node_inputs_name, node_outputs_name, opset : int = None, - verbose: bool = False) -> List[onnx.helper.NodeProto]: + verbose: bool = False) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() onnx_node = helper.make_node( name=aidge_node.name(), diff --git a/aidge_onnx/node_export/aidge_converters/sub.py b/aidge_onnx/node_export/aidge_converters/sub.py index e0c36f9..5bfaf12 100644 --- a/aidge_onnx/node_export/aidge_converters/sub.py +++ b/aidge_onnx/node_export/aidge_converters/sub.py @@ -21,7 +21,7 @@ def export_sub( node_outputs_name, opset:int = None, verbose: bool = False, - **kwargs) -> List[onnx.helper.NodeProto]: + **kwargs) -> List[helper.NodeProto]: aidge_operator = aidge_node.get_operator() diff --git a/aidge_onnx/node_export/aidge_converters/unsqueeze.py b/aidge_onnx/node_export/aidge_converters/unsqueeze.py index 4d366a8..c2c1bf0 100644 --- a/aidge_onnx/node_export/aidge_converters/unsqueeze.py +++ b/aidge_onnx/node_export/aidge_converters/unsqueeze.py @@ -22,7 +22,7 @@ def export_unsqueeze( node_outputs_name, opset:int = None, verbose: bool = False, -) -> List[onnx.helper.NodeProto]: +) -> List[helper.NodeProto]: onnx_node = helper.make_node( name=aidge_node.name(), op_type="Unsqueeze", -- GitLab