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
This commit is contained in:
Wing Lian
2025-10-30 10:03:24 -04:00
committed by GitHub
parent 0f7c886b7b
commit 4b1b4fa6d8
5 changed files with 12 additions and 10 deletions

View File

@@ -152,7 +152,7 @@ jobs:
- name: upgrade pip - name: upgrade pip
run: | run: |
pip3 install --upgrade pip 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 - name: Install PyTorch
run: | run: |

View File

@@ -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; \ sed -i 's#^datasets.*#datasets @ git+https://github.com/huggingface/datasets.git@main#' requirements.txt; \
fi 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 \ RUN if [ "$AXOLOTL_EXTRAS" != "" ] ; then \
pip install --no-build-isolation -e .[deepspeed,flash-attn,ring-flash-attn,optimizers,ray,$AXOLOTL_EXTRAS] $AXOLOTL_ARGS; \ pip install --no-build-isolation -e .[deepspeed,flash-attn,ring-flash-attn,optimizers,ray,$AXOLOTL_EXTRAS] $AXOLOTL_ARGS; \
else \ else \

View File

@@ -35,7 +35,7 @@ ENV PATH="/root/miniconda3/envs/py${PYTHON_VERSION}/bin:${PATH}"
WORKDIR /workspace 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 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 python3 -m pip cache purge

View File

@@ -15,7 +15,7 @@ peft>=0.17.1
tokenizers>=0.21.1 tokenizers>=0.21.1
transformers==4.57.1 transformers==4.57.1
accelerate==1.10.1 accelerate==1.10.1
datasets==4.0.0 datasets==4.3.0
deepspeed>=0.17.0 deepspeed>=0.17.0
trl==0.24.0 trl==0.24.0
hf_xet==1.2.0 hf_xet==1.2.0
@@ -28,7 +28,7 @@ sentencepiece
gradio==5.49.1 gradio==5.49.1
modal==1.0.2 modal==1.0.2
pydantic==2.10.6 pydantic>=2.10.6
addict addict
fire fire
PyYAML>=6.0 PyYAML>=6.0
@@ -36,8 +36,8 @@ requests
wandb wandb
einops einops
colorama colorama
numba numba>=0.61.2
numpy>=1.24.4,<=2.0.1 numpy>=2.2.6
# qlora things # qlora things
evaluate==0.4.1 evaluate==0.4.1
@@ -50,7 +50,7 @@ python-dotenv==1.0.1
# remote filesystems # remote filesystems
s3fs>=2024.5.0 s3fs>=2024.5.0
gcsfs>=2024.5.0 gcsfs>=2025.3.0
adlfs>=2024.5.0 adlfs>=2024.5.0
ocifs==1.3.2 ocifs==1.3.2
@@ -66,7 +66,7 @@ antlr4-python3-runtime==4.13.2
torchao==0.13.0 torchao==0.13.0
schedulefree==1.4.1 schedulefree==1.4.1
axolotl-contribs-lgpl==0.0.6 axolotl-contribs-lgpl==0.0.7
axolotl-contribs-mit==0.0.5 axolotl-contribs-mit==0.0.5
mistral-common==1.8.5 mistral-common==1.8.5

View File

@@ -65,9 +65,11 @@ def parse_requirements(extras_require_map):
if (major, minor) >= (2, 9): if (major, minor) >= (2, 9):
extras_require_map.pop("fbgemm-gpu") extras_require_map.pop("fbgemm-gpu")
extras_require_map["fbgemm-gpu"] = ["fbgemm-gpu-genai==1.4.1"] extras_require_map["fbgemm-gpu"] = ["fbgemm-gpu-genai==1.4.1"]
extras_require_map["vllm"] = ["vllm==0.11.1"]
elif (major, minor) >= (2, 8): elif (major, minor) >= (2, 8):
extras_require_map.pop("fbgemm-gpu") extras_require_map.pop("fbgemm-gpu")
extras_require_map["fbgemm-gpu"] = ["fbgemm-gpu-genai==1.3.0"] extras_require_map["fbgemm-gpu"] = ["fbgemm-gpu-genai==1.3.0"]
extras_require_map["vllm"] = ["vllm==0.11.0"]
elif (major, minor) >= (2, 7): elif (major, minor) >= (2, 7):
_install_requires.pop(_install_requires.index(xformers_version)) _install_requires.pop(_install_requires.index(xformers_version))
if patch == 0: if patch == 0:
@@ -76,7 +78,7 @@ def parse_requirements(extras_require_map):
extras_require_map.pop("vllm") extras_require_map.pop("vllm")
else: else:
_install_requires.append("xformers==0.0.31") _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): elif (major, minor) >= (2, 6):
_install_requires.pop(_install_requires.index(xformers_version)) _install_requires.pop(_install_requires.index(xformers_version))
_install_requires.append("xformers==0.0.29.post3") _install_requires.append("xformers==0.0.29.post3")