Merge pull request #200 from alicevision/dev/update_oneAPI

Use TBB oneAPI

Author: simogasp

.github/workflows/continuous-integration.yml

@@ -20,7 +20,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: alicevision/cctag-deps:cuda10.2-ubuntu18.04
+      image: alicevision/cctag-deps:cuda11.8.0-ubuntu20.04
     env:
       DEPS_INSTALL_DIR: /opt/
       BUILD_TYPE: Release

CHANGES.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Replaced CCTAG_EIGEN_MEMORY_ALIGNMENT with CCTAG_EIGEN_MEMORY_ALIGNMENT which has the opposite meaning.
+- Using the new TBB oneAPI interface, this breaks compatibility with previous versions of TBB [PR](https://github.com/alicevision/CCTag/pull/200)
 
 ### Fixed
 - fix gcc11 ordered pointer comparison [PR](https://github.com/alicevision/CCTag/pull/191)

CMakeLists.txt

@@ -124,6 +124,7 @@ if(CCTAG_BUILD_TESTS)
 endif()
 
 find_package(Boost 1.66.0 REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
+message(STATUS "Found Boost: version ${Boost_VERSION}")
 
 if(BUILD_SHARED_LIBS)
   if(WIN32)
@@ -239,7 +240,8 @@ endif()
 # FIND Intel TBB
 # With MVSC, CMAKE_BUILD_TYPE will always be None, so TBB_USE_DEBUG_BUILD will always be false.
 string(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" Debug TBB_USE_DEBUG_BUILD)
-find_package(TBB REQUIRED)
+find_package(TBB 2021.5.0 CONFIG REQUIRED)
+message(STATUS "Found TBB: version ${TBB_VERSION}")
 
 add_subdirectory(src)
 

Dockerfile_deps

@@ -17,7 +17,7 @@ LABEL maintainer="AliceVision Team [email protected]"
 # Cuda version (ENV): $CUDA_VERSION
 
 # System update
-RUN apt-get clean && apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get clean && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
                 build-essential \
                 wget \
                 unzip \
@@ -33,16 +33,15 @@ RUN apt-get clean && apt-get update && apt-get install -y --no-install-recommend
                 libavformat-dev \
                 libswscale-dev \
                 libavresample-dev \
-                libtbb-dev \
         && rm -rf /var/lib/apt/lists/*
 
 ENV DEPS_INSTALL_PATH="/opt"
 
 # Manually install cmake
 WORKDIR /tmp/cmake
-ENV CMAKE_VERSION=3.17
+ENV CMAKE_VERSION=3.24
 ENV CMAKE_VERSION_FULL=${CMAKE_VERSION}.2
-RUN wget https://cmake.org/files/v3.17/cmake-${CMAKE_VERSION_FULL}.tar.gz && \
+RUN wget https://cmake.org/files/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION_FULL}.tar.gz && \
     tar zxf cmake-${CMAKE_VERSION_FULL}.tar.gz && \
     cd cmake-${CMAKE_VERSION_FULL} && \
     ./bootstrap --prefix=/usr/local  -- -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_USE_OPENSSL:BOOL=ON && \
@@ -51,8 +50,8 @@ RUN wget https://cmake.org/files/v3.17/cmake-${CMAKE_VERSION_FULL}.tar.gz && \
     rm -rf cmake
 
 
-ENV BOOST_VERSION="1.70.0"
-ENV BOOST_VERSION_FILENAME="1_70_0"
+ENV BOOST_VERSION="1.76.0"
+ENV BOOST_VERSION_FILENAME="1_76_0"
 WORKDIR /tmp/boost
 RUN wget https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_FILENAME}.tar.gz && \
     tar -xzf boost_${BOOST_VERSION_FILENAME}.tar.gz && \
@@ -63,7 +62,7 @@ RUN wget https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boo
     rm -rf /tmp/boost
 
 WORKDIR /tmp/eigen
-ENV EIGEN_VERSION="3.3.7"
+ENV EIGEN_VERSION="3.4.0"
 RUN wget https://gitlab.com/libeigen/eigen/-/archive/${EIGEN_VERSION}/${EIGEN_VERSION}.tar.gz && \
     mkdir eigen-${EIGEN_VERSION} && tar xf ${EIGEN_VERSION}.tar.gz -C eigen-${EIGEN_VERSION} --strip-components 1 && \
     cd eigen-${EIGEN_VERSION} && \
@@ -75,7 +74,7 @@ RUN wget https://gitlab.com/libeigen/eigen/-/archive/${EIGEN_VERSION}/${EIGEN_VE
     rm -rf /tmp/eigen
 
 # install opencv
-ENV OPENCV_VERSION="3.4.10"
+ENV OPENCV_VERSION="4.5.3"
 WORKDIR /tmp/opencv
 RUN  wget https://github.com/opencv/opencv/archive/"${OPENCV_VERSION}".zip && \
      unzip ${OPENCV_VERSION}.zip && \
@@ -84,16 +83,36 @@ RUN  wget https://github.com/opencv/opencv/archive/"${OPENCV_VERSION}".zip && \
      cmake -DBUILD_TIFF:BOOL=ON \
       -DBUILD_opencv_java:BOOL=OFF \
       -DWITH_CUDA:BOOL=OFF \
+      -DINSTALL_C_EXAMPLES=OFF \
+      -DINSTALL_PYTHON_EXAMPLES=OFF \
       -DENABLE_AVX:BOOL=ON \
-      -DWITH_OPENGL:BOOL=ON \
-      -DWITH_IPP:BOOL=ON \
-      -DWITH_TBB:BOOL=ON \
+      -DWITH_OPENGL:BOOL=OFF \
+      -DWITH_TBB:BOOL=OFF \
       -DWITH_EIGEN:BOOL=ON \
       -DWITH_V4L:BOOL=ON \
       -DBUILD_TESTS:BOOL=OFF \
+      -DBUILD_EXAMPLES=OFF \
       -DBUILD_PERF_TESTS:BOOL=OFF \
+      -DDBUILD_SHARED_LIBS=ON \
+      -DBUILD_LIST=core,videoio,imgproc,imgcodecs,highgui \
       -DCMAKE_INSTALL_PREFIX:PATH=${DEPS_INSTALL_PATH} \
       -DCMAKE_BUILD_TYPE=RELEASE  .. && \
     make -j$(nproc) install && \
     cd /opt && \
-    rm -r /tmp/opencv
+    rm -r /tmp/opencv
+
+# install tbb
+ENV TBB_VERSION="2021.5.0"
+WORKDIR /tmp/tbb
+RUN  wget https://github.com/oneapi-src/oneTBB/archive/refs/tags/v"${TBB_VERSION}".zip && \
+     unzip v${TBB_VERSION}.zip && \
+     mkdir -p ./oneTBB-${TBB_VERSION}/build && \
+     cd ./oneTBB-${TBB_VERSION}/build && \
+     cmake -DTBB_TEST:BOOL=OFF \
+      -DTBB_STRICT:BOOL=OFF \
+      -DBUILD_SHARED_LIBS:BOOL=ON \
+      -DCMAKE_INSTALL_PREFIX:PATH=${DEPS_INSTALL_PATH} \
+      -DCMAKE_BUILD_TYPE=RELEASE  .. && \
+    make -j$(nproc) install && \
+    cd /opt && \
+    rm -r /tmp/tbb

INSTALL.md

@@ -22,7 +22,7 @@ Most of the dependencies can be installed from the common repositories (apt, yum
 - Eigen3 (libeigen3-dev) >= 3.3.4  (NOTE: in order to have Cuda support on Windows, at least version 3.3.9 is required)
 - Boost >= 1.66 ([accumulators, atomic, chrono, core, date-time, exception, filesystem, math, program-options, ptr-container, system, serialization, stacktrace, timer, thread]-dev)
 - OpenCV >= 3.1
-- TBB >= 4.0
+- TBB >= 2021.5.0
 
 
 ----------

appveyor.yml

@@ -11,6 +11,12 @@ configuration:
 install:
     # - cmd: >-
     #       call cudaInstallAppveyor.cmd
+    - cd C:\Tools\vcpkg
+    - git pull
+    - git checkout 2022.09.27
+    - .\bootstrap-vcpkg.bat
+    - cd %APPVEYOR_BUILD_FOLDER%
+
 
     - vcpkg upgrade --no-dry-run
     - vcpkg list

cmake/Config.cmake.in

@@ -42,9 +42,10 @@
 include(CMakeFindDependencyMacro)
 
 set(OpenCV_DIR @OpenCV_DIR@)
-find_dependency(OpenCV)
+find_dependency(OpenCV @OPENCV_VERSION@)
+find_dependency(TBB @TBB_VERSION@)
 find_dependency(Eigen3 @CCTAG_EIGEN_REQUIRED_VERSION@)
-find_dependency(Boost 1.66 REQUIRED COMPONENTS @BOOST_REQUIRED_COMPONENTS@)
+find_dependency(Boost @Boost_VERSION@ REQUIRED COMPONENTS @BOOST_REQUIRED_COMPONENTS@)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
 check_required_components("@PROJECT_NAME@")