Minor code suggestions

Author: xenova

scripts/quantize.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
 from tqdm import tqdm
-from typing import Set, List, Optional
+from typing import Set
 import onnx
 import os
 
@@ -110,16 +110,6 @@ class QuantizationArguments:
         },
     )
 
-    op_block_list: List[str] = field(
-        default=None,
-        metadata={
-            "help": """List of operators to exclude from quantization.
-                   Can be any standard ONNX operator (see https://onnx.ai/onnx/operators/)
-                   or your custom implemented operators.""",
-            "nargs": "+",
-        },
-    )
-
 
 def get_operators(model: onnx.ModelProto) -> Set[str]:
     operators = set()
@@ -141,7 +131,6 @@ def quantize_q8(
     per_channel: bool,
     reduce_range: bool,
     weight_type: QuantType,
-    op_block_list: Optional[List[str]]
 ):
     """
     Quantize the weights of the model from float32 to int8/uint8
@@ -162,9 +151,7 @@ def quantize_q8(
         tensors_range=None,
         nodes_to_quantize=[],
         nodes_to_exclude=[],
-        op_types_to_quantize=[
-            op for op in IntegerOpsRegistry.keys() if op_block_list is None or op not in op_block_list
-        ],
+        op_types_to_quantize=list(IntegerOpsRegistry.keys()),
         extra_options=dict(
             EnableSubgraph=True,
             MatMulConstBOnly=True,
@@ -178,7 +165,6 @@ def quantize_q8(
 def quantize_fp16(
     model: onnx.ModelProto,
     save_path: str,
-    op_block_list: Optional[List[str]]
 ):
     """
     Quantize the weights of the model from float32 to float16
@@ -188,19 +174,10 @@ def quantize_fp16(
     # ValueError: Message onnx.ModelProto exceeds maximum protobuf size of 2GB: 2338583841
     disable_shape_infer = model.ByteSize() >= onnx.checker.MAXIMUM_PROTOBUF
 
-    convert_kwargs = {}
-
-    # Only include the 'op_block_list' keyword argument if a list is provided.
-    # This allows the library to apply its default behavior (see https://github.com/huggingface/transformers.js/pull/1036).
-    # Note: To set 'op_block_list' to an empty list (thereby overriding float16 defaults), a custom script is required.
-    if op_block_list is not None:
-        convert_kwargs["op_block_list"] = []
-
     model_fp16 = float16.convert_float_to_float16(
         model,
         keep_io_types=True,
         disable_shape_infer=disable_shape_infer,
-        **convert_kwargs
     )
     graph = gs.import_onnx(model_fp16)
     graph.toposort()
@@ -294,7 +271,6 @@ def quantize(input_folder, output_folder, quantization_args: QuantizationArgumen
                 quantize_fp16(
                     model,
                     save_path,
-                    quantization_args.op_block_list
                 )
 
             elif mode in (QuantMode.Q4, QuantMode.Q4F16):
@@ -311,7 +287,6 @@ def quantize(input_folder, output_folder, quantization_args: QuantizationArgumen
                     quantize_fp16(
                         q4_model,
                         save_path,
-                        quantization_args.op_block_list,
                     )
 
             elif mode == QuantMode.BNB4:
@@ -356,7 +331,6 @@ def quantize(input_folder, output_folder, quantization_args: QuantizationArgumen
                     per_channel=quantization_args.per_channel,
                     reduce_range=quantization_args.reduce_range,
                     weight_type=weight_type,
-                    op_block_list=quantization_args.op_block_list,
                 )