Adapt executorch 0.6.0 (#2587)

* Delay installation whl

* Pin torch 2.7.0

* Adapt torch 2.7.0

* Add quant::dequantize_affine

Author: M-Quadra

coremltools/converters/mil/frontend/torch/quantization_ops.py

@@ -740,7 +740,7 @@ def _weight_int4pack_mm(context, node):
 
 
 @register_torch_op(
-    torch_alias=["torchao::dequantize_affine", "torchao.dequantize_affine"],
+    torch_alias=["torchao::dequantize_affine", "torchao.dequantize_affine", "quant::dequantize_affine"],
 )
 def dequantize_affine(context, node):
     if not _HAS_TORCHAO:

coremltools/converters/mil/frontend/torch/test/test_torch_export_conversion_api.py

@@ -36,10 +36,6 @@
 backends = testing_reqs.backends
 compute_units = testing_reqs.compute_units
 
-TORCH_EXPORT_DEFAULT_LOWER_BOUND = {TorchFrontend.TORCHEXPORT: 2, TorchFrontend.EXECUTORCH: 2}
-if torch.__version__ >= "2.4.0":
-    TORCH_EXPORT_DEFAULT_LOWER_BOUND[TorchFrontend.TORCHEXPORT] = 0
-
 
 class TestTorchExportConversionAPI(TorchBaseTest):
     @pytest.mark.parametrize("frontend", frontends)
@@ -160,7 +156,10 @@ def forward(self, x):
         )[1]
         input_proto = coreml_model.input_description._fd_spec[0]
         size_ranges = input_proto.type.multiArrayType.shapeRange.sizeRanges
-        assert size_ranges[0].lowerBound == TORCH_EXPORT_DEFAULT_LOWER_BOUND[frontend]
+        assert size_ranges[0].lowerBound == {
+            TorchFrontend.TORCHEXPORT: 0,
+            TorchFrontend.EXECUTORCH: 2,
+        }[frontend]
         assert size_ranges[0].upperBound == 2147483647
         assert size_ranges[1].lowerBound == 3
         assert size_ranges[1].upperBound == 3
@@ -351,7 +350,7 @@ def forward(self, input, other):
 
         dynamic_shapes = None
         if dynamic:
-            dim0 = torch.export.Dim("dim0")
+            dim0 = torch.export.Dim.AUTO
             dim1 = torch.export.Dim("dim1", min=1, max=3)
             dynamic_shapes = {
                 "input": {0: dim0, 1: dim1},
@@ -370,11 +369,12 @@ def forward(self, input, other):
         if dynamic:
             for input_proto in coreml_model.input_description._fd_spec:
                 size_ranges = input_proto.type.multiArrayType.shapeRange.sizeRanges
-                assert size_ranges[0].lowerBound == TORCH_EXPORT_DEFAULT_LOWER_BOUND[frontend]
+                assert size_ranges[0].lowerBound == 2
                 assert size_ranges[0].upperBound == 2147483647
-                assert size_ranges[1].lowerBound == max(
-                    1, TORCH_EXPORT_DEFAULT_LOWER_BOUND[frontend]
-                )
+                assert size_ranges[1].lowerBound == {
+                    TorchFrontend.TORCHEXPORT: 1,
+                    TorchFrontend.EXECUTORCH: 2,
+                }[frontend]
                 assert size_ranges[1].upperBound == 3
 
         mil_program = coreml_model._mil_program
@@ -451,7 +451,10 @@ def forward(self, arg):
         if dynamic:
             input_proto = coreml_model.input_description._fd_spec[0]
             size_ranges = input_proto.type.multiArrayType.shapeRange.sizeRanges
-            assert size_ranges[0].lowerBound == TORCH_EXPORT_DEFAULT_LOWER_BOUND[frontend]
+            assert size_ranges[0].lowerBound == {
+                TorchFrontend.TORCHEXPORT: 0,
+                TorchFrontend.EXECUTORCH: 2,
+            }[frontend]
             assert size_ranges[0].upperBound == 2147483647
             assert size_ranges[1].lowerBound == 3
             assert size_ranges[1].upperBound == 3
@@ -637,10 +640,16 @@ def forward(self, a, x, b):
                 if i == 0:
                     assert size_ranges[0].lowerBound == 2
                     assert size_ranges[0].upperBound == 2
-                    assert size_ranges[1].lowerBound == TORCH_EXPORT_DEFAULT_LOWER_BOUND[frontend]
+                    assert size_ranges[1].lowerBound == {
+                        TorchFrontend.TORCHEXPORT: 0,
+                        TorchFrontend.EXECUTORCH: 2,
+                    }[frontend]
                     assert size_ranges[1].upperBound == 2147483647
                 elif i == 1:
-                    assert size_ranges[0].lowerBound == TORCH_EXPORT_DEFAULT_LOWER_BOUND[frontend]
+                    assert size_ranges[0].lowerBound == {
+                        TorchFrontend.TORCHEXPORT: 0,
+                        TorchFrontend.EXECUTORCH: 2,
+                    }[frontend]
                     assert size_ranges[0].upperBound == 2147483647
                     assert size_ranges[1].lowerBound == 2
                     assert size_ranges[1].upperBound == 2
@@ -745,7 +754,10 @@ def forward(self, x):
         if dynamic:
             input_proto = coreml_model.input_description._fd_spec[0]
             size_ranges = input_proto.type.multiArrayType.shapeRange.sizeRanges
-            assert size_ranges[0].lowerBound == TORCH_EXPORT_DEFAULT_LOWER_BOUND[frontend]
+            assert size_ranges[0].lowerBound == {
+                TorchFrontend.TORCHEXPORT: 0,
+                TorchFrontend.EXECUTORCH: 2,
+            }[frontend]
             assert size_ranges[0].upperBound == 2147483647
             assert size_ranges[1].lowerBound == 2
             assert size_ranges[1].upperBound == 2

reqs/pytorch.pip

@@ -5,12 +5,12 @@ torchaudio==2.2.0; platform_machine != "arm64"
 torchvision==0.17.0; platform_machine != "arm64"
 
 # Torch dependencies for ARM
-torch>=2.2.0,<2.8; platform_machine == "arm64"
+torch==2.7.0; platform_machine == "arm64"
 torchaudio>=2.2.0; platform_machine == "arm64"
 torchvision>=0.17.0; platform_machine == "arm64"
 torchsr==1.0.4; platform_machine == "arm64"
 
 # TODO (rdar://141476729) support a more recent timm
 timm==0.6.13; platform_machine == "arm64"
 
-torchao==0.11.0; platform_machine == "arm64" and python_version >= '3.10'
+torchao==0.10.0; platform_machine == "arm64" and python_version >= '3.10'

reqs/test_executorch.pip

@@ -3,4 +3,4 @@
 
 # Warning: Starting from ExecuTorch 0.6.0, coremltools is added as a dependency
 # so we need to re-install built-from-source coremltools after pip install ExecuTorch
-executorch>=0.4.0; platform_machine == "arm64" and python_version >= '3.10'
+executorch>=0.6.0; platform_machine == "arm64" and python_version >= '3.10'

scripts/test.sh

@@ -82,6 +82,11 @@ echo
 echo "Using python from $(which python)"
 echo
 
+# Install dependencies if specified
+if [ ! -z "${REQUIREMENTS}" ]; then
+   $PIP_EXECUTABLE install --prefer-binary -r "${REQUIREMENTS}"
+fi
+
 if [[ $WHEEL_PATH == "" ]]; then
     cd ..
     $PIP_EXECUTABLE install -e ${COREMLTOOLS_NAME}  --upgrade --no-deps
@@ -90,11 +95,6 @@ else
     $PIP_EXECUTABLE install $~WHEEL_PATH --upgrade --no-deps --force-reinstall
 fi
 
-# Install dependencies if specified
-if [ ! -z "${REQUIREMENTS}" ]; then
-   $PIP_EXECUTABLE install --prefer-binary -r "${REQUIREMENTS}"
-fi
-
 if [[ ! -z "${WHEEL_PATH}" ]]; then
    # in a test of a wheel, need to run from ${COREMLTOOLS_HOME}/coremltools for some reason.
    # otherwise pytest picks up tests in deps, env, etc.