diff --git a/cpp/tensorrt_llm/CMakeLists.txt b/cpp/tensorrt_llm/CMakeLists.txt index c4814c1d4e..2e625f4687 100644 --- a/cpp/tensorrt_llm/CMakeLists.txt +++ b/cpp/tensorrt_llm/CMakeLists.txt @@ -294,8 +294,7 @@ if(TARGET ${NIXL_WRAPPER_TARGET}) endif() if(NOT WIN32) - set_target_properties(${SHARED_TARGET} PROPERTIES LINK_FLAGS - "-Wl,-rpath='$ORIGIN'") + set_target_properties(${SHARED_TARGET} PROPERTIES BUILD_RPATH "$ORIGIN") endif() if(BUILD_PYT) diff --git a/cpp/tensorrt_llm/thop/CMakeLists.txt b/cpp/tensorrt_llm/thop/CMakeLists.txt index 977ae7f915..6224c0d2c9 100644 --- a/cpp/tensorrt_llm/thop/CMakeLists.txt +++ b/cpp/tensorrt_llm/thop/CMakeLists.txt @@ -119,9 +119,9 @@ endif() if(NOT WIN32) set_target_properties( - th_common - PROPERTIES LINK_FLAGS - "-Wl,-rpath='$ORIGIN' ${AS_NEEDED_FLAG} ${UNDEFINED_FLAG}") + th_common PROPERTIES BUILD_RPATH "$ORIGIN;$ORIGIN/../../nvidia/nccl/lib") + set_target_properties( + th_common PROPERTIES LINK_FLAGS "${AS_NEEDED_FLAG} ${UNDEFINED_FLAG}") else() target_link_libraries(th_common PRIVATE context_attention_src) endif() diff --git a/jenkins/L0_Test.groovy b/jenkins/L0_Test.groovy index f43d454ac8..e99081d1c8 100644 --- a/jenkins/L0_Test.groovy +++ b/jenkins/L0_Test.groovy @@ -2079,11 +2079,6 @@ def launchTestJobs(pipeline, testFilter, dockerNode=null) checkPipStage = true } - if (cpu_arch == AARCH64_TRIPLE && values[5] != DLFW_IMAGE) { - checkPipStage = false - echo "Skip pip install sanity check due to https://nvbugs/5453827" - } - if (checkPipStage) { stage("Run LLMAPI tests") { pipInstallSanitySpec = createKubernetesPodConfig(values[5], gpu_type, k8s_arch)