From 4b1b4fa6d86246cfef1e8b693c011bab2d7db7dd Mon Sep 17 00:00:00 2001 From: Wing Lian Date: Thu, 30 Oct 2025 10:03:24 -0400 Subject: [PATCH] upgrade numpy (#3236) * upgrade numpy to 2.3.4 * bump contribs for numpy * fix vllm versions * bump numba * make sure psutil is installed * add psutil to cicd dockerfile jinja * lower dep versions of numba + numpy for vllm * bump datasets version * resolve pydantic conflict too --- .github/workflows/tests.yml | 2 +- cicd/Dockerfile.jinja | 2 +- docker/Dockerfile-base | 2 +- requirements.txt | 12 ++++++------ setup.py | 4 +++- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8f368b517..90bf3234a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -152,7 +152,7 @@ jobs: - name: upgrade pip run: | pip3 install --upgrade pip - pip3 install --upgrade packaging==23.2 setuptools==75.8.0 setuptools_scm build wheel + pip3 install --upgrade packaging==23.2 setuptools==75.8.0 setuptools_scm build wheel psutil - name: Install PyTorch run: | diff --git a/cicd/Dockerfile.jinja b/cicd/Dockerfile.jinja index c3a613ecc..81ed5453e 100644 --- a/cicd/Dockerfile.jinja +++ b/cicd/Dockerfile.jinja @@ -32,7 +32,7 @@ RUN if [ "$NIGHTLY_BUILD" = "true" ] ; then \ sed -i 's#^datasets.*#datasets @ git+https://github.com/huggingface/datasets.git@main#' requirements.txt; \ fi -RUN pip install packaging==23.2 setuptools==75.8.0 +RUN pip install packaging==23.2 setuptools==75.8.0 psutil RUN if [ "$AXOLOTL_EXTRAS" != "" ] ; then \ pip install --no-build-isolation -e .[deepspeed,flash-attn,ring-flash-attn,optimizers,ray,$AXOLOTL_EXTRAS] $AXOLOTL_ARGS; \ else \ diff --git a/docker/Dockerfile-base b/docker/Dockerfile-base index a08b5cd4f..25eae4fde 100644 --- a/docker/Dockerfile-base +++ b/docker/Dockerfile-base @@ -35,7 +35,7 @@ ENV PATH="/root/miniconda3/envs/py${PYTHON_VERSION}/bin:${PATH}" WORKDIR /workspace -RUN python3 -m pip install --upgrade pip && pip3 install -U packaging==23.2 setuptools==75.8.0 wheel && \ +RUN python3 -m pip install --upgrade pip && pip3 install -U packaging==23.2 setuptools==75.8.0 wheel psutil && \ python3 -m pip install --no-cache-dir -U torch==${PYTORCH_VERSION}+cu${CUDA} torchvision --extra-index-url https://download.pytorch.org/whl/cu$CUDA && \ python3 -m pip cache purge diff --git a/requirements.txt b/requirements.txt index 5621d94b1..4d27ee148 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ peft>=0.17.1 tokenizers>=0.21.1 transformers==4.57.1 accelerate==1.10.1 -datasets==4.0.0 +datasets==4.3.0 deepspeed>=0.17.0 trl==0.24.0 hf_xet==1.2.0 @@ -28,7 +28,7 @@ sentencepiece gradio==5.49.1 modal==1.0.2 -pydantic==2.10.6 +pydantic>=2.10.6 addict fire PyYAML>=6.0 @@ -36,8 +36,8 @@ requests wandb einops colorama -numba -numpy>=1.24.4,<=2.0.1 +numba>=0.61.2 +numpy>=2.2.6 # qlora things evaluate==0.4.1 @@ -50,7 +50,7 @@ python-dotenv==1.0.1 # remote filesystems s3fs>=2024.5.0 -gcsfs>=2024.5.0 +gcsfs>=2025.3.0 adlfs>=2024.5.0 ocifs==1.3.2 @@ -66,7 +66,7 @@ antlr4-python3-runtime==4.13.2 torchao==0.13.0 schedulefree==1.4.1 -axolotl-contribs-lgpl==0.0.6 +axolotl-contribs-lgpl==0.0.7 axolotl-contribs-mit==0.0.5 mistral-common==1.8.5 diff --git a/setup.py b/setup.py index b16377e92..b046a2fdc 100644 --- a/setup.py +++ b/setup.py @@ -65,9 +65,11 @@ def parse_requirements(extras_require_map): if (major, minor) >= (2, 9): extras_require_map.pop("fbgemm-gpu") extras_require_map["fbgemm-gpu"] = ["fbgemm-gpu-genai==1.4.1"] + extras_require_map["vllm"] = ["vllm==0.11.1"] elif (major, minor) >= (2, 8): extras_require_map.pop("fbgemm-gpu") extras_require_map["fbgemm-gpu"] = ["fbgemm-gpu-genai==1.3.0"] + extras_require_map["vllm"] = ["vllm==0.11.0"] elif (major, minor) >= (2, 7): _install_requires.pop(_install_requires.index(xformers_version)) if patch == 0: @@ -76,7 +78,7 @@ def parse_requirements(extras_require_map): extras_require_map.pop("vllm") else: _install_requires.append("xformers==0.0.31") - extras_require_map["vllm"] = ["vllm>=0.10.0"] + extras_require_map["vllm"] = ["vllm==0.10.1"] elif (major, minor) >= (2, 6): _install_requires.pop(_install_requires.index(xformers_version)) _install_requires.append("xformers==0.0.29.post3")