diff --git a/docker/Dockerfile_centos_deps b/docker/Dockerfile_centos_deps index 75ddca698c..137cf099f2 100644 --- a/docker/Dockerfile_centos_deps +++ b/docker/Dockerfile_centos_deps @@ -65,6 +65,9 @@ ENV PATH="/opt/rh/devtoolset-10/root/usr/bin:${PATH}" \ COPY dl/vlfeat_K80L3.SIFT.tree ${AV_INSTALL}/share/aliceVision/ RUN echo "export ALICEVISION_VOCTREE=${AV_INSTALL}/share/aliceVision/vlfeat_K80L3.SIFT.tree" > /etc/profile.d/alicevision.sh +COPY dl/sphereDetection_Mask-RCNN.onnx ${AV_INSTALL}/share/aliceVision/ +RUN echo "export ALICEVISION_SPHERE_DETECTION_MODEL=${AV_INSTALL}/share/aliceVision/sphereDetection_Mask-RCNN.onnx" > /etc/profile.d/alicevision.sh + COPY docker/check-cpu.sh ${AV_DEV}/docker/check-cpu.sh RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` && echo "Build multithreading number of cores: ${CPU_CORES}" diff --git a/docker/Dockerfile_ubuntu_deps b/docker/Dockerfile_ubuntu_deps index 54be76ed6a..bcfb716fbf 100644 --- a/docker/Dockerfile_ubuntu_deps +++ b/docker/Dockerfile_ubuntu_deps @@ -51,6 +51,9 @@ ENV AV_DEV=/opt/AliceVision_git \ COPY dl/vlfeat_K80L3.SIFT.tree ${AV_INSTALL}/share/aliceVision/ RUN echo "export ALICEVISION_VOCTREE=${AV_INSTALL}/share/aliceVision/vlfeat_K80L3.SIFT.tree" > /etc/profile.d/alicevision.sh +COPY dl/sphereDetection_Mask-RCNN.onnx ${AV_INSTALL}/share/aliceVision/ +RUN echo "export ALICEVISION_SPHERE_DETECTION_MODEL=${AV_INSTALL}/share/aliceVision/sphereDetection_Mask-RCNN.onnx" > /etc/profile.d/alicevision.sh + COPY docker/check-cpu.sh ${AV_DEV}/docker/check-cpu.sh RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` && echo "Build multithreading number of cores: ${CPU_CORES}" diff --git a/docker/fetch.sh b/docker/fetch.sh index b36b32662a..bdda12ce97 100755 --- a/docker/fetch.sh +++ b/docker/fetch.sh @@ -18,6 +18,8 @@ test -d dl || \ mkdir dl test -f dl/vlfeat_K80L3.SIFT.tree || \ wget https://gitlab.com/alicevision/trainedVocabularyTreeData/raw/master/vlfeat_K80L3.SIFT.tree -O dl/vlfeat_K80L3.SIFT.tree +test -f dl/sphereDetection_Mask-RCNN.onnx || \ + wget https://gitlab.com/alicevision/SphereDetectionModel/-/raw/main/sphereDetection_Mask-RCNN.onnx -O dl/sphereDetection_Mask-RCNN.onnx export CMAKE_VERSION=3.26.0 export CMAKE_VERSION_MM=3.26 test -f dl/cmake-${CMAKE_VERSION}.tar.gz || \