diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index c0e0ce103..8806930af 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -25,7 +25,7 @@ jobs: defaults: run: shell: bash - runs-on: 'macos-13-large' + runs-on: 'macos-15-large' env: CMAKE_BUILD_TYPE: 'Release' MACOSX_DEPLOYMENT_TARGET: '11.0' diff --git a/modules/token_merging/setup.py b/modules/token_merging/setup.py index 32005d4cb..73db245b7 100644 --- a/modules/token_merging/setup.py +++ b/modules/token_merging/setup.py @@ -4,7 +4,7 @@ from setuptools import find_packages, setup EXTRAS_REQUIRE = { - "tests": ["onnx", "onnxruntime", "accelerate", "diffusers", "openvino", "optimum", "optimum-intel", "open-clip-torch","timm", "pytest"], + "tests": ["onnx", "onnxruntime", "onnxscript", "accelerate", "diffusers", "openvino", "optimum", "optimum-intel", "open-clip-torch","timm", "pytest"], } setup( @@ -13,7 +13,7 @@ author="Alexander Kozlov", url="https://github.com/openvinotoolkit/openvino_contrib/tree/master/modules/token_merging", description="Token Merging for OpenVINO", - install_requires=["torch~=2.4", "torchvision~=0.19.1"], + install_requires=["torch~=2.6", "torchvision~=0.21"], dependency_links=["https://download.pytorch.org/whl/cpu"], extras_require=EXTRAS_REQUIRE, packages=find_packages(exclude=("examples", "build")), diff --git a/modules/token_merging/tests/test_precommit.py b/modules/token_merging/tests/test_precommit.py index de380123e..6360c8ada 100644 --- a/modules/token_merging/tests/test_precommit.py +++ b/modules/token_merging/tests/test_precommit.py @@ -74,7 +74,8 @@ def test_timm(self): dynamic_axes={ "image": {0: "batch"}, "output": {0: "batch"}, - } + }, + dynamo=False, # This keeps using the classic ONNX exporter (works in PyTorch 1.x – 2.5+). ) compiled_model = ov.compile_model(model_file) self.assertTrue(compiled_model)