Skip to content

Commit

Permalink
Update Dockerfile_ubuntu_deps
Browse files Browse the repository at this point in the history
Revert CPU_CORES change as ENV cannot be dynamically set based on a script.
  • Loading branch information
c-ewing authored Dec 4, 2024
1 parent d3aa324 commit 6d33a3d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile_ubuntu_deps
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ COPY dl/fcn_resnet50.onnx ${AV_INSTALL}/share/aliceVision/
ENV ALICEVISION_SEMANTIC_SEGMENTATION_MODEL=${AV_INSTALL}/share/aliceVision/fcn_resnet50.onnx

COPY docker/check-cpu.sh ${AV_DEV}/docker/check-cpu.sh
ENV CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`
RUN echo "Build multithreading number of cores: ${CPU_CORES}"
RUN echo "Build multithreading number of cores: `${AV_DEV}/docker/check-cpu.sh`"

COPY CMakeLists.txt ${AV_DEV}/
COPY src/cmake/Dependencies.cmake ${AV_DEV}/src/cmake/
Expand Down Expand Up @@ -120,6 +119,7 @@ RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib/x86_64-linux-gn
# RUN make -j ${CPU_CORES} popsift
# RUN make -j ${CPU_CORES} cctag

RUN cmake --build . -j ${CPU_CORES} && \
RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` && \
cmake --build . -j ${CPU_CORES} && \
mv "${AV_INSTALL}/bin" "${AV_INSTALL}/bin-deps" && \
rm -rf "${AV_BUILD}"

0 comments on commit 6d33a3d

Please sign in to comment.