Merge branch 'main' of github.com:isl-org/Open3D into realsense

isl-org · Mar 28, 2024 · 5002ca2 · 5002ca2
2 parents e44ee10 + 80ae047
commit 5002ca2
Show file tree

Hide file tree

Showing 17 changed files with 117 additions and 107 deletions.
diff --git a/.github/workflows/clean-gcloud-profiles.yml b/.github/workflows/clean-gcloud-profiles.yml
@@ -36,12 +36,12 @@ jobs:
  fail-fast: false
  steps:
  - name: GCloud CLI auth
- uses: 'google-github-actions/auth@v1'
+ uses: 'google-github-actions/auth@v2'
  with:
  project_id: ${{ secrets.GCE_PROJECT }}
  credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
  - name: GCloud CLI setup
- uses: google-github-actions/setup-gcloud@v1
+ uses: google-github-actions/setup-gcloud@v2
  with:
  version: ${{ env.GCE_CLI_GHA_VERSION }}
  project_id: ${{ secrets.GCE_PROJECT }}

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -29,21 +29,21 @@ jobs:
  DEVELOPER_BUILD: ${{ github.event.inputs.developer_build || 'ON' }}
  steps:
  - name: Checkout Open3D source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Maximize build space
  run: |
  source util/ci_utils.sh
  maximize_ubuntu_github_actions_build_space
 
  - name: Checkout Open3D-ML source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  repository: isl-org/Open3D-ML
  path: ${{ env.OPEN3D_ML_ROOT }}
 
  - name: Setup cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  # Ref: https://github.com/apache/incubator-mxnet/pull/18459/files
  path: ~/.ccache
@@ -56,7 +56,7 @@ jobs:
  restore-keys: |
  ${{ runner.os }}-ccache
  - name: Set up Python version
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: '3.8'
 
@@ -81,21 +81,21 @@ jobs:
  ccache -s
 
  - name: Upload docs
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: open3d_docs
  path: docs/_out/html
  if-no-files-found: error
 
  - name: GCloud CLI auth
  if: ${{ github.ref == 'refs/heads/main' }}
- uses: 'google-github-actions/auth@v1'
+ uses: 'google-github-actions/auth@v2'
  with:
  project_id: ${{ secrets.GCE_PROJECT }}
  credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
  - name: GCloud CLI setup
  if: ${{ github.ref == 'refs/heads/main' }}
- uses: google-github-actions/setup-gcloud@v1
+ uses: google-github-actions/setup-gcloud@v2
  with:
  version: ${{ env.GCE_CLI_GHA_VERSION }}
  project_id: ${{ secrets.GCE_PROJECT }}

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -39,9 +39,9 @@ jobs:
  LOW_MEM_USAGE: ON
  steps:
  - name: Checkout source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Setup cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  # Ref: https://github.com/apache/incubator-mxnet/pull/18459/files
  path: ~/.ccache
@@ -54,7 +54,7 @@ jobs:
  restore-keys: |
  ${{ runner.os }}-ccache
  - name: Set up Python version
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: 3.8
  - name: Install dependencies
@@ -73,7 +73,7 @@ jobs:
  PATH=/usr/local/var/homebrew/linked/ccache/libexec:$PATH
  ccache -s
  ./util/run_ci.sh
- DEVEL_PKG_NAME="$(basename package/open3d-devel-*.tar.xz)"
+ DEVEL_PKG_NAME="$(basename build/package/open3d-devel-*.tar.xz)"
  echo "DEVEL_PKG_NAME=$DEVEL_PKG_NAME" >> $GITHUB_ENV
  - name: Build Open3D viewer app
  if: ${{ env.BUILD_SHARED_LIBS == 'OFF' }}
@@ -87,21 +87,21 @@ jobs:
 
  - name: Upload package
  if: ${{ env.BUILD_SHARED_LIBS == 'ON' }}
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
- name: open3d-devel-macosx
+ name: ${{ env.DEVEL_PKG_NAME }}
  path: build/package/${{ env.DEVEL_PKG_NAME }}
  if-no-files-found: error
 
  - name: GCloud CLI auth
  if: ${{ github.ref == 'refs/heads/main' && env.BUILD_SHARED_LIBS == 'ON' }}
- uses: 'google-github-actions/auth@v1'
+ uses: 'google-github-actions/auth@v2'
  with:
  project_id: ${{ secrets.GCE_PROJECT }}
  credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
  - name: GCloud CLI setup
  if: ${{ github.ref == 'refs/heads/main' && env.BUILD_SHARED_LIBS == 'ON' }}
- uses: google-github-actions/setup-gcloud@v1
+ uses: google-github-actions/setup-gcloud@v2
  with:
  version: ${{ env.GCE_CLI_GHA_VERSION }}
  project_id: ${{ secrets.GCE_PROJECT }}
@@ -113,7 +113,7 @@ jobs:
  echo "Download devel package at: https://storage.googleapis.com/open3d-releases/devel/${{ env.DEVEL_PKG_NAME }}"
 
  - name: Upload Open3D viewer app
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  if: ${{ env.BUILD_SHARED_LIBS == 'OFF' }}
  with:
  name: open3d-app-macosx-10_15
@@ -143,16 +143,16 @@ jobs:
  OPEN3D_ML_ROOT: ${{ github.workspace }}/Open3D-ML
  steps:
  - name: Checkout source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Checkout Open3D-ML source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  repository: isl-org/Open3D-ML
  path: ${{ env.OPEN3D_ML_ROOT }}
 
  - name: Setup cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  # Ref: https://github.com/apache/incubator-mxnet/pull/18459/files
  path: ~/.ccache
@@ -166,7 +166,7 @@ jobs:
  ${{ runner.os }}-ccache
 
  - name: Set up Python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python_version }}
 
@@ -199,21 +199,21 @@ jobs:
  echo "PIP_PKG_NAME=$PIP_PKG_NAME" >> $GITHUB_ENV
 
  - name: Upload wheel
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
- name: open3d_macosx_x86_64_wheels
+ name: ${{ env.PIP_PKG_NAME }}
  path: build/lib/python_package/pip_package/${{ env.PIP_PKG_NAME }}
  if-no-files-found: error
 
  - name: GCloud CLI auth
  if: ${{ github.ref == 'refs/heads/main' }}
- uses: 'google-github-actions/auth@v1'
+ uses: 'google-github-actions/auth@v2'
  with:
  project_id: ${{ secrets.GCE_PROJECT }}
  credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
  - name: GCloud CLI setup
  if: ${{ github.ref == 'refs/heads/main' }}
- uses: google-github-actions/setup-gcloud@v1
+ uses: google-github-actions/setup-gcloud@v2
  with:
  version: ${{ env.GCE_CLI_GHA_VERSION }}
  project_id: ${{ secrets.GCE_PROJECT }}
@@ -249,23 +249,22 @@ jobs:
  OPEN3D_ML_ROOT: ${{ github.workspace }}/Open3D-ML
  steps:
  - name: Checkout source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Checkout Open3D-ML source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  repository: isl-org/Open3D-ML
  path: ${{ env.OPEN3D_ML_ROOT }}
 
  - name: Download wheels
- uses: actions/download-artifact@v3
- # See https://github.com/dawidd6/action-download-artifact for more
- # flexible artifact download options
+ uses: actions/download-artifact@v4
  with:
- name: open3d_macosx_x86_64_wheels
+ pattern: open3d-*macosx*.whl
+ merge-multiple: true
 
  - name: Set up Python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python_version }}
 
@@ -290,12 +289,12 @@ jobs:
  needs: [build-wheel, MacOS]
  steps:
  - name: GCloud CLI auth
- uses: 'google-github-actions/auth@v1'
+ uses: 'google-github-actions/auth@v2'
  with:
  project_id: ${{ secrets.GCE_PROJECT }}
  credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
  - name: GCloud CLI setup
- uses: google-github-actions/setup-gcloud@v1
+ uses: google-github-actions/setup-gcloud@v2
  with:
  version: ${{ env.GCE_CLI_GHA_VERSION }}
  project_id: ${{ secrets.GCE_PROJECT }}

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -17,9 +17,9 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Set up Python version
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: '3.8'
  - name: Install dependencies

diff --git a/.github/workflows/ubuntu-cuda.yml b/.github/workflows/ubuntu-cuda.yml
@@ -64,7 +64,7 @@ jobs:
  CCACHE_TAR_NAME : open3d-ci-${{ matrix.CI_CONFIG }}
  steps:
  - name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: 'false'
  - name: Package code
@@ -74,12 +74,12 @@ jobs:
  tar -czvf Open3D.tar.gz Open3D
  ls -alh
  - name: GCloud CLI auth
- uses: 'google-github-actions/auth@v1'
+ uses: 'google-github-actions/auth@v2'
  with:
  project_id: ${{ secrets.GCE_PROJECT }}
  credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
  - name: GCloud CLI setup
- uses: google-github-actions/setup-gcloud@v1
+ uses: google-github-actions/setup-gcloud@v2
  with:
  version: ${{ env.GCE_CLI_GHA_VERSION }}
  project_id: ${{ secrets.GCE_PROJECT }}
@@ -150,9 +150,9 @@ jobs:
 
  - name: Upload package
  if: ${{ env.BUILD_PACKAGE == 'true' }}
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
- name: open3d-devel-linux-x86_64-cuda
+ name: open3d-devel-linux-x86_64-cuda-${CI_CONFIG}
  path: open3d-devel-linux*.tar.xz
  if-no-files-found: error
 

diff --git a/.github/workflows/ubuntu-openblas.yml b/.github/workflows/ubuntu-openblas.yml
@@ -24,7 +24,7 @@ jobs:
  fail-fast: false
  steps:
  - name: Checkout source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Maximize build space
  run: |
  source util/ci_utils.sh
@@ -66,20 +66,20 @@ jobs:
  GCE_INSTANCE_PREFIX: open3d-ci-openblas-arm64-py310-dev
  steps:
  - name: Checkout source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Package code
  run: |
  # GITHUB_WORKSPACE: /home/runner/work/Open3D/Open3D
  cd "${GITHUB_WORKSPACE}/.."
  tar -czvf Open3D.tar.gz Open3D
  ls -alh
  - name: GCloud CLI auth
- uses: 'google-github-actions/auth@v1'
+ uses: 'google-github-actions/auth@v2'
  with:
  project_id: ${{ secrets.GCE_PROJECT }}
  credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
  - name: GCloud CLI setup
- uses: google-github-actions/setup-gcloud@v1
+ uses: google-github-actions/setup-gcloud@v2
  with:
  version: ${{ env.GCE_CLI_GHA_VERSION }}
  project_id: ${{ secrets.GCE_PROJECT }}

diff --git a/.github/workflows/ubuntu-sycl.yml b/.github/workflows/ubuntu-sycl.yml
@@ -1,6 +1,7 @@
 name: Ubuntu SYCL
 
 on:
+ workflow_dispatch:
  push:
  branches:
  - main
@@ -24,7 +25,7 @@ jobs:
  BUILD_SHARED_LIBS: [ON, OFF]
  steps:
  - name: Checkout source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Maximize build space
  run: |
  source util/ci_utils.sh
@@ -38,6 +39,7 @@ jobs:
  fi
  - name: Docker test
  run: |
+ du -hs $PWD
  if [ "${{ matrix.BUILD_SHARED_LIBS }}" = "ON" ]; then
  docker/docker_test.sh sycl-shared
  else
@@ -46,13 +48,13 @@ jobs:
 
  - name: GCloud CLI auth
  if: ${{ github.ref == 'refs/heads/main' }}
- uses: 'google-github-actions/auth@v1'
+ uses: 'google-github-actions/auth@v2'
  with:
  project_id: ${{ secrets.GCE_PROJECT }}
  credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
  - name: GCloud CLI setup
  if: ${{ github.ref == 'refs/heads/main' }}
- uses: google-github-actions/setup-gcloud@v1
+ uses: google-github-actions/setup-gcloud@v2
  with:
  version: ${{ env.GCE_CLI_GHA_VERSION }}
  project_id: ${{ secrets.GCE_PROJECT }}