Skip to content

Update CMake configuration to support latest release #151

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

Merged
merged 5 commits into from
Jun 11, 2025
Merged

Update CMake configuration to support latest release #151

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
887fb92
Remove 'libopencv' dependencies
mc-nv Jun 5, 2025
07d64fe
Removing 'libcusparseLt.so' it appears a part of the devel image
mc-nv Jun 5, 2025
e5b34e2
Updating name of the variabl to presue it's purpose
mc-nv Jun 5, 2025
0e02a96
Remove 'libcusparseLt.so'
mc-nv Jun 5, 2025
e534184
Remove 'libopenblas.so.0' from dependency list
mc-nv Jun 9, 2025
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
44 changes: 6 additions & 38 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ endif() # TRITON_PYTORCH_ENABLE_TORCHTRT
if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
set(LIBS_ARCH "aarch64")
set(LIBTORCH_LIBS
"libopenblas.so.0"
"libnvpl_blas_core.so.0"
"libnvpl_blas_ilp64_gomp.so.0"
"libnvpl_blas_ilp64_seq.so.0"
Expand All @@ -206,16 +205,7 @@ else()
"libmkl_vml_def.so.1"
)
endif()
set(OPENCV_LIBS
"libopencv_video.so"
"libopencv_videoio.so"
"libopencv_highgui.so"
"libopencv_imgcodecs.so"
"libopencv_imgproc.so"
"libopencv_core.so"
"libopencv_calib3d.so"
"libopencv_flann.so"
"libopencv_features2d.so"
set(TORCHVISION_LIBS
$<IF:$<BOOL:${RHEL_BUILD}>,libjpeg.so.62,libjpeg.so>
$<IF:$<BOOL:${RHEL_BUILD}>,libpng16.so.16,libpng16.so>
)
Expand All @@ -231,7 +221,7 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
OUTPUT
${PT_LIBS}
${LIBTORCH_LIBS}
${OPENCV_LIBS}
${TORCHVISION_LIBS}
LICENSE.pytorch
include/torch
include/torchvision
Expand All @@ -248,24 +238,14 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH}/torch/lib/libtorch_cuda_linalg.so libtorch_cuda_linalg.so
COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH}/torch/lib/libtorch_global_deps.so libtorch_global_deps.so
COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH}/torch/lib/libcaffe2_nvrtc.so libcaffe2_nvrtc.so
# TODO: Revisit when not needed by making it part of cuda base container.
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/cuda/lib64/libcusparseLt.so libcusparseLt.so;
COMMAND /bin/sh -c "if [ ${TRITON_PYTORCH_ENABLE_TORCHVISION} = 'ON' ]; then if [ ${RHEL_BUILD} = 'ON' ]; then docker cp -a -L pytorch_backend_ptlib:/usr/local/lib64/libtorchvision.so libtorchvision.so; else docker cp -a -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libtorchvision.so.1 libtorchvision.so.1; fi; fi"
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"
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"
COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH}/torch_tensorrt/bin/torchtrtc torchtrtc || echo "error ignored..." || true
COMMAND docker cp pytorch_backend_ptlib:/opt/pytorch/pytorch/LICENSE LICENSE.pytorch
COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH}/torch/include include/torch
COMMAND docker cp pytorch_backend_ptlib:/opt/pytorch/pytorch/torch/csrc/jit/codegen include/torch/torch/csrc/jit/.
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_videoio.so libopencv_videoio.so
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_highgui.so libopencv_highgui.so
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_video.so libopencv_video.so
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_imgcodecs.so libopencv_imgcodecs.so
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_imgproc.so libopencv_imgproc.so
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_core.so libopencv_core.so
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_calib3d.so libopencv_calib3d.so
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_features2d.so libopencv_features2d.so
COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR}/libopencv_flann.so libopencv_flann.so

COMMAND /bin/sh -c "if [ ${RHEL_BUILD} = 'ON' ]; then docker cp -L pytorch_backend_ptlib:/usr/lib64/libjpeg.so.62 libjpeg.so.62; else docker cp -L pytorch_backend_ptlib:/usr/local/lib/libjpeg.so.62 libjpeg.so.62 && docker cp pytorch_backend_ptlib:/usr/lib/${LIBS_ARCH}-linux-gnu/libjpeg.so.8.2.2 libjpeg.so; fi;"
COMMAND /bin/sh -c "if [ ${RHEL_BUILD} = 'ON' ]; then docker cp -L pytorch_backend_ptlib:/usr/lib64/libpng16.so.16 libpng16.so.16; else docker cp -L pytorch_backend_ptlib:/usr/lib/${LIBS_ARCH}-linux-gnu/libpng16.so libpng16.so; fi;"
COMMAND /bin/sh -c "if [ -f libmkl_def.so.1 ]; then patchelf --add-needed libmkl_gnu_thread.so.1 libmkl_def.so.1; fi"
Expand All @@ -283,7 +263,7 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
COMMENT "Extracting pytorch and torchvision libraries and includes from ${TRITON_PYTORCH_DOCKER_IMAGE}"
VERBATIM
)
add_custom_target(ptlib_target DEPENDS ${PT_LIBS} ${LIBTORCH_LIBS} ${OPENCV_LIBS})
add_custom_target(ptlib_target DEPENDS ${PT_LIBS} ${LIBTORCH_LIBS} ${TORCHVISION_LIBS})
add_library(ptlib SHARED IMPORTED GLOBAL)
add_dependencies(ptlib ptlib_target)

Expand Down Expand Up @@ -449,14 +429,13 @@ install(

if (${TRITON_PYTORCH_DOCKER_BUILD})
set(PT_LIB_PATHS "")
FOREACH(plib ${PT_LIBS} ${LIBTORCH_LIBS} ${OPENCV_LIBS})
FOREACH(plib ${PT_LIBS} ${LIBTORCH_LIBS} ${TORCHVISION_LIBS})
set(PT_LIB_PATHS ${PT_LIB_PATHS} "${CMAKE_CURRENT_BINARY_DIR}/${plib}")
ENDFOREACH(plib)

install(
FILES
${PT_LIB_PATHS}
${CMAKE_CURRENT_BINARY_DIR}/libcusparseLt.so
${CMAKE_CURRENT_BINARY_DIR}/LICENSE.pytorch
DESTINATION ${CMAKE_INSTALL_PREFIX}/backends/pytorch
)
Expand All @@ -469,7 +448,7 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
)
endif() # TRITON_PYTORCH_ENABLE_TORCHTRT

FOREACH(plib ${PT_LIBS} ${LIBTORCH_LIBS} ${OPENCV_LIBS})
FOREACH(plib ${PT_LIBS} ${LIBTORCH_LIBS} ${TORCHVISION_LIBS})
install(
CODE
"EXECUTE_PROCESS(
Expand All @@ -482,22 +461,11 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
)
ENDFOREACH(plib)

set(OPENCV_VERSION "406")
install(
CODE
"EXECUTE_PROCESS(
COMMAND ln -sf libopencv_video.so libopencv_video.so.${OPENCV_VERSION}
COMMAND ln -sf libopencv_videoio.so libopencv_videoio.so.${OPENCV_VERSION}
COMMAND ln -sf libopencv_highgui.so libopencv_highgui.so.${OPENCV_VERSION}
COMMAND ln -sf libopencv_imgcodecs.so libopencv_imgcodecs.so.${OPENCV_VERSION}
COMMAND ln -sf libopencv_imgproc.so libopencv_imgproc.so.${OPENCV_VERSION}
COMMAND ln -sf libopencv_core.so libopencv_core.so.${OPENCV_VERSION}
COMMAND ln -sf libopencv_calib3d.so libopencv_calib3d.so.${OPENCV_VERSION}
COMMAND ln -sf libopencv_features2d.so libopencv_features2d.so.${OPENCV_VERSION}
COMMAND ln -sf libopencv_flann.so libopencv_flann.so.${OPENCV_VERSION}
COMMAND ln -sf libpng16.so libpng16.so.16
COMMAND ln -sf libjpeg.so libjpeg.so.8
COMMAND ln -sf libcusparseLt.so libcusparseLt.so.0
RESULT_VARIABLE LINK_STATUS
WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/backends/pytorch)
if(LINK_STATUS AND NOT LINK_STATUS EQUAL 0)
Expand Down