Add Python 3.10 modules (#1573)

* Add Python 3.10 modules * Update packages for 22.04 help * set to ONNX 1.10.2 * moved python package installs to script
ROCm · Feb 22, 2023 · c2672cf · c2672cf
1 parent 01907e2
commit c2672cf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -54,9 +54,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# add this for roctracer dependancies
-RUN pip3 install CppHeaderParser packaging==22.0
-
 # Workaround broken rocm packages
 RUN ln -s /opt/rocm-* /opt/rocm
 RUN echo "/opt/rocm/lib" > /etc/ld.so.conf.d/rocm.conf

diff --git a/cmake/PythonModules.cmake b/cmake/PythonModules.cmake
@@ -76,7 +76,7 @@ function(py_add_module NAME)
     )
 
 endfunction()
-set(PYTHON_SEARCH_VERSIONS 2.7 3.5 3.6 3.7 3.8 3.9)
+set(PYTHON_SEARCH_VERSIONS 2.7 3.5 3.6 3.7 3.8 3.9 3.10)
 set(PYTHON_DISABLE_VERSIONS "" CACHE STRING "")
 foreach(PYTHON_DISABLE_VERSION ${PYTHON_DISABLE_VERSIONS})
     list(REMOVE_ITEM PYTHON_SEARCH_VERSIONS ${PYTHON_DISABLE_VERSION})

diff --git a/tools/install_prereqs.sh b/tools/install_prereqs.sh
@@ -57,7 +57,7 @@ echo "Dependencies are installed at $PREFIX"
 rbuild prepare -d $PREFIX -s develop
 
 # install onnx package for unit tests
-pip3 install onnx==1.10.0 numpy==1.21.6 typing==3.7.4 pytest==6.0.1 packaging==16.8
+pip3 install onnx==1.10.2 numpy==1.21.6 typing==3.7.4 pytest==6.0.1 packaging==23.0 CppHeaderParser
 
 # pin version of protobuf in Python for onnx runtime unit tests
 pip3 install protobuf==3.20.0