Fix bundle nvcomp option setting

Signed-off-by: Kamil Tokarski <ktokarski@nvidia.com>

Author: stiepan

conda/recipe/build.sh

@@ -53,8 +53,7 @@ else
 fi
 
 
-export BUILD_NVCOMP=${BUILD_NVCOMP:-ON}
-export WITH_DYNAMIC_NVCOMP=${WITH_DYNAMIC_NVCOMP:-OFF}
+export BUILD_NVCOMP=${BUILD_NVCOMP:-OFF}
 
 # Create build directory for cmake and enter it
 mkdir $SRC_DIR/build
@@ -88,7 +87,6 @@ cmake -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda \
       -DBUILD_NVML=${BUILD_NVML:-ON}                      \
       -DBUILD_CUFILE=${BUILD_CUFILE:-ON}                  \
       -DBUILD_NVCOMP=${BUILD_NVCOMP}                      \
-      -DWITH_DYNAMIC_NVCOMP=${WITH_DYNAMIC_NVCOMP}        \
       -DLINK_LIBCUDA=${LINK_LIBCUDA:-OFF}                 \
       -DWITH_DYNAMIC_CUDA_TOOLKIT=${WITH_DYNAMIC_CUDA_TOOLKIT:-${WITH_DYNAMIC_CUDA_TOOLKIT_DEFAULT}}\
       -DVERBOSE_LOGS=${VERBOSE_LOGS:-OFF}                 \
@@ -126,7 +124,7 @@ DEPS_SONAME=(
     "libswscale.so.6"
 )
 
-if [ ${ARCH} = "x86_64" ] && [ "$BUILD_NVCOMP" = "ON" ] && [ "$WITH_DYNAMIC_NVCOMP" != "ON"]; then
+if [ "$BUILD_NVCOMP" = "ON" ]; then
     DEPS_LIST+=(
         "${DEPS_PATH}/cuda/lib64/libnvcomp.so"
         "${DEPS_PATH}/cuda/lib64/libnvcomp_gdeflate.so"

docker/build.sh

@@ -170,7 +170,6 @@ if [ "$BUILD_INHOST" == "YES" ]; then
                                         BUILD_FFTS=${BUILD_FFTS}                  \
                                         BUILD_CUFILE=${BUILD_CUFILE}              \
                                         BUILD_NVCOMP=${BUILD_NVCOMP}              \
-                                        WITH_DYNAMIC_NVCOMP=${WITH_DYNAMIC_NVCOMP} \
                                         LINK_DRIVER=${LINK_DRIVER}                \
                                         WITH_DYNAMIC_CUDA_TOOLKIT=${WITH_DYNAMIC_CUDA_TOOLKIT} \
                                         STRIP_BINARY=${STRIP_BINARY}              \
@@ -213,7 +212,6 @@ else
                                    --build-arg "BUILD_FFTS=${BUILD_FFTS}"                  \
                                    --build-arg "BUILD_CUFILE=${BUILD_CUFILE}"              \
                                    --build-arg "BUILD_NVCOMP=${BUILD_NVCOMP}"              \
-                                   --build-arg "WITH_DYNAMIC_NVCOMP=${WITH_DYNAMIC_NVCOMP}" \
                                    --build-arg "LINK_DRIVER=${LINK_DRIVER}"                \
                                    --build-arg "WITH_DYNAMIC_CUDA_TOOLKIT=${WITH_DYNAMIC_CUDA_TOOLKIT}"\
                                    --build_arg "STRIP_BINARY=${STRIP_BINARY}"              \

docker/build_helper.sh

@@ -45,7 +45,6 @@ export BUILD_NVML=${BUILD_NVML:-ON}
 export BUILD_FFTS=${BUILD_FFTS:-ON}
 export BUILD_CUFILE=${BUILD_CUFILE-OFF}
 export BUILD_NVCOMP=${BUILD_NVCOMP-OFF}
-export WITH_DYNAMIC_NVCOMP=${WITH_DYNAMIC_NVCOMP-OFF}
 export LINK_LIBCUDA=${LINK_LIBCUDA:-OFF}
 export LINK_CUDA_DYNAMICALLY=${LINK_CUDA_DYNAMICALLY:-OFF}
 export WITH_DYNAMIC_CUDA_TOOLKIT=${WITH_DYNAMIC_CUDA_TOOLKIT:-OFF}
@@ -92,7 +91,6 @@ cmake ../ -DCMAKE_INSTALL_PREFIX=.                 \
       -DBUILD_FFTS=${BUILD_FFTS}                   \
       -DBUILD_CUFILE=${BUILD_CUFILE}               \
       -DBUILD_NVCOMP=${BUILD_NVCOMP}               \
-      -DWITH_DYNAMIC_NVCOMP=${WITH_DYNAMIC_NVCOMP} \
       -DLINK_LIBCUDA=${LINK_LIBCUDA}               \
       -DLINK_CUDA_DYNAMICALLY=${LINK_CUDA_DYNAMICALLY} \
       -DWITH_DYNAMIC_CUDA_TOOLKIT=${WITH_DYNAMIC_CUDA_TOOLKIT} \
@@ -109,7 +107,7 @@ if [ "${WERROR}" = "ON" ]; then
 fi
 make -j"$(grep ^processor /proc/cpuinfo | wc -l)"
 
-if [ ${ARCH} = "x86_64" ] && [ "$BUILD_NVCOMP" = "ON" ] && [ "$WITH_DYNAMIC_NVCOMP" != "ON"]; then
+if [ "$BUILD_NVCOMP" = "ON" ]; then
     export BUNDLE_NVCOMP=YES
 else
     export BUNDLE_NVCOMP=NO

qa/TL0_python-self-test_xavier/test_nofw.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 # used pip packages
 # due to https://github.com/numpy/numpy/issues/18131 we cannot use 1.19.5
-pip_packages='${python_test_runner_package} dataclasses numpy>=1.17,<=1.19.4 opencv-python pillow psutil lz4'
+pip_packages='${python_test_runner_package} dataclasses numpy>=1.17,<=1.19.4 opencv-python pillow psutil'
 
 target_dir=./dali/test/python