Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relax overly strict aimet dependencies #3504

Merged
merged 3 commits into from
Nov 19, 2024
Merged

Relax overly strict aimet dependencies #3504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac6b553
Relax version dependencies
quic-mtuttle Nov 14, 2024
bbc8107
Unpin nbsphinx
quic-mtuttle Nov 14, 2024
4ffc6f6
Relax legacy torch deps
quic-mtuttle Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Jenkins/Dockerfile.onnx-cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,26 +151,25 @@ RUN python3 -m pip --no-cache-dir install \
h5py \
ipykernel \
ipython \
Jinja2==3.0.3 \
Jinja2>=3.0.3 \
jupyter \
keras==2.2.4 \
lmdb==1.2.1 \
matplotlib>=3 \
mock \
nbsphinx \
networkx \
'numpy<1.24,>=1.20.5' \
onnx==1.16.1 \
'numpy<=1.24.4,>=1.20.5' \
onnx~=1.16.1 \
onnxscript \
onnxsim \
onnxruntime==1.18.1 \
onnxruntime~=1.18.1 \
onnxruntime-extensions \
opencv-python \
peft \
piccolo-theme \
Pillow==9.3.0 \
pluggy==0.12.0 \
protobuf==3.20.2 \
psutil \
ptflops \
pybind11 \
Expand All @@ -182,7 +181,7 @@ RUN python3 -m pip --no-cache-dir install \
pytest-cov \
pytorch-ignite \
PyYAML \
scikit-learn==1.1.3 \
scikit-learn \
scipy==1.8.1 \
spconv \
sphinx \
Expand All @@ -191,8 +190,6 @@ RUN python3 -m pip --no-cache-dir install \
sphinx-jinja \
sphinx-rtd-theme \
sphinx-tabs \
tensorboard==2.4.0 \
tensorboardX==2.4 \
timm==0.4.12 \
torchtext \
tqdm \
Expand Down
13 changes: 5 additions & 8 deletions Jenkins/Dockerfile.onnx-gpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,26 +162,25 @@ RUN python3 -m pip --no-cache-dir install \
h5py \
ipykernel \
ipython \
Jinja2==3.0.3 \
Jinja2>=3.0.3 \
jupyter \
keras==2.2.4 \
lmdb==1.2.1 \
matplotlib>=3 \
mock \
nbsphinx \
networkx \
'numpy<1.24,>=1.20.5' \
onnx==1.16.1 \
'numpy<=1.24.4,>=1.20.5' \
onnx~=1.16.1 \
onnxscript \
onnxsim \
onnxruntime==1.18.1 \
onnxruntime~=1.18.1 \
onnxruntime-extensions \
opencv-python \
peft \
piccolo-theme \
Pillow==9.3.0 \
pluggy==0.12.0 \
protobuf==3.20.2 \
psutil \
ptflops \
pybind11 \
Expand All @@ -193,7 +192,7 @@ RUN python3 -m pip --no-cache-dir install \
pytest-cov \
pytorch-ignite \
PyYAML \
scikit-learn==1.1.3 \
scikit-learn \
scipy==1.8.1 \
spconv-cu118 \
sphinx \
Expand All @@ -202,8 +201,6 @@ RUN python3 -m pip --no-cache-dir install \
sphinx-jinja \
sphinx-rtd-theme \
sphinx-tabs \
tensorboard==2.4.0 \
tensorboardX==2.4 \
timm==0.4.12 \
torchtext \
tqdm \
Expand Down
4 changes: 2 additions & 2 deletions Jenkins/Dockerfile.tf-torch-cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ RUN python3 -m pip --no-cache-dir install \
h5py \
ipykernel \
ipython \
Jinja2==3.0.3 \
Jinja2>=3.0.3 \
jupyter \
keras==2.10.0 \
lmdb==1.2.1 \
Expand Down Expand Up @@ -171,7 +171,7 @@ RUN python3 -m pip --no-cache-dir install \
pytorch-ignite \
PyYAML \
safetensors \
scikit-learn==1.1.3 \
scikit-learn \
scipy==1.8.1 \
spconv==2.1.20 \
sphinx \
Expand Down
14 changes: 6 additions & 8 deletions Jenkins/Dockerfile.torch-cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,26 +150,25 @@ RUN python3 -m pip --no-cache-dir install \
h5py \
ipykernel \
ipython \
Jinja2==3.0.3 \
Jinja2>=3.0.3 \
jupyter \
keras==2.2.4 \
lmdb==1.2.1 \
matplotlib>=3 \
mock \
nbsphinx==0.8.12 \
nbsphinx \
networkx \
'numpy<1.24,>=1.20.5' \
onnx==1.16.1 \
onnx~=1.16.1 \
onnxscript \
onnxsim \
onnxruntime==1.18.1 \
onnxruntime~=1.18.1 \
onnxruntime-extensions \
opencv-python \
peft \
piccolo-theme \
Pillow==9.3.0 \
pluggy==0.12.0 \
protobuf==3.20.2 \
psutil \
ptflops \
pybind11 \
Expand All @@ -182,7 +181,7 @@ RUN python3 -m pip --no-cache-dir install \
pytorch-ignite \
PyYAML \
safetensors \
scikit-learn==1.1.3 \
scikit-learn \
scipy==1.8.1 \
spconv \
sphinx \
Expand All @@ -191,8 +190,7 @@ RUN python3 -m pip --no-cache-dir install \
sphinx-jinja \
sphinx-rtd-theme \
sphinx-tabs \
tensorboard==2.4.0 \
tensorboardX==2.4 \
tensorboard \
timm==0.4.12 \
torch==2.1.2+cpu -f https://download.pytorch.org/whl/torch_stable.html \
torchaudio==2.1.2+cpu -f https://download.pytorch.org/whl/torch_stable.html \
Expand Down
12 changes: 5 additions & 7 deletions Jenkins/Dockerfile.torch-cpu-pt113
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ RUN python3 -m pip --no-cache-dir install \
h5py \
ipykernel \
ipython \
Jinja2==3.0.3 \
Jinja2>=3.0.3 \
jupyter \
keras==2.2.4 \
lmdb==1.2.1 \
Expand All @@ -159,17 +159,16 @@ RUN python3 -m pip --no-cache-dir install \
nbsphinx \
networkx \
'numpy<1.24,>=1.20.5' \
onnx==1.16.1 \
onnx~=1.16.1 \
onnxscript \
onnxsim \
onnxruntime==1.18.1 \
onnxruntime~=1.18.1 \
onnxruntime-extensions \
opencv-python \
peft \
piccolo-theme \
Pillow==9.3.0 \
pluggy==0.12.0 \
protobuf==3.20.2 \
psutil \
ptflops \
pybind11 \
Expand All @@ -182,7 +181,7 @@ RUN python3 -m pip --no-cache-dir install \
pytorch-ignite \
PyYAML \
safetensors \
scikit-learn==1.1.3 \
scikit-learn \
scipy==1.8.1 \
spconv==2.1.20 \
sphinx \
Expand All @@ -191,8 +190,7 @@ RUN python3 -m pip --no-cache-dir install \
sphinx-jinja \
sphinx-rtd-theme \
sphinx-tabs \
tensorboard==2.4.0 \
tensorboardX==2.4 \
tensorboard \
timm==0.4.12 \
torch==1.13.1+cpu -f https://download.pytorch.org/whl/torch_stable.html \
torchaudio==0.13.1 -f https://download.pytorch.org/whl/torch_stable.html \
Expand Down
14 changes: 6 additions & 8 deletions Jenkins/Dockerfile.torch-gpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,26 +162,25 @@ RUN python3 -m pip --no-cache-dir install \
h5py \
ipykernel \
ipython \
Jinja2==3.0.3 \
Jinja2>=3.0.3 \
jupyter \
keras==2.2.4 \
lmdb==1.2.1 \
matplotlib>=3 \
mock \
nbsphinx==0.8.12 \
nbsphinx \
networkx \
'numpy<1.24,>=1.20.5' \
onnx==1.16.1 \
onnx~=1.16.1 \
onnxscript \
onnxsim \
onnxruntime==1.18.1 \
onnxruntime~=1.18.1 \
onnxruntime-extensions \
opencv-python \
peft \
piccolo-theme \
Pillow==9.3.0 \
pluggy==0.12.0 \
protobuf==3.20.2 \
psutil \
ptflops \
pybind11 \
Expand All @@ -194,7 +193,7 @@ RUN python3 -m pip --no-cache-dir install \
pytorch-ignite \
PyYAML \
safetensors \
scikit-learn==1.1.3 \
scikit-learn \
scipy==1.8.1 \
spconv-cu120 \
sphinx \
Expand All @@ -203,8 +202,7 @@ RUN python3 -m pip --no-cache-dir install \
sphinx-jinja \
sphinx-rtd-theme \
sphinx-tabs \
tensorboard==2.4.0 \
tensorboardX==2.4 \
tensorboard \
timm==0.4.12 \
torch==2.1.2+cu121 -f https://download.pytorch.org/whl/torch_stable.html \
torchaudio==2.1.2+cu121 -f https://download.pytorch.org/whl/torch_stable.html \
Expand Down
14 changes: 6 additions & 8 deletions Jenkins/Dockerfile.torch-gpu-pt113
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,26 +162,25 @@ RUN python3 -m pip --no-cache-dir install \
h5py \
ipykernel \
ipython \
Jinja2==3.0.3 \
Jinja2>=3.0.3 \
jupyter \
keras==2.2.4 \
lmdb==1.2.1 \
matplotlib>=3 \
mock \
nbsphinx==0.8.12 \
nbsphinx \
networkx \
'numpy<1.24,>=1.20.5' \
onnx==1.16.1 \
onnx~=1.16.1 \
onnxscript \
onnxsim \
onnxruntime==1.18.1 \
onnxruntime~=1.18.1 \
onnxruntime-extensions \
opencv-python \
peft \
piccolo-theme \
Pillow==9.3.0 \
pluggy==0.12.0 \
protobuf==3.20.2 \
psutil \
ptflops \
pybind11 \
Expand All @@ -194,7 +193,7 @@ RUN python3 -m pip --no-cache-dir install \
pytorch-ignite \
PyYAML \
safetensors \
scikit-learn==1.1.3 \
scikit-learn \
scipy==1.8.1 \
spconv-cu117 \
sphinx \
Expand All @@ -203,8 +202,7 @@ RUN python3 -m pip --no-cache-dir install \
sphinx-jinja \
sphinx-rtd-theme \
sphinx-tabs \
tensorboard==2.4.0 \
tensorboardX==2.4 \
tensorboard \
timm==0.4.12 \
torch==1.13.1+cu117 -f https://download.pytorch.org/whl/torch_stable.html \
torchaudio==0.13.1+cu117 -f https://download.pytorch.org/whl/torch_stable.html \
Expand Down
8 changes: 3 additions & 5 deletions Jenkins/fast-release/Dockerfile.torch-gpu-pt21-py310
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ RUN python3 -m pip --no-cache-dir install \
h5py \
ipykernel \
ipython \
Jinja2==3.0.3 \
Jinja2>=3.0.3 \
jupyter \
keras==2.2.4 \
lmdb==1.2.1 \
Expand All @@ -178,7 +178,6 @@ RUN python3 -m pip --no-cache-dir install \
piccolo-theme \
Pillow==9.3.0 \
pluggy==0.12.0 \
protobuf==3.20.2 \
psutil \
ptflops \
pybind11 \
Expand All @@ -190,7 +189,7 @@ RUN python3 -m pip --no-cache-dir install \
pytest-cov \
pytorch-ignite \
PyYAML \
scikit-learn==1.1.3 \
scikit-learn \
scipy==1.8.1 \
spconv-cu120 \
sphinx \
Expand All @@ -199,8 +198,7 @@ RUN python3 -m pip --no-cache-dir install \
sphinx-jinja \
sphinx-rtd-theme \
sphinx-tabs \
tensorboard==2.4.0 \
tensorboardX==2.4 \
tensorboard \
timm==0.4.12 \
torch==2.2.2 \
torchaudio==2.2.2 \
Expand Down
12 changes: 5 additions & 7 deletions Jenkins/fast-release/Dockerfile.torch-gpu-pt21-py38
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ RUN python3 -m pip --no-cache-dir install \
h5py==2.10.0 \
ipykernel \
ipython \
Jinja2==3.0.3 \
Jinja2>=3.0.3 \
jupyter \
keras==2.2.4 \
lmdb==1.2.1 \
Expand All @@ -165,16 +165,15 @@ RUN python3 -m pip --no-cache-dir install \
nbsphinx==0.8.12 \
networkx \
'numpy<1.24,>=1.20.5' \
onnx==1.14.1 \
onnx~=1.16.1 \
onnxscript \
onnxsim \
onnxruntime==1.15.1 \
onnxruntime~=1.18.1 \
onnxruntime-extensions \
opencv-python \
piccolo-theme \
Pillow==9.3.0 \
pluggy==0.12.0 \
protobuf==3.20.2 \
psutil \
ptflops \
pybind11 \
Expand All @@ -186,7 +185,7 @@ RUN python3 -m pip --no-cache-dir install \
pytest-cov==2.6.1 \
pytorch-ignite \
PyYAML \
scikit-learn==1.1.3 \
scikit-learn \
scipy==1.8.1 \
spconv-cu116 \
sphinx==3.5.3 \
Expand All @@ -195,8 +194,7 @@ RUN python3 -m pip --no-cache-dir install \
sphinx-jinja==1.1.1 \
sphinx-rtd-theme \
sphinx-tabs \
tensorboard==2.4.0 \
tensorboardX==2.4 \
tensorboard \
timm==0.4.12 \
torch==2.2.2 \
torchaudio==2.2.2 \
Expand Down
Loading
Loading