build realsense, add dependencies, use oneAPI

4 files changed, 151 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fac2d279f3a2..e1924cedc8e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = open3d
 	pkgdesc = A Modern Library for 3D Data Processing
 	pkgver = 0.18.0
-	pkgrel = 8
+	pkgrel = 9
 	epoch = 1
 	url = http://www.open3d.org
 	arch = x86_64
@@ -28,19 +28,33 @@ pkgbase = open3d
 	depends = python-dash
 	depends = pybind11
 	depends = xorg-server-devel
-	depends = gcc12
 	depends = nanoflann
 	depends = openssl
 	depends = pybind11
 	depends = qhull
 	depends = vtk
 	depends = unzip
+	depends = utf8cpp
+	depends = openxr
+	depends = openvr
+	depends = asciidoc
+	depends = python-mpi4py
+	depends = postgresql
+	depends = mysql
+	depends = onetbb
+	depends = zeromq
+	depends = cppzmq
+	depends = intel-oneapi-basekit
 	optdepends = openmp: Multiprocess support
 	optdepends = jupyter-notebook: Jupyter notebook support
 	source = open3d::git+https://github.com/isl-org/Open3D.git#commit=5c982c7b5edc76f899860e2594a950c5c23ec88f
 	source = fmt-v10.patch
+	source = pstl.patch
+	source = no_werror.patch
 	sha256sums = SKIP
 	sha256sums = ab2dbd819f4d4613505d384707ca9cb7913b9603739b6f6590a3a3d978cbe56a
+	sha256sums = 19d1b921e2787bbeb71b3579ca534ee86542926ac0820e42584de754b0adf296
+	sha256sums = e58dacd86497e4d8a61fe00e4e41a4b8748e1dcca8d3172918d1bc5a1e7390cc
 
 pkgname = open3d
 	depends = libc++abi
@@ -57,15 +71,28 @@ pkgname = open3d
 	depends = libjpeg-turbo
 	depends = libpng
 	depends = mesa
+	depends = python
+	depends = python-plotly
+	depends = python-dash
 	depends = pybind11
 	depends = xorg-server-devel
-	depends = gcc12
 	depends = nanoflann
 	depends = openssl
 	depends = pybind11
 	depends = qhull
 	depends = vtk
 	depends = unzip
+	depends = utf8cpp
+	depends = openxr
+	depends = openvr
+	depends = asciidoc
+	depends = python-mpi4py
+	depends = postgresql
+	depends = mysql
+	depends = onetbb
+	depends = zeromq
+	depends = cppzmq
+	depends = intel-oneapi-basekit
 	optdepends = openmp: Multiprocess support
 	conflicts = open3d-git
 
@@ -89,13 +116,23 @@ pkgname = python-open3d
 	depends = python-dash
 	depends = pybind11
 	depends = xorg-server-devel
-	depends = gcc12
 	depends = nanoflann
 	depends = openssl
 	depends = pybind11
 	depends = qhull
 	depends = vtk
 	depends = unzip
+	depends = utf8cpp
+	depends = openxr
+	depends = openvr
+	depends = asciidoc
+	depends = python-mpi4py
+	depends = postgresql
+	depends = mysql
+	depends = onetbb
+	depends = zeromq
+	depends = cppzmq
+	depends = intel-oneapi-basekit
 	optdepends = jupyter-notebook: Jupyter notebook support
 	optdepends = openmp: Multiprocess support
 	provides = python-py3d
@@ -123,13 +160,23 @@ pkgname = python-py3d
 	depends = python-dash
 	depends = pybind11
 	depends = xorg-server-devel
-	depends = gcc12
 	depends = nanoflann
 	depends = openssl
 	depends = pybind11
 	depends = qhull
 	depends = vtk
 	depends = unzip
+	depends = utf8cpp
+	depends = openxr
+	depends = openvr
+	depends = asciidoc
+	depends = python-mpi4py
+	depends = postgresql
+	depends = mysql
+	depends = onetbb
+	depends = zeromq
+	depends = cppzmq
+	depends = intel-oneapi-basekit
 	optdepends = jupyter-notebook: Jupyter notebook support
 	optdepends = openmp: Multiprocess support
 	provides = python-open3d
diff --git a/PKGBUILD b/PKGBUILD
index cf4c36b8b732..7cac7d05e1b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=open3d
 pkgname=( {,python-}open3d python-py3d )
 pkgver=0.18.0
-pkgrel=8
+pkgrel=9
 epoch=1
 pkgdesc="A Modern Library for 3D Data Processing"
 arch=('x86_64')
@@ -31,13 +31,23 @@ depends=(
     python-dash
     pybind11
     xorg-server-devel
-    gcc12
     nanoflann
     openssl
     pybind11
     qhull
     vtk
     unzip
+    utf8cpp
+    openxr
+    openvr
+    asciidoc
+    python-mpi4py
+    postgresql
+    mysql
+    onetbb
+    zeromq
+    cppzmq
+    intel-oneapi-basekit
 )
 optdepends=(
     'openmp: Multiprocess support'
@@ -51,16 +61,22 @@ makedepends=(
 source=(
     "${pkgbase}::git+https://github.com/isl-org/Open3D.git#commit=5c982c7b5edc76f899860e2594a950c5c23ec88f"
     "fmt-v10.patch"
+    "pstl.patch"
+    "no_werror.patch"
 )
 sha256sums=(
     'SKIP'
-    'ab2dbd819f4d4613505d384707ca9cb7913b9603739b6f6590a3a3d978cbe56a')
+    'ab2dbd819f4d4613505d384707ca9cb7913b9603739b6f6590a3a3d978cbe56a'
+    '19d1b921e2787bbeb71b3579ca534ee86542926ac0820e42584de754b0adf296'
+    'e58dacd86497e4d8a61fe00e4e41a4b8748e1dcca8d3172918d1bc5a1e7390cc')
 
 function prepare() {
     cd "${srcdir}/${pkgbase}"
     patch -Np1 -i "${srcdir}/fmt-v10.patch"
-    #find ../ -name "CMakeLists.txt" -exec sed -i 's/-Werror//g' {} \;
-    grep --files-with-matches -r "_FORTIFY_SOURCE" | xargs -I {} sed -i 's/_FORTIFY_SOURCE=[0-9]/""/g' {}
+    patch -Np1 -i "${srcdir}/pstl.patch"
+    patch -Np1 -i "${srcdir}/no_werror.patch"
+    # find . -name "CMakeLists.txt" -exec sed -i 's/-Werror//g' {} \;
+    # grep --files-with-matches -r "_FORTIFY_SOURCE" | xargs -I {} sed -i 's/_FORTIFY_SOURCE=[0-9]/""/g' {}
     mkdir -p build
 }
 
@@ -70,20 +86,27 @@ function build() {
         rm CMakeCache.txt
     fi
     
-    # export CFLAGS=""
-    # export CXXFLAGS=""
+    # default makepkg.conf set flags to "-O2"
+    export CFLAGS=""
+    export CXXFLAGS=""
     cmake .. \
           -G "Unix Makefiles" \
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DBUILD_SHARED_LIBS=ON \
+          -DCMAKE_VERBOSE_MAKEFILE=ON \
           -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_C_COMPILER:STRING=/usr/bin/gcc-12 \
-          -DCMAKE_CXX_COMPILER:STRING=/usr/bin/g++-12 \
           -DCMAKE_MODULE_PATH=/usr/lib/cmake/OpenVDB \
+          -DCMAKE_FIND_ROOT_PATH=/opt/intel/oneapi/tbb/latest/lib/cmake/tbb \
           -DUSE_SYSTEM_ASSIMP=ON \
           -DUSE_SYSTEM_CURL=ON \
+          -DUSE_SYSTEM_BLAS=OFF \
+          -DBUILD_SYCL_MODULE=OFF \
           -DUSE_SYSTEM_EIGEN3=ON \
           -DUSE_SYSTEM_EMBREE=ON \
+          -DUSE_SYSTEM_TBB=ON \
+          -DOPEN3D_USE_ONEAPI_PACKAGES=ON \
+          -DoneDPL_DIR=/opt/intel/oneapi/dpl/latest/lib/cmake/oneDPL \
+          -DMKL_DIR=/opt/intel/oneapi/mkl/latest/lib/cmake/mkl \
           -DUSE_SYSTEM_FMT=ON \
           -DUSE_SYSTEM_GLEW=ON \
           -DUSE_SYSTEM_GLFW=ON \
@@ -95,7 +118,9 @@ function build() {
           -DUSE_SYSTEM_PYBIND11=ON \
           -DUSE_SYSTEM_QHULLCPP=ON \
           -DUSE_SYSTEM_VTK=ON \
+          -DUSE_SYSTEM_ZEROMQ=ON \
           -DUSE_SYSTEM_JSONCPP=OFF \
+          -DBUILD_LIBREALSENSE=ON \
           -DWITH_MINIZIP=ON
 
     make -j$(nproc)
@@ -117,15 +142,28 @@ function package_open3d() {
         libjpeg-turbo
         libpng
         mesa
+        python
+        python-plotly
+        python-dash
         pybind11
         xorg-server-devel
-        gcc12
         nanoflann
         openssl
         pybind11
         qhull
         vtk
         unzip
+        utf8cpp
+        openxr
+        openvr
+        asciidoc
+        python-mpi4py
+        postgresql
+        mysql
+        onetbb
+        zeromq
+        cppzmq
+        intel-oneapi-basekit
     )
     optdepends=(
         'openmp: Multiprocess support'
@@ -158,13 +196,23 @@ function package_python-open3d() {
         python-dash
         pybind11
         xorg-server-devel
-        gcc12
         nanoflann
         openssl
         pybind11
         qhull
         vtk
         unzip
+        utf8cpp
+        openxr
+        openvr
+        asciidoc
+        python-mpi4py
+        postgresql
+        mysql
+        onetbb
+        zeromq
+        cppzmq
+        intel-oneapi-basekit
     )
     optdepends=(
         'jupyter-notebook: Jupyter notebook support'
@@ -204,13 +252,23 @@ function package_python-py3d() {
         python-dash
         pybind11
         xorg-server-devel
-        gcc12
         nanoflann
         openssl
         pybind11
         qhull
         vtk
         unzip
+        utf8cpp
+        openxr
+        openvr
+        asciidoc
+        python-mpi4py
+        postgresql
+        mysql
+        onetbb
+        zeromq
+        cppzmq
+        intel-oneapi-basekit
     )
     optdepends=(
         'jupyter-notebook: Jupyter notebook support'
diff --git a/no_werror.patch b/no_werror.patch
new file mode 100644
index 000000000000..668b5675d803
--- /dev/null
+++ b/no_werror.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/Open3DShowAndAbortOnWarning.cmake b/cmake/Open3DShowAndAbortOnWarning.cmake
+index f1ac292fe..dd8e9a30f 100644
+--- a/cmake/Open3DShowAndAbortOnWarning.cmake
++++ b/cmake/Open3DShowAndAbortOnWarning.cmake
+@@ -73,9 +73,9 @@ function(open3d_show_and_abort_on_warning target)
+ 
+     target_compile_options(${target} PRIVATE
+         $<$<COMPILE_LANG_AND_ID:C,MSVC>:/W4 /WX ${DISABLE_MSVC_WARNINGS}>
+-        $<$<COMPILE_LANG_AND_ID:C,GNU,Clang,AppleClang,Intel>:-Wall -Wextra -Werror ${DISABLE_GNU_CLANG_INTEL_WARNINGS}>
++        $<$<COMPILE_LANG_AND_ID:C,GNU,Clang,AppleClang,Intel>:-Wall -Wextra ${DISABLE_GNU_CLANG_INTEL_WARNINGS}>
+         $<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/W4 /WX ${DISABLE_MSVC_WARNINGS}>
+-        $<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang,AppleClang,Intel>:-Wall -Wextra -Werror ${DISABLE_GNU_CLANG_INTEL_WARNINGS}>
++        $<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang,AppleClang,Intel>:-Wall -Wextra ${DISABLE_GNU_CLANG_INTEL_WARNINGS}>
+         $<$<COMPILE_LANGUAGE:CUDA>:SHELL:${CUDA_FLAGS}>
+         $<$<COMPILE_LANGUAGE:ISPC>:--werror>
+     )
diff --git a/pstl.patch b/pstl.patch
new file mode 100644
index 000000000000..60be2637337f
--- /dev/null
+++ b/pstl.patch
@@ -0,0 +1,13 @@
+diff --git a/cpp/open3d/utility/ParallelScan.h b/cpp/open3d/utility/ParallelScan.h
+index a98015053..209328a5d 100644
+--- a/cpp/open3d/utility/ParallelScan.h
++++ b/cpp/open3d/utility/ParallelScan.h
+@@ -13,6 +13,8 @@
+ // clang-format off
+ #if TBB_INTERFACE_VERSION >= 10000
+     #ifdef OPEN3D_USE_ONEAPI_PACKAGES
++#define _PSTL_UDR_PRESENT 0
++#define _PSTL_UDS_PRESENT 0
+         #include <oneapi/dpl/execution>
+         #include <oneapi/dpl/numeric>
+     #else