From 6e0395de00016004e0479978e11b536d7493eda5 Mon Sep 17 00:00:00 2001 From: Fabien Dupont Date: Mon, 14 Oct 2024 08:19:41 -0400 Subject: [PATCH] Update PyTorch to 2.4.1 This change the default PyTorch 2.4.1. Intel Gaudi (HPU) remains on Intel fork of PyTorch 2.3.1. Fixes https://github.com/instructlab/instructlab/issues/2437 Signed-off-by: Fabien Dupont --- pyproject.toml | 7 +++++-- requirements-rocm.txt | 1 - requirements.txt | 2 +- requirements/cpu.txt | 1 + requirements-cuda.txt => requirements/cuda.txt | 1 + requirements/hpu.txt | 11 +++++++++++ requirements/mps.txt | 1 + requirements/rocm.txt | 2 ++ 8 files changed, 22 insertions(+), 4 deletions(-) delete mode 100644 requirements-rocm.txt create mode 100644 requirements/cpu.txt rename requirements-cuda.txt => requirements/cuda.txt (51%) create mode 100644 requirements/hpu.txt create mode 100644 requirements/mps.txt create mode 100644 requirements/rocm.txt diff --git a/pyproject.toml b/pyproject.toml index 93387840..783b6024 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,8 +44,11 @@ package-dir = { "" = "src" } [tool.setuptools.dynamic] dependencies = { file = ["requirements.txt"] } -optional-dependencies.cuda = { file = ["requirements-cuda.txt"] } -optional-dependencies.rocm = { file = ["requirements-rocm.txt"] } +optional-dependencies.cpu = { file = ["requirements/cpu.txt"] } +optional-dependencies.cuda = { file = ["requirements/cuda.txt"] } +optional-dependencies.hpu = { file = ["requirements/hpu.txt"] } +optional-dependencies.mps = { file = ["requirements/mps.txt"] } +optional-dependencies.rocm = { file = ["requirements/rocm.txt"] } [tool.setuptools.packages.find] where = ["src"] diff --git a/requirements-rocm.txt b/requirements-rocm.txt deleted file mode 100644 index 21612c36..00000000 --- a/requirements-rocm.txt +++ /dev/null @@ -1 +0,0 @@ -flash-attn>=2.6.2,<2.7.0 diff --git a/requirements.txt b/requirements.txt index 2d77d1e1..7b759f13 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ pyyaml py-cpuinfo # we set this to be above 0a0 so that it doesn't # replace custom pytorch images with the 2.3.0 -torch>=2.3.0a0 +torch>=2.3.0,<2.5.0 transformers>=4.45.2 accelerate>=0.34.2 datasets>=2.15.0 diff --git a/requirements/cpu.txt b/requirements/cpu.txt new file mode 100644 index 00000000..b840f27f --- /dev/null +++ b/requirements/cpu.txt @@ -0,0 +1 @@ +# Extra dependencies for CPU-only diff --git a/requirements-cuda.txt b/requirements/cuda.txt similarity index 51% rename from requirements-cuda.txt rename to requirements/cuda.txt index 1bed61eb..73dbdf0e 100644 --- a/requirements-cuda.txt +++ b/requirements/cuda.txt @@ -1,2 +1,3 @@ +# Extra dependencies for NVIDIA CUDA flash-attn>=2.4.0 bitsandbytes>=0.43.1 diff --git a/requirements/hpu.txt b/requirements/hpu.txt new file mode 100644 index 00000000..6c6df9a6 --- /dev/null +++ b/requirements/hpu.txt @@ -0,0 +1,11 @@ +# # Extra dependencies for Intel Gaudi / Habana Labs HPU devices +# Habana Labs 1.17.1 has PyTorch 2.3.1a0+gitxxx pre-release +torch>=2.3.1a0,<2.4.0 +# Habana Labs frameworks +habana-torch-plugin>=1.17.1 +habana_gpu_migration>=1.17.1 +# additional Habana Labs packages (installed, but not used) +#habana-media-loader +#habana-pyhlml +#habana_quantization_toolkit +#habana-torch-dataloader diff --git a/requirements/mps.txt b/requirements/mps.txt new file mode 100644 index 00000000..41ee4883 --- /dev/null +++ b/requirements/mps.txt @@ -0,0 +1 @@ +# Extra dependencies for Apple MPS (Metal Performance Shaders) diff --git a/requirements/rocm.txt b/requirements/rocm.txt new file mode 100644 index 00000000..644e9a33 --- /dev/null +++ b/requirements/rocm.txt @@ -0,0 +1,2 @@ +# Extra dependencies for AMD ROCm +flash-attn>=2.6.2,<2.7.0