@@ -207,15 +207,6 @@ else()
207207 )
208208endif ()
209209set (OPENCV_LIBS
210- "libopencv_video.so"
211- "libopencv_videoio.so"
212- "libopencv_highgui.so"
213- "libopencv_imgcodecs.so"
214- "libopencv_imgproc.so"
215- "libopencv_core.so"
216- "libopencv_calib3d.so"
217- "libopencv_flann.so"
218- "libopencv_features2d.so"
219210 $<IF:$<BOOL :${RHEL_BUILD} >,libjpeg.so.62,libjpeg.so>
220211 $<IF:$<BOOL :${RHEL_BUILD} >,libpng16.so.16,libpng16.so>
221212)
@@ -248,7 +239,7 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
248239 COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH} /torch/lib/libtorch_cuda_linalg.so libtorch_cuda_linalg.so
249240 COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH} /torch/lib/libtorch_global_deps.so libtorch_global_deps.so
250241 COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH} /torch/lib/libcaffe2_nvrtc.so libcaffe2_nvrtc.so
251- # TODO: Revisit when not needed by making it part of cuda base container.
242+ # TODO:Revisit when not needed by making it part of cuda base container.
252243 COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/cuda/lib64/libcusparseLt.so libcusparseLt.so;
253244 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"
254245 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"
@@ -257,15 +248,7 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
257248 COMMAND docker cp pytorch_backend_ptlib:/opt/pytorch/pytorch/LICENSE LICENSE.pytorch
258249 COMMAND docker cp pytorch_backend_ptlib:${PY_INSTALL_PATH} /torch/include include /torch
259250 COMMAND docker cp pytorch_backend_ptlib:/opt/pytorch/pytorch/torch/csrc/jit/codegen include /torch/torch/csrc/jit/.
260- COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR} /libopencv_videoio.so libopencv_videoio.so
261- COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR} /libopencv_highgui.so libopencv_highgui.so
262- COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR} /libopencv_video.so libopencv_video.so
263- COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR} /libopencv_imgcodecs.so libopencv_imgcodecs.so
264- COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR} /libopencv_imgproc.so libopencv_imgproc.so
265- COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR} /libopencv_core.so libopencv_core.so
266- COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR} /libopencv_calib3d.so libopencv_calib3d.so
267- COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR} /libopencv_features2d.so libopencv_features2d.so
268- COMMAND docker cp -L pytorch_backend_ptlib:/usr/local/${LIB_DIR} /libopencv_flann.so libopencv_flann.so
251+
269252 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;"
270253 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;"
271254 COMMAND /bin/sh -c "if [ -f libmkl_def.so.1 ]; then patchelf --add-needed libmkl_gnu_thread.so.1 libmkl_def.so.1; fi"
@@ -482,19 +465,9 @@ if (${TRITON_PYTORCH_DOCKER_BUILD})
482465 )
483466 ENDFOREACH (plib)
484467
485- set (OPENCV_VERSION "406" )
486468 install (
487469 CODE
488470 "EXECUTE_PROCESS(
489- COMMAND ln -sf libopencv_video.so libopencv_video.so.${OPENCV_VERSION}
490- COMMAND ln -sf libopencv_videoio.so libopencv_videoio.so.${OPENCV_VERSION}
491- COMMAND ln -sf libopencv_highgui.so libopencv_highgui.so.${OPENCV_VERSION}
492- COMMAND ln -sf libopencv_imgcodecs.so libopencv_imgcodecs.so.${OPENCV_VERSION}
493- COMMAND ln -sf libopencv_imgproc.so libopencv_imgproc.so.${OPENCV_VERSION}
494- COMMAND ln -sf libopencv_core.so libopencv_core.so.${OPENCV_VERSION}
495- COMMAND ln -sf libopencv_calib3d.so libopencv_calib3d.so.${OPENCV_VERSION}
496- COMMAND ln -sf libopencv_features2d.so libopencv_features2d.so.${OPENCV_VERSION}
497- COMMAND ln -sf libopencv_flann.so libopencv_flann.so.${OPENCV_VERSION}
498471 COMMAND ln -sf libpng16.so libpng16.so.16
499472 COMMAND ln -sf libjpeg.so libjpeg.so.8
500473 COMMAND ln -sf libcusparseLt.so libcusparseLt.so.0
0 commit comments