Skip to content

Commit

Permalink
fix2
Browse files Browse the repository at this point in the history
  • Loading branch information
ssheorey committed Jan 2, 2025
1 parent 3e8a67c commit f2e6ca4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
11 changes: 6 additions & 5 deletions cpp/apps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ macro(open3d_add_app_common SRC_DIR APP_NAME TARGET_NAME)
target_link_libraries(${TARGET_NAME} PRIVATE Open3D::Open3D TBB::tbb ${ARGN})
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "apps")

if (BUILD_SYCL_MODULE)
find_package(IntelSYCL REQUIRED) # requires cmake>=3.25 on Windows
add_sycl_to_target(TARGET ${TARGET_NAME})
endif()

open3d_link_3rdparty_libraries(${TARGET_NAME})
open3d_show_and_abort_on_warning(${TARGET_NAME})
open3d_set_global_properties(${TARGET_NAME})
Expand All @@ -141,8 +146,4 @@ if (BUILD_GUI)
open3d_add_app_gui(Open3DViewer Open3D Open3DViewer)
endif()

if (BUILD_SYCL_MODULE)
open3d_add_app_common(OfflineReconstruction OfflineReconstruction OfflineReconstruction Open3D::3rdparty_sycl)
else()
open3d_add_app_common(OfflineReconstruction OfflineReconstruction OfflineReconstruction)
endif()
open3d_add_app_common(OfflineReconstruction OfflineReconstruction OfflineReconstruction)
3 changes: 2 additions & 1 deletion cpp/benchmarks/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ if (BUILD_CUDA_MODULE)
target_link_libraries(benchmarks PRIVATE CUDA::cudart)
endif()
if (BUILD_SYCL_MODULE)
target_link_libraries(benchmarks PRIVATE Open3D::3rdparty_sycl)
find_package(IntelSYCL REQUIRED) # requires cmake>=3.25 on Windows
add_sycl_to_target(TARGET benchmarks)
endif()

open3d_show_and_abort_on_warning(benchmarks)
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ RUN \
&& make install -j$(nproc) \
&& if [ "${PACKAGE}" = "ON" ]; then make package; fi \
&& if [ "${PACKAGE}" = "VIEWER" ]; then make package-Open3DViewer-deb; fi \
&& if [ "${CI:-}a" != "a" ]; then rm -rf _deps assimp embree ipp mkl mkl_install webrtc; fi
&& if [ "${CI:-}a" != "a" ]; then rm -rf _deps assimp embree ipp mkl mkl_install webrtc librealsense; fi
# If CI is not null or unset, remove all large build folders to save disk space

# Compress ccache folder, move to / directory
Expand All @@ -246,7 +246,7 @@ RUN ccache -s \
&& tar -caf /${CCACHE_TAR_NAME}.tar.xz ${CCACHE_DIR_NAME} \
&& if [ "${PACKAGE}" = "ON" ]; then mv /root/Open3D/build/package/open3d-devel*.tar.xz /; fi \
&& if [ "${PACKAGE}" = "VIEWER" ]; then mv /root/Open3D/build/package-Open3DViewer-deb/open3d-viewer-*-Linux.deb /; fi \
&& if [ "${BUILD_SYCL_MODULE}" = "ON" && "${BUILD_SHARED_LIBS}" = "ON"]; then mv /root/Open3D/build/lib/python_package/pip_package/open3d-*.whl /; fi \
&& if [ "${BUILD_SYCL_MODULE}" = "ON" && "${BUILD_SHARED_LIBS}" = "ON" ]; then mv /root/Open3D/build/lib/python_package/pip_package/open3d-*.whl /; fi \
&& ls -alh /

RUN echo "Docker build done."
Binary file removed docker/test2.png
Binary file not shown.

0 comments on commit f2e6ca4

Please sign in to comment.