Skip to content

Commit

Permalink
Update Assimp to fix compilation with gcc 13 (#6846)
Browse files Browse the repository at this point in the history
* Update Assimp to fix compilation with gcc 13
* Assimp v5.24.2 (latest release) cmake 3.22 (required by assimp)
* ASSIMP_WARNINGS_AS_ERRORS=OFF
---------
Co-authored-by: Sameer Sheorey <sameer.sheorey@intel.com>
  • Loading branch information
benjaminum authored Jul 9, 2024
1 parent 160209d commit 02c26d9
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 24 deletions.
5 changes: 3 additions & 2 deletions 3rdparty/assimp/assimp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ endif()
ExternalProject_Add(
ext_assimp
PREFIX assimp
URL https://github.com/assimp/assimp/archive/cfed74516b46a7c2bdf19c1643c448363bd90ad7.tar.gz
URL_HASH SHA256=b2f1c9450609f3bf201aa63b0b16023073d0ebb1c6e9ae5a832441f1e43c634c
URL https://github.com/assimp/assimp/archive/refs/tags/v5.4.2.zip
URL_HASH SHA256=03e38d123f6bf19a48658d197fd09c9a69db88c076b56a476ab2da9f5eb87dcc
DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/assimp"
UPDATE_COMMAND ""
CMAKE_ARGS
Expand All @@ -32,6 +32,7 @@ ExternalProject_Add(
-DASSIMP_BUILD_ZLIB=ON
-DASSIMP_NO_EXPORT=OFF
-DHUNTER_ENABLED=OFF # Renamed to "ASSIMP_HUNTER_ENABLED" in newer assimp.
-DASSIMP_WARNINGS_AS_ERRORS=OFF
-DCMAKE_DEBUG_POSTFIX=
BUILD_BYPRODUCTS
<INSTALL_DIR>/${Open3D_INSTALL_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX}
Expand Down
14 changes: 3 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
cmake_minimum_required(VERSION 3.20)
cmake_minimum_required(VERSION 3.22)
# If you're using Ubuntu 18.04, we suggest you install the latest CMake from the
# official repository https://apt.kitware.com/.
#
# CMake 3.19+ is required to:
# - allow linking with OBJECT libraries
# - prevent erroneous -gencode option deduplication with CUDA
# - simplify generator expressions for selecting compile flags and setting
# global hardened link flags
# - use first-class language support for ISPC (3.19.2 patch release required)
#
# CMake 3.20+ is required to:
# - detect IntelLLVM compiler for SYCL
# CMake 3.22+ is required by Assimp v5.4.2
# CMake 3.20+ is required to detect IntelLLVM compiler for SYCL

# CMAKE_HOST_SYSTEM_PROCESSOR is only available after calling project(),
# which depends on ${OPEN3D_VERSION}, which depends on ${DEVELOPER_BUILD}.
Expand Down
22 changes: 11 additions & 11 deletions docker/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ HOST_OPEN3D_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null 2>&1 && pw

# Shared variables
CCACHE_VERSION=4.3
CMAKE_VERSION=cmake-3.20.6-linux-x86_64
CMAKE_VERSION_AARCH64=cmake-3.20.6-linux-aarch64
CMAKE_VERSION=cmake-3.22.5-linux-x86_64
CMAKE_VERSION_AARCH64=cmake-3.22.5-linux-aarch64
CUDA_VERSION=11.7.1-cudnn8

print_usage_and_exit_docker_build() {
Expand Down Expand Up @@ -284,7 +284,7 @@ ci_build() {
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=ON
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
export BUILD_TENSORFLOW_OPS=OFF
export BUILD_PYTORCH_OPS=ON
export PACKAGE=ON
Expand All @@ -300,7 +300,7 @@ ci_build() {
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=ON
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
export BUILD_TENSORFLOW_OPS=OFF
export BUILD_PYTORCH_OPS=ON
export PACKAGE=ON
Expand All @@ -316,7 +316,7 @@ ci_build() {
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=ON
# TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
# TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
export BUILD_TENSORFLOW_OPS=ON
export BUILD_PYTORCH_OPS=OFF
export PACKAGE=ON
Expand All @@ -332,7 +332,7 @@ ci_build() {
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=ON
# TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
# TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
export BUILD_TENSORFLOW_OPS=ON
export BUILD_PYTORCH_OPS=OFF
export PACKAGE=ON
Expand All @@ -348,7 +348,7 @@ ci_build() {
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=OFF
export BUILD_CUDA_MODULE=ON
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
export BUILD_TENSORFLOW_OPS=OFF
export BUILD_PYTORCH_OPS=ON
export PACKAGE=OFF
Expand Down Expand Up @@ -379,7 +379,7 @@ cpu-shared_export_env() {
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=OFF
# TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
# TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
export BUILD_TENSORFLOW_OPS=ON
export BUILD_PYTORCH_OPS=OFF
export PACKAGE=ON
Expand All @@ -395,7 +395,7 @@ cpu-shared-ml_export_env() {
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=OFF
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
export BUILD_TENSORFLOW_OPS=OFF
export BUILD_PYTORCH_OPS=ON
export PACKAGE=ON
Expand All @@ -411,7 +411,7 @@ cpu-shared-release_export_env() {
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=OFF
# TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
# TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
export BUILD_TENSORFLOW_OPS=ON
export BUILD_PYTORCH_OPS=OFF
export PACKAGE=ON
Expand All @@ -427,7 +427,7 @@ cpu-shared-ml-release_export_env() {
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=OFF
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
export BUILD_TENSORFLOW_OPS=OFF
export BUILD_PYTORCH_OPS=ON
export PACKAGE=ON
Expand Down

0 comments on commit 02c26d9

Please sign in to comment.