Skip to content

Commit 8fbacf5

Browse files
committed
Enable support for Ubuntu 24.04 (#141)
* Update Python version * Update version for ligpng * Set proper path * Update pytorch libraryr destination * Update copy file configuration * Remov interactive flag * Update CMake * Update match pattern to pick shared object file only
1 parent e97a900 commit 8fbacf5

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ find_package(Python3 REQUIRED COMPONENTS Development.Module)
8989
set(RHEL_BUILD OFF)
9090
set(LIB_DIR "lib")
9191
set(LIBTORCH_LIBS_PATH "/usr/local/lib")
92-
set(PY_INSTALL_PATH "/usr/local/lib/python3.10/dist-packages")
92+
set(PY_INSTALL_PATH "/usr/local/lib/python3.12/dist-packages")
9393
if(LINUX)
9494
file(STRINGS "/etc/os-release" DISTRO_ID_LIKE REGEX "ID_LIKE")
9595
if(${DISTRO_ID_LIKE} MATCHES "rhel|centos")
9696
set(RHEL_BUILD ON)
9797
set(LIB_DIR "lib64")
98-
set(PY_INSTALL_PATH "/opt/_internal/cpython-3.10.13/lib/python3.10/site-packages")
98+
set(PY_INSTALL_PATH "/opt/_internal/cpython-3.12.1/lib/python3.12/site-packages")
9999
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
100-
set(LIBTORCH_LIBS_PATH "/opt/_internal/cpython-3.10.13/lib")
100+
set(LIBTORCH_LIBS_PATH "/opt/_internal/cpython-3.12.1/lib")
101101
endif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
102102
endif(${DISTRO_ID_LIKE} MATCHES "rhel|centos")
103103
endif(LINUX)
@@ -223,6 +223,7 @@ set(OPENCV_LIBS
223223
# in some cases leads to segmentation faults.
224224
if (${TRITON_PYTORCH_DOCKER_BUILD})
225225
string(REPLACE ";" " " LIBTORCH_LIBS_STR "${LIBTORCH_LIBS}")
226+
string(RANDOM 8 "abcdefghijklmnopqrstuvwxyz" random_id)
226227

227228
add_custom_command(
228229
OUTPUT
@@ -249,7 +250,7 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
249250
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/cuda/lib64/libcusparseLt.so libcusparseLt.so;
250251
COMMAND /bin/sh -c "if [ ${TRITON_PYTORCH_ENABLE_TORCHVISION} = 'ON' ]; then docker cp pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libtorchvision.so libtorchvision.so; fi"
251252
COMMAND /bin/sh -c "if [ ${TRITON_PYTORCH_ENABLE_TORCHVISION} = 'ON' ]; then docker cp pytorch_backend_ptlib:/opt/pytorch/vision/torchvision/csrc include/torchvision/torchvision; fi"
252-
COMMAND /bin/sh -c "if [ ${TRITON_PYTORCH_ENABLE_TORCHTRT} = 'ON' ]; then docker cp pytorch_backend_ptlib:/usr/local/lib/python3.10/dist-packages/torch_tensorrt/lib/libtorchtrt_runtime.so libtorchtrt_runtime.so; fi"
253+
COMMAND /bin/sh -c "if [ ${TRITON_PYTORCH_ENABLE_TORCHTRT} = 'ON' ]; then docker cp pytorch_backend_ptlib:/usr/local/lib/python3.12/dist-packages/torch_tensorrt/lib/libtorchtrt_runtime.so libtorchtrt_runtime.so; fi"
253254
COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH}/torch_tensorrt/bin/torchtrtc torchtrtc || echo "error ignored..." || true
254255
COMMAND docker cp pytorch_backend_ptlib:/opt/pytorch/pytorch/LICENSE LICENSE.pytorch
255256
COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH}/torch/include include/torch
@@ -263,8 +264,10 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
263264
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_calib3d.so libopencv_calib3d.so
264265
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_features2d.so libopencv_features2d.so
265266
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_flann.so libopencv_flann.so
266-
COMMAND /bin/sh -c "docker cp pytorch_backend_ptlib:$<IF:$<BOOL:${RHEL_BUILD}>,/usr/lib64/libpng16.so.16.34.0,/usr/lib/${LIBS_ARCH}-linux-gnu/libpng16.so.16.37.0> libpng16.so"
267-
COMMAND /bin/sh -c "docker cp pytorch_backend_ptlib:$<IF:$<BOOL:${RHEL_BUILD}>,/usr/lib64/libjpeg.so.62.2.0,/usr/lib/${LIBS_ARCH}-linux-gnu/libjpeg.so.8.2.2> libjpeg.so"
267+
COMMAND /bin/sh -c "docker run --name libjpeg-${random_id} ${TRITON_PYTORCH_DOCKER_IMAGE} find /usr/lib64 /usr/local/lib/python3.12/dist-packages/torchvision.libs/ -name libjpeg*.so* -type f -exec cp -v {} /tmp/libjpeg.so \\; || true"
268+
COMMAND docker cp libjpeg-${random_id}:/tmp/libjpeg.so libjpeg.so
269+
COMMAND /bin/sh -c "docker run --name libpng-${random_id} ${TRITON_PYTORCH_DOCKER_IMAGE} find /usr/lib64 /usr/local/lib/python3.12/dist-packages/torchvision.libs/ -name libpng*.so* -type f -exec cp -v {} /tmp/libpng16.so \\; || true"
270+
COMMAND docker cp libpng-${random_id}:/tmp/libpng16.so libpng16.so
268271
COMMAND /bin/sh -c "if [ -f libmkl_def.so.1 ]; then patchelf --add-needed libmkl_gnu_thread.so.1 libmkl_def.so.1; fi"
269272
COMMAND /bin/sh -c "if [ -f libmkl_def.so.1 ]; then patchelf --add-needed libmkl_core.so.1 libmkl_def.so.1; fi"
270273
COMMAND /bin/sh -c "if [ -f libmkl_avx2.so.1 ]; then patchelf --add-needed libmkl_gnu_thread.so.1 libmkl_avx2.so.1; fi"
@@ -493,6 +496,7 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
493496
COMMAND ln -sf libopencv_flann.so libopencv_flann.so.${OPENCV_VERSION}
494497
COMMAND ln -sf libpng16.so libpng16.so.16
495498
COMMAND ln -sf libjpeg.so libjpeg.so.8
499+
COMMAND ln -sf libjpeg.so libjpeg.so.62
496500
COMMAND ln -sf libcusparseLt.so libcusparseLt.so.0
497501
RESULT_VARIABLE LINK_STATUS
498502
WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/backends/pytorch)

0 commit comments

Comments
 (0)