diff --git a/Dockerfile b/Dockerfile index ab1f969..4119f2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ python3 -m pip install \ --no-cache-dir --disable-pip-version-check --extra-index-url https://download.pytorch.org/whl/cpu \ - torch==2.3.1+cpu .[all]; \ + torch==2.5.1+cpu .[all]; \ else \ python3 -m pip install \ --no-cache-dir --disable-pip-version-check \ diff --git a/Dockerfile.wolfi b/Dockerfile.wolfi index 3d94ffd..d54be8f 100644 --- a/Dockerfile.wolfi +++ b/Dockerfile.wolfi @@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ python3 -m pip install \ --no-cache-dir --disable-pip-version-check --extra-index-url https://download.pytorch.org/whl/cpu \ - torch==2.3.1+cpu .[all]; \ + torch==2.5.1+cpu .[all]; \ else \ python3 -m pip install \ --no-cache-dir --disable-pip-version-check \ diff --git a/eland/cli/eland_import_hub_model.py b/eland/cli/eland_import_hub_model.py index 9496e91..2475abc 100755 --- a/eland/cli/eland_import_hub_model.py +++ b/eland/cli/eland_import_hub_model.py @@ -237,13 +237,13 @@ def check_cluster_version(es_client, logger): ) exit(1) - # PyTorch was upgraded to version 2.3.1 in 8.15.2 + # PyTorch was upgraded to version 2.5.1 in 8.18.0 # and is incompatible with earlier versions - if sem_ver < (8, 15, 2): + if sem_ver < (8, 18, 0): import torch logger.error( - f"Eland uses PyTorch version {torch.__version__} which is incompatible with Elasticsearch versions prior to 8.15.2. Please upgrade Elasticsearch to at least version 8.15.2" + f"Eland uses PyTorch version {torch.__version__} which is incompatible with Elasticsearch versions prior to 8.18.0. Please upgrade Elasticsearch to at least version 8.18.0" ) exit(1) diff --git a/setup.py b/setup.py index 65dc1f2..fcc252c 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ extras = { "lightgbm": ["lightgbm>=2,<4"], "pytorch": [ "requests<3", - "torch==2.3.1", + "torch==2.5.1", "tqdm", "sentence-transformers>=2.1.0,<=2.7.0", # sentencepiece is a required dependency for the slow tokenizers diff --git a/tests/ml/pytorch/test_pytorch_model_config_pytest.py b/tests/ml/pytorch/test_pytorch_model_config_pytest.py index 6adc885..ca90e1a 100644 --- a/tests/ml/pytorch/test_pytorch_model_config_pytest.py +++ b/tests/ml/pytorch/test_pytorch_model_config_pytest.py @@ -59,8 +59,8 @@ from tests import ES_VERSION pytestmark = [ pytest.mark.skipif( - ES_VERSION < (8, 15, 1), - reason="Eland uses Pytorch 2.3.1, versions of Elasticsearch prior to 8.15.1 are incompatible with PyTorch 2.3.1", + ES_VERSION < (8, 18, 0), + reason="Eland uses Pytorch 2.5.1, versions of Elasticsearch prior to 8.18.0 are incompatible with PyTorch 2.5.1", ), pytest.mark.skipif( not HAS_SKLEARN, reason="This test requires 'scikit-learn' package to run" diff --git a/tests/ml/pytorch/test_pytorch_model_upload_pytest.py b/tests/ml/pytorch/test_pytorch_model_upload_pytest.py index 09fa439..8ccb567 100644 --- a/tests/ml/pytorch/test_pytorch_model_upload_pytest.py +++ b/tests/ml/pytorch/test_pytorch_model_upload_pytest.py @@ -39,8 +39,8 @@ from tests import ES_TEST_CLIENT, ES_VERSION pytestmark = [ pytest.mark.skipif( - ES_VERSION < (8, 15, 2), - reason="Eland uses Pytorch 2.3.1, versions of Elasticsearch prior to 8.15.2 are incompatible with PyTorch 2.3.1", + ES_VERSION < (8, 18, 0), + reason="Eland uses Pytorch 2.5.1, versions of Elasticsearch prior to 8.18.0 are incompatible with PyTorch 2.5.1", ), pytest.mark.skipif( not HAS_SKLEARN, reason="This test requires 'scikit-learn' package to run"