[FIX ARM] Upgrade Filament 1.58.2

.github/workflows/macos.yml

@@ -33,9 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # macos-13 is Intel runner, macos-14 is Apple Silicon
-        # https://github.com/actions/runner-images
-        os: [macos-13, macos-14]
+        os: [macos-14]
         CONFIG: [ON, OFF]
     env:
       BUILD_SHARED_LIBS: ${{ matrix.CONFIG }}
@@ -118,50 +116,6 @@ jobs:
           path: build/bin/open3d-*-app-macosx-10_15-${{ runner.arch }}.zip
           if-no-files-found: error
 
-  fuse-viewer:
-    permissions:
-      contents: write  # Release upload
-    name: Fuse x64 and ARM64 viewer app
-    runs-on: [macos-13]
-    needs: [MacOS]
-    steps:
-      - name: Checkout source code  # for gh release upload
-        uses: actions/checkout@v4
-      - name: Download viewer apps
-        uses: actions/download-artifact@v4
-        with:
-          pattern: open3d-app-macosx-10_15-*
-          merge-multiple: true
-
-      - name: Fuse x64 and arm64 viewer apps
-        run: |
-          unzip open3d-*-app-macosx-10_15-X64.zip -d x64
-          unzip open3d-*-app-macosx-10_15-ARM64.zip -d arm64
-          APP_NAME=$(ls open3d-*-app-macosx-10_15-X64.zip)
-          APP_NAME=${APP_NAME/-X64/-universal2}  # includes version
-          for i in arm64/Open3D.app/Contents/MacOS/*; do
-            filepath=Open3D.app/Contents/MacOS/$(basename $i)
-            lipo -create arm64/${filepath} x64/${filepath} -output arm64/${filepath}
-          done
-          mv arm64/Open3D.app Open3D.app
-          zip -rv "${APP_NAME}" Open3D.app
-
-      - name: Upload Open3D viewer app
-        uses: actions/upload-artifact@v4
-        with:
-          name: open3d-app-macosx-10_15-universal2
-          path: open3d-*-app-macosx-10_15-universal2.zip
-          if-no-files-found: error
-
-      - name: Update viewer devel release
-        if: ${{ github.ref == 'refs/heads/main' }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload main-devel open3d-*-app-macosx-10_15-universal2.zip --clobber
-          gh release view main-devel
-
-
   build-wheel:
     name: Build wheel
     permissions:
@@ -171,9 +125,7 @@ jobs:
       fail-fast: false
       # https://github.community/t/how-to-conditionally-include-exclude-items-in-matrix-eg-based-on-branch/16853/6
       matrix:
-        # macos-13 is Intel runner, macos-14 is Apple Silicon
-        # https://github.com/actions/runner-images
-        os: [macos-13, macos-14]
+        os: [macos-14]
         python_version: ['3.10', '3.11', '3.12', '3.13']
         is_main:
           - ${{ github.ref == 'refs/heads/main' }}
@@ -257,75 +209,6 @@ jobs:
           path: build/lib/python_package/pip_package/${{ env.PIP_PKG_NAME }}
           if-no-files-found: error
 
-
-  fuse-wheel:
-    name: Fuse universal2 wheel
-    permissions:
-      contents: write  # Release upload
-    runs-on: [macos-13]
-    needs: [build-wheel]
-    strategy:
-      fail-fast: false
-      # https://github.community/t/how-to-conditionally-include-exclude-items-in-matrix-eg-based-on-branch/16853/6
-      matrix:
-        python_version: ['3.10', '3.11', '3.12', '3.13']
-        is_main:
-          - ${{ github.ref == 'refs/heads/main' }}
-        exclude:
-          - is_main: false
-            python_version: '3.10'
-          - is_main: false
-            python_version: '3.11'
-          - is_main: false
-            python_version: '3.12'
-    steps:
-      - name: Checkout source code  # for gh release upload
-        uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python_version }}
-
-      - name: Download X64 wheels
-        uses: actions/download-artifact@v4
-        with:
-          pattern: open3d-*macosx*_x86_64.whl
-          path: x64_wheels
-          merge-multiple: true
-
-      - name: Download ARM64 wheels
-        uses: actions/download-artifact@v4
-        with:
-          pattern: open3d-*macosx*_arm64.whl
-          path: arm64_wheels
-          merge-multiple: true
-
-      - name: Fuse x64 and ARM64 wheels
-        env:
-          python_version: ${{ matrix.python_version }}
-        run: |
-          PYTAG="-cp$(echo ${{ env.python_version }} | tr -d '.')"
-          mkdir universal_wheels
-          pip install delocate
-          delocate-merge -v -w universal_wheels x64_wheels/open3d-*${PYTAG}*.whl arm64_wheels/open3d-*${PYTAG}*.whl
-          NEW_WHL_NAME=$(basename universal_wheels/open3d-*${PYTAG}*.whl)
-          echo "PIP_PKG_NAME=$NEW_WHL_NAME" >> $GITHUB_ENV
-
-      - name: Upload merged wheels
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.PIP_PKG_NAME }}
-          path: universal_wheels/${{ env.PIP_PKG_NAME }}
-          if-no-files-found: error
-
-      - name: Update devel release
-        if: ${{ github.ref == 'refs/heads/main' }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload main-devel universal_wheels/${{ env.PIP_PKG_NAME }} --clobber
-          gh release view main-devel
-
   test-wheel:
     name: Test wheel
     permissions:
@@ -335,7 +218,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14]
+        os: [macos-14]
         python_version: ['3.10', '3.11', '3.12', '3.13']
         is_main:
           - ${{ github.ref == 'refs/heads/main' }}

.github/workflows/ubuntu-sycl.yml

@@ -38,6 +38,19 @@ jobs:
         run: |
           source util/ci_utils.sh
           maximize_ubuntu_github_actions_build_space
+      - name: Free up disk space
+        if: ${{ runner.os == 'Linux' }}
+        # https://github.com/easimon/maximize-build-space/blob/master/action.yml
+        # https://github.com/easimon/maximize-build-space/tree/test-report
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /opt/hostedtoolcache/CodeQL
+      - name: Set up swap space
+        if: runner.os == 'Linux'
+        uses: pierotofy/[email protected]
+        with:
+          swap-size-gb: 10
       - name: Docker build
         run: |
           if [ "${{ matrix.BUILD_SHARED_LIBS }}" = "ON" ]; then
@@ -69,7 +82,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           if [ ${{ matrix.BUILD_SHARED_LIBS }} == 'ON' ] ; then
-            gh release upload main-devel open3d-*.whl --clobber
+            gh release upload main-devel open3d*.whl --clobber
             gh release upload main-devel open3d-devel-*.tar.xz --clobber
           fi
           gh release view main-devel

3rdparty/embree/embree.cmake

@@ -109,4 +109,4 @@ ExternalProject_Add(
 ExternalProject_Get_Property(ext_embree INSTALL_DIR)
 set(EMBREE_INCLUDE_DIRS ${INSTALL_DIR}/include/ ${INSTALL_DIR}/src/ext_embree/) # "/" is critical.
 set(EMBREE_LIB_DIR ${INSTALL_DIR}/${Open3D_INSTALL_LIB_DIR})
-set(EMBREE_LIBRARIES embree4 simd lexers sys math tasking ${ISA_LIBS})
+set(EMBREE_LIBRARIES embree4 simd lexers sys math tasking ${ISA_LIBS})

3rdparty/filament/filament_build.cmake

@@ -13,20 +13,21 @@ if(NOT is_multi_config)
 endif()
 
 set(filament_LIBRARIES
-    filameshio
-    filament
-    filamat_lite
-    filamat
-    filaflat
-    filabridge
-    geometry
-    backend
-    bluegl
-    ibl
-    image
-    meshoptimizer
-    smol-v
-    utils
+        filameshio
+        filament
+        filaflat
+        filabridge
+        geometry
+        backend
+        bluegl
+        bluevk
+        ibl
+        image
+        ktxreader
+        meshoptimizer
+        smol-v
+        utils
+        vkshaders
 )
 
 # Locate byproducts
@@ -43,19 +44,48 @@ set(lib_byproducts ${filament_LIBRARIES})
 list(TRANSFORM lib_byproducts PREPEND ${FILAMENT_ROOT}/${lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX})
 list(TRANSFORM lib_byproducts APPEND ${CMAKE_STATIC_LIBRARY_SUFFIX})
 
-set(filament_cxx_flags "${CMAKE_CXX_FLAGS} -Wno-deprecated")
+set(filament_cxx_flags "${CMAKE_CXX_FLAGS} -Wno-deprecated" "-Wno-pass-failed=transform-warning" "-Wno-error=nonnull")
+set(filament_ld_flags "")
 if(NOT WIN32)
     # Issue Open3D#1909, filament#2146
     set(filament_cxx_flags "${filament_cxx_flags} -fno-builtin")
+    # Ensure we use the correct LLVM version's shared libc++ (not static libc++ from older LLVM)
+    # This prevents linker errors with static libc++ that wasn't built with -fPIC
+    if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+        # Find the Clang version to locate the correct libc++
+        execute_process(
+            COMMAND ${CMAKE_CXX_COMPILER} --version
+            OUTPUT_VARIABLE clang_version_output
+            ERROR_QUIET
+        )
+        if(clang_version_output MATCHES "clang version ([0-9]+)")
+            set(CLANG_VER "${CMAKE_MATCH_1}")
+            set(LLVM_LIBDIR "/usr/lib/llvm-${CLANG_VER}/lib")
+            set(LLVM_INCDIR "/usr/lib/llvm-${CLANG_VER}/include")
+            # Use LLVM 14's shared libc++ if available (it's built with -fPIC)
+            if(EXISTS "${LLVM_LIBDIR}/libc++.so")
+                set(filament_cxx_flags "${filament_cxx_flags} -L${LLVM_LIBDIR}")
+                set(filament_ld_flags "-Wl,-rpath,${LLVM_LIBDIR}")
+                # Force-include cstdint to fix missing uint32_t in Filament headers
+                # This is a workaround for Filament's TIFFExport.h missing #include <cstdint>
+                if(EXISTS "${LLVM_INCDIR}/c++/v1/cstdint")
+                    set(filament_cxx_flags "${filament_cxx_flags} -include ${LLVM_INCDIR}/c++/v1/cstdint")
+                endif()
+                message(STATUS "Filament: Using LLVM ${CLANG_VER} shared libc++ from ${LLVM_LIBDIR}")
+            endif()
+        endif()
+    endif()
 endif()
 
 ExternalProject_Add(
     ext_filament
     PREFIX filament
-    URL https://github.com/isl-org/filament/archive/d1d873d27f43ba0cee1674a555cc0f18daac3008.tar.gz
-    URL_HASH SHA256=00c3f41af0fcfb2df904e1f77934f2678d943ddac5eb889788a5e22590e497bd
+    URL https://github.com/google/filament/archive/refs/tags/v1.58.2.tar.gz
+    URL_HASH SHA256=8fbb35db77f34138e0c0536866d0de81e49b3ba2a3bd2d75e6de834779515cda
     DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/filament"
     UPDATE_COMMAND ""
+    PATCH_COMMAND
+        bash -c "sed -i '/^#include <fstream>/a #include <cstdint>' libs/viewer/src/TIFFExport.h || true"
     CMAKE_ARGS
         ${ExternalProject_CMAKE_ARGS}
         -DCMAKE_BUILD_TYPE=${FILAMENT_BUILD_TYPE}
@@ -66,12 +96,14 @@ ExternalProject_Add(
         -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
         -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
         -DCMAKE_CXX_FLAGS:STRING=${filament_cxx_flags}
+        -DCMAKE_EXE_LINKER_FLAGS:STRING=${filament_ld_flags}
+        -DCMAKE_SHARED_LINKER_FLAGS:STRING=${filament_ld_flags}
         -DCMAKE_INSTALL_PREFIX=${FILAMENT_ROOT}
         -DUSE_STATIC_CRT=${STATIC_WINDOWS_RUNTIME}
-        -DUSE_STATIC_LIBCXX=ON
-        -DFILAMENT_SUPPORTS_VULKAN=OFF
+        -DUSE_STATIC_LIBCXX=OFF
+        -DFILAMENT_SKIP_SDL2=ON
         -DFILAMENT_SKIP_SAMPLES=ON
         -DFILAMENT_OPENGL_HANDLE_ARENA_SIZE_IN_MB=20 # to support many small entities
         -DSPIRV_WERROR=OFF
-    BUILD_BYPRODUCTS ${lib_byproducts}
-)
+        BUILD_BYPRODUCTS ${lib_byproducts}
+)