From 2a85811d379f07cd94de9265eabf28b6d4e38f77 Mon Sep 17 00:00:00 2001
From: Janusz Lisiecki <39967756+JanuszL@users.noreply.github.com>
Date: Wed, 2 Dec 2020 11:10:20 +0100
Subject: [PATCH] Enable GDS for conda build by default (#2515)

Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
---
 conda/recipe/build.sh                         | 2 ++
 dali/operators/reader/video_reader_op_test.cc | 2 ++
 docker/build_helper.sh                        | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/conda/recipe/build.sh b/conda/recipe/build.sh
index 07dfdd8161..d090f90db5 100644
--- a/conda/recipe/build.sh
+++ b/conda/recipe/build.sh
@@ -74,6 +74,8 @@ cmake -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda \
       -DBUILD_NVOF=${BUILD_NVOF:-ON}                      \
       -DBUILD_NVDEC=${BUILD_NVDEC:-ON}                    \
       -DBUILD_NVML=${BUILD_NVML:-ON}                      \
+      -DBUILD_CUFILE=${BUILD_CUFILE:-ON}                  \
+      -DLINK_LIBCUDA=${LINK_LIBCUDA:-OFF}                 \
       -DVERBOSE_LOGS=${VERBOSE_LOGS:-OFF}                 \
       -DWERROR=${WERROR:-ON}                              \
       -DBUILD_WITH_ASAN=${BUILD_WITH_ASAN:-OFF}           \
diff --git a/dali/operators/reader/video_reader_op_test.cc b/dali/operators/reader/video_reader_op_test.cc
index 3dca150bb5..aaae017060 100644
--- a/dali/operators/reader/video_reader_op_test.cc
+++ b/dali/operators/reader/video_reader_op_test.cc
@@ -102,6 +102,7 @@ TEST_F(VideoReaderTest, MultipleVideoResolution) {
   float driverVersion = 0;
   char version[80];
 
+#if NVML_ENABLED
   if (nvmlInitChecked() != NVML_SUCCESS) {
     FAIL() << "nvmlInitChecked() failed";
   }
@@ -109,6 +110,7 @@ TEST_F(VideoReaderTest, MultipleVideoResolution) {
   if (nvmlSystemGetDriverVersion(version, sizeof version) != NVML_SUCCESS) {
     FAIL() << "nvmlSystemGetDriverVersion failed!";
   }
+#endif
 
   driverVersion = std::stof(version);
 
diff --git a/docker/build_helper.sh b/docker/build_helper.sh
index 2a99490b98..f17b6b71ff 100755
--- a/docker/build_helper.sh
+++ b/docker/build_helper.sh
@@ -81,7 +81,7 @@ cmake ../ -DCMAKE_INSTALL_PREFIX=.                 \
       -DBUILD_LIBSND=${BUILD_LIBSND}               \
       -DBUILD_NVML=${BUILD_NVML}                   \
       -DBUILD_FFTS=${BUILD_FFTS}                   \
-      -DBUILD_CUFILE=${BUILD_CUFILE}                \
+      -DBUILD_CUFILE=${BUILD_CUFILE}               \
       -DLINK_LIBCUDA=${LINK_LIBCUDA}               \
       -DVERBOSE_LOGS=${VERBOSE_LOGS}               \
       -DWERROR=${WERROR}                           \