#43 debug

insight-platform · Jan 12, 2023 · 585037b · 585037b
1 parent 3d4fd3a
commit 585037b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/docker/Dockerfile.deepstream b/docker/Dockerfile.deepstream
@@ -23,12 +23,7 @@ WORKDIR /opencv/build
 
 RUN python3 -m pip install --no-cache-dir 'numpy~=1.22.4'
 
-#COPY libs/opencv/savant /opencv/opencv_contrib/modules/savant
-COPY libs/opencv/savant/CMakeLists.txt /opencv/opencv_contrib/modules/savant/CMakeLists.txt
-RUN mkdir -p /opencv/opencv_contrib/modules/savant/include/opencv2 \
-    && mkdir -p /opencv/opencv_contrib/modules/savant/src \
-    && echo > /opencv/opencv_contrib/modules/savant/include/opencv2/savant.hpp \
-    && echo > /opencv/opencv_contrib/modules/savant/src/savant.cpp
+COPY libs/opencv/savant /opencv/opencv_contrib/modules/savant
 RUN --mount=type=cache,target=/tmp/opencv-cache \
     cmake \
         -D CMAKE_BUILD_TYPE=RELEASE \
@@ -50,9 +45,6 @@ RUN --mount=type=cache,target=/tmp/opencv-cache \
         -D WITH_GSTREAMER=ON \
         /opencv/opencv
 
-RUN make -j$(nproc) opencv_core opencv_cudev opencv_cudaimgproc
-COPY libs/opencv/savant /opencv/opencv_contrib/modules/savant
-RUN make -j$(nproc) opencv_savant
 RUN make -j$(nproc) install
 
 

diff --git a/docker/Dockerfile.deepstream-l4t b/docker/Dockerfile.deepstream-l4t
@@ -20,12 +20,7 @@ WORKDIR /opencv/build
 
 RUN python3 -m pip install --no-cache-dir 'numpy~=1.22.4'
 
-#COPY libs/opencv/savant /opencv/opencv_contrib/modules/savant
-COPY libs/opencv/savant/CMakeLists.txt /opencv/opencv_contrib/modules/savant/CMakeLists.txt
-RUN mkdir -p /opencv/opencv_contrib/modules/savant/include/opencv2 \
-    && mkdir -p /opencv/opencv_contrib/modules/savant/src \
-    && echo > /opencv/opencv_contrib/modules/savant/include/opencv2/savant.hpp \
-    && echo > /opencv/opencv_contrib/modules/savant/src/savant.cpp
+COPY libs/opencv/savant /opencv/opencv_contrib/modules/savant
 RUN --mount=type=cache,target=/tmp/opencv-cache \
     cmake \
         -D CMAKE_BUILD_TYPE=RELEASE \
@@ -47,9 +42,6 @@ RUN --mount=type=cache,target=/tmp/opencv-cache \
         -D WITH_GSTREAMER=ON \
         /opencv/opencv
 
-RUN make -j$(nproc) opencv_core opencv_cudev opencv_cudaimgproc
-COPY libs/opencv/savant /opencv/opencv_contrib/modules/savant
-RUN make -j$(nproc) opencv_savant
 RUN make -j$(nproc) install