Skip to content

Commit

Permalink
Support all python in ubuntu2204 (#3511)
Browse files Browse the repository at this point in the history
Signed-off-by: Kyunggeun Lee <quic_kyunggeu@quicinc.com>
  • Loading branch information
quic-kyunggeu authored Nov 19, 2024
1 parent 58cbd46 commit fe63f10
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 18 deletions.
12 changes: 6 additions & 6 deletions Jenkins/fast-release/Dockerfile.torch-gpu-pt21-py310
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ RUN python3 -m pip --no-cache-dir install \
mock \
nbsphinx==0.8.12 \
networkx \
'numpy<1.24,>=1.20.5' \
onnx==1.14.1 \
'numpy<2' \
onnx \
onnxscript \
onnxsim \
onnxruntime==1.15.1 \
Expand All @@ -189,8 +189,9 @@ RUN python3 -m pip --no-cache-dir install \
pytest-cov \
pytorch-ignite \
PyYAML \
safetensors \
scikit-learn \
scipy==1.8.1 \
scipy \
spconv-cu120 \
sphinx \
sphinx-autodoc-typehints \
Expand Down Expand Up @@ -257,11 +258,10 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so

RUN python3 -m pip install git-pylint-commit-hook osqp twine

# NOTE: We need to pin the holoviews version to this since the latest version has a circular dependency on bokeh 2.0.0 through the panel package
RUN python3 -m pip install holoviews==1.18.3 netron jsonschema pandas==1.5.3
RUN python3 -m pip install holoviews netron jsonschema pandas

# Note: bokeh requires Pillow while we need to use Pillow-SIMD for performance reasons.
RUN python3 -m pip install bokeh==3.2.2 hvplot==0.9.2
RUN python3 -m pip install bokeh hvplot

# Remove onnxruntime install and replace with onnxruntime-gpu
RUN export ONNXRUNTIME_VER=$(python3 -c 'import onnxruntime; print(onnxruntime.__version__)') && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
bokeh==3.2.2
bokeh
cvxpy
dataclasses
h5py
holoviews==1.18.3
hvplot==0.9.2
holoviews
hvplot
Jinja2>=3.0.3
jsonschema
matplotlib>=3
networkx
numpy<1.24,>=1.20.5
onnx~=1.16.1
numpy<2
onnx
onnxscript
onnxsim
osqp
pandas==1.5.3
pandas
psutil
pybind11
PyYAML
safetensors
scikit-learn
scipy==1.8.1
scipy
setuptools
tensorboard
torch==2.2.2
Expand Down
8 changes: 3 additions & 5 deletions packaging/setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@

import os
import sys
import shlex
import subprocess

from pathlib import Path
from setuptools import find_packages, find_namespace_packages, setup
Expand Down Expand Up @@ -200,15 +198,15 @@ def get_required_package_data(aimet_package_name):

# Loop over package artifacts folder and create package contents' list
required_package_data = ['acceptance_tests/*.*']
for path, _, filenames in os.walk(aimet_package_name):
for path, _, filenames in os.walk(aimet_package_name):
# Loop over each individual asset
for filename in filenames:
filename_with_path = os.path.join(path, filename)
if filename.endswith('.json') or \
filename.endswith('.so') or \
path.startswith(aimet_package_name + '/x86_64-linux-gnu') or \
filename_with_path in package_dependency_files:

required_package_data.append(filename_with_path)

required_package_data = ['/'.join(files.split('/')[1:]) for files in required_package_data]
Expand Down Expand Up @@ -307,7 +305,7 @@ setup(
include_package_data=True,
zip_safe=True,
platforms='x86',
python_requires='>=3.8, !=3.9.*, <3.11',
python_requires='>=3.8.0',
cmdclass={
'bdist_wheel': bdist_wheel_aimet,
},
Expand Down

0 comments on commit fe63f10

Please sign in to comment.