new docker version fix

isl-org · Aug 6, 2024 · bbdc52f · bbdc52f
1 parent a57c6f6
commit bbdc52f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -427,12 +427,12 @@ if(BUILD_CUDA_MODULE)
             message(STATUS "Using CUDA architectures: ${CMAKE_CUDA_ARCHITECTURES}")
         endif()
     else()
-        execute_process(COMMAND nvidia-smi RESULT_VARIABLE HAVE_NVIDIA_GPU)
-        if (HAVE_NVIDIA_GPU)
+        execute_process(COMMAND nvidia-smi RESULT_VARIABLE NVIDIA_CHECK OUTPUT_QUIET)
+        if (NVIDIA_CHECK EQUAL 0)
             message(STATUS "Building with native CUDA architecture.")
             set(CMAKE_CUDA_ARCHITECTURES native)
         else()
-            message(WARNING "No CUDA GPU detected. Building with default CUDA architecture.")
+            message(WARNING "No CUDA GPU detected. Building with CMake default CUDA architecture.")
         endif()
     endif()
     enable_language(CUDA)

diff --git a/docker/docker_build.sh b/docker/docker_build.sh
@@ -154,7 +154,6 @@ openblas_build() {
 
     pushd "${HOST_OPEN3D_ROOT}"
     docker build \
-        --progress plain \
         --build-arg BASE_IMAGE="${BASE_IMAGE}" \
         --build-arg CONDA_SUFFIX="${CONDA_SUFFIX}" \
         --build-arg CMAKE_VERSION="${CMAKE_VERSION}" \
@@ -199,7 +198,6 @@ cuda_wheel_build() {
 
     pushd "${HOST_OPEN3D_ROOT}"
     docker build \
-        --progress plain \
         --build-arg BASE_IMAGE="${BASE_IMAGE}" \
         --build-arg DEVELOPER_BUILD="${DEVELOPER_BUILD}" \
         --build-arg CCACHE_TAR_NAME="${CCACHE_TAR_NAME}" \
@@ -238,7 +236,6 @@ ci_build() {
 
     pushd "${HOST_OPEN3D_ROOT}"
     docker build \
-        --progress plain \
         --build-arg BASE_IMAGE="${BASE_IMAGE}" \
         --build-arg DEVELOPER_BUILD="${DEVELOPER_BUILD}" \
         --build-arg CCACHE_TAR_NAME="${CCACHE_TAR_NAME}" \