Merge pull request #2960 from ilyasher/release/8.6.1-github

Fix python bindings build and README

Author: ilyasher

python/CMakeLists.txt

@@ -45,7 +45,7 @@ endif()
 
 # -------- PATHS --------
 message(STATUS "EXT_PATH: ${EXT_PATH}")
-message(STATUS "TENSORRT_BUILD: ${TENSORRT_BUILD}")
+message(STATUS "TENSORRT_LIBPATH: ${TENSORRT_LIBPATH}")
 message(STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}")
 message(STATUS "CUDA_ROOT: ${CUDA_ROOT}")
 message(STATUS "CUDA_INCLUDE_DIRS: ${CUDA_INCLUDE_DIRS}")
@@ -111,7 +111,7 @@ message(STATUS "PY_CONFIG_INCLUDE: ${PY_CONFIG_INCLUDE}")
 # -------- GLOBAL COMPILE OPTIONS --------
 
 include_directories(${TENSORRT_ROOT}/include ${PROJECT_SOURCE_DIR}/include ${CUDA_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/docstrings ${ONNX_INC_DIR} ${PYBIND11_DIR})
-link_directories(${TENSORRT_BUILD})
+link_directories(${TENSORRT_LIBPATH})
 
 if (MSVC)
     message(STATUS "include_dirs: ${MSVC_COMPILER_DIR}/include ${MSVC_COMPILER_DIR}/../ucrt/include ${NV_WDKSDK_INC}/um ${NV_WDKSDK_INC}/shared")

python/README.md

@@ -19,28 +19,36 @@ git clone https://github.com/pybind/pybind11.git
 1. Get the source code from the official [python sources](https://www.python.org/downloads/source/)
 2. Copy the contents of the `Include/` directory into `$EXT_PATH/pythonX.Y/include/` directory.
 
+Example: Python 3.9
+```bash
+wget https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tgz
+tar -xvf Python-3.9.16.tgz
+mkdir -p $EXT_PATH/python3.9
+cp -r Python-3.9.16/Include/ $EXT_PATH/python3.9/include
+```
+
 #### Add PyConfig.h
 
 1. Download the deb package for the desired platform from [here](https://packages.debian.org/search?searchon=contents&keywords=pyconfig.h&mode=path&suite=unstable&arch=any).
-    Typical plaforms include `x86_64` (`amd64`), `aarch64` (`arm64`), and `ppc64le` (`ppc64el`)
+    Typical plaforms include `x86_64` (`amd64`), `aarch64` (`arm64`), and `ppc64le` (`ppc64el`).
+    For older versions of Python, you may need to select a different suite.
 2. Unpack the debian with `ar x <libpython...>.deb`
 3. Unpack the contained `data.tar.xz` with `tar -xvf`
-4. Copy the `./usr/include/<platform>/` directory into the `$$EXT_PATH/pythonX.Y/include/` directory here.
-    It should only contain a single file - `pyconfig.h`
+4. Find `pyconfig.h` in the `./usr/include/<platform>/pythonX.Y/` directory and copy it into `$EXT_PATH/pythonX.Y/include/`.
 
 
 ### Build Python bindings
 
 Use `build.sh` to generate the installable wheels for intended python version and target architecture.
 
-Example: for python 3.8 `x86_64` wheel,
+Example: for Python 3.9 `x86_64` wheel,
 ```bash
 cd $TRT_OSSPATH/python
-PYTHON_MAJOR_VERSION=3 PYTHON_MINOR_VERSION=8 TARGET_ARCHITECTURE=x86_64 ./build.sh
+TENSORRT_MODULE=tensorrt PYTHON_MAJOR_VERSION=3 PYTHON_MINOR_VERSION=9 TARGET_ARCHITECTURE=x86_64 ./build.sh
 ```
 
 ### Install the python wheel
 
 ```bash
-python3 -m pip install build/dist/tensorrt-*.whl
+python3 -m pip install ./build/bindings_wheel/dist/tensorrt-*.whl
 ```

python/build.sh

@@ -35,7 +35,8 @@ cmake .. -DCMAKE_BUILD_TYPE=Release \
          -DEXT_PATH=${EXT_PATH} \
          -DCUDA_INCLUDE_DIRS=${CUDA_ROOT}/include \
          -DTENSORRT_ROOT=${ROOT_PATH} \
-         -DTENSORRT_BUILD=${ROOT_PATH}/build/
+         -DTENSORRT_MODULE=${TENSORRT_MODULE} \
+         -DTENSORRT_LIBPATH=${TRT_LIBPATH}
 make -j12
 
 # Generate wheel
@@ -52,13 +53,19 @@ expand_vars_cp () {
     test -f ${1} || (echo "ERROR: File: ${1} does not exist!" && exit 1); \
     sed -e "s|\#\#TENSORRT_VERSION\#\#|${TRT_VERSION}|g" \
         -e "s|\#\#TENSORRT_MAJMINPATCH\#\#|${TRT_MAJMINPATCH}|g" \
+        -e "s|\#\#TENSORRT_PYTHON_VERSION\#\#|${TRT_MAJMINPATCH}|g" \
+        -e "s|\#\#TENSORRT_MODULE\#\#|${TENSORRT_MODULE}|g" \
         ${1} > ${2}
 }
 
 pushd ${ROOT_PATH}/python/packaging
 for dir in $(find . -type d); do mkdir -p ${WHEEL_OUTPUT_DIR}/$dir; done
 for file in $(find . -type f); do expand_vars_cp $file ${WHEEL_OUTPUT_DIR}/${file}; done
 popd
+cp tensorrt/tensorrt.so bindings_wheel/tensorrt/tensorrt.so
+
+pushd ${WHEEL_OUTPUT_DIR}/bindings_wheel
+
 python3 setup.py -q bdist_wheel --python-tag=cp${PYTHON_MAJOR_VERSION}${PYTHON_MINOR_VERSION} --plat-name=linux_${TARGET}
 
 popd