From b30d19fff5b94f082e0de1faf7cd646a0de73f04 Mon Sep 17 00:00:00 2001 From: Pengfei Xuan Date: Tue, 25 Jun 2024 10:02:26 -0400 Subject: [PATCH 1/4] Test libtorch 2.3.x --- .github/workflows/docker.yml | 4 ++-- .github/workflows/hip.yml | 4 ++-- .github/workflows/macos.yml | 10 ++++++---- .github/workflows/ubuntu-cpu.yml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8a99e68..3cdd5c4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,7 +3,7 @@ name: OpenSplat (Docker CUDA) on: push: branches: - - main + - torch-2.3.x pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -19,7 +19,7 @@ jobs: os: [ubuntu-22.04] # [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] arch: [x64] # [x64, x86] ubuntu-version: [22.04, 20.04] # [18.04, 20.04, 22.04] - torch-version: [2.1.2] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] + torch-version: [2.3.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] cuda-version: [11.8.0] # [12.3.1, 12.1.1, 11.8.0, 11.7.1, 11.6.2, 11.5.2,11.4.4, 11.3.1, 11.2.2, 11.1.1, 11.0.3, cpu] cmake-build-type: [Release] # [Debug, ClangTidy] steps: diff --git a/.github/workflows/hip.yml b/.github/workflows/hip.yml index 6b2de65..1b44a09 100644 --- a/.github/workflows/hip.yml +++ b/.github/workflows/hip.yml @@ -3,7 +3,7 @@ name: OpenSplat (Ubuntu ROCm/HIP) on: push: branches: - - main + - torch-2.3.x pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [ubuntu-22.04] # [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] arch: [x64] # [x64, x86] - torch-version: [2.2.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] + torch-version: [2.3.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] cuda-version: [11.8.0] # [12.3.2, 12.3.1, 12.1.1, 11.8.0, 11.7.1, 11.6.2, 11.5.2,11.4.4, 11.3.1, 11.2.2, 11.1.1, 11.0.3, cpu] rocm-version: [5.7.1] # [5.4.2, 5.6.1, 5.7.1, 6.0.1, 6.0.2] llvm-version: [16] # [12, 13, 14, 15, 16, 17] diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 573434e..85b2059 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -3,7 +3,7 @@ name: OpenSplat (MacOS X86 and ARM) on: push: branches: - - main + - torch-2.3.x pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [macos-14, macos-13] # [macos-14, macos-13, macos-12, macos-11] arch: [arm64, x86_64] # [arm64, x86_64] - torch-version: [2.2.1, 2.1.2] # [2.2.1, 2.2.0, 2.1.2, 2.1.1, 2.1.0, 2.0.0, 1.13.0, 1.12.0] + torch-version: [2.3.1] # [2.2.1, 2.2.0, 2.1.2, 2.1.1, 2.1.0, 2.0.0, 1.13.0, 1.12.0] cmake-build-type: [Release] # [Debug, ClangTidy] exclude: - os: macos-14 @@ -73,8 +73,10 @@ jobs: run: | TORCH_VER_FULL=${{ matrix.torch-version }} TORCH_VER_ARR=($(echo ${TORCH_VER_FULL} | tr "." " ")) - TORCH_VER="${TORCH_VER_ARR[0]}.${TORCH_VER_ARR[1]}" - if [[ "${TORCH_VER}" == "2.2" ]]; then + TORCH_MAJOR_VER="${TORCH_VER_ARR[0]}" + TORCH_MINOR_VER="${TORCH_VER_ARR[1]}" + TORCH_VER="${TORCH_MAJOR_VER}.${TORCH_MINOR_VER}" + if [[ $TORCH_MAJOR_VER -gt 2 ]] || { [[ $TORCH_MAJOR_VER -eq 2 ]] && [[ $TORCH_MINOR_VER -gt 1 ]]; }; then wget --no-check-certificate -nv https://download.pytorch.org/libtorch/cpu/libtorch-macos-${{ matrix.arch }}-${{ matrix.torch-version }}.zip -O libtorch.zip else wget --no-check-certificate -nv https://download.pytorch.org/libtorch/cpu/libtorch-macos-${{ matrix.torch-version }}.zip -O libtorch.zip diff --git a/.github/workflows/ubuntu-cpu.yml b/.github/workflows/ubuntu-cpu.yml index 98cba0c..e3c39f0 100644 --- a/.github/workflows/ubuntu-cpu.yml +++ b/.github/workflows/ubuntu-cpu.yml @@ -3,7 +3,7 @@ name: OpenSplat (Ubuntu CPU) on: push: branches: - - main + - torch-2.3.x pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [ubuntu-22.04, ubuntu-20.04] # [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] arch: [x64] # [x64, x86] - torch-version: [2.1.2, 2.2.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] + torch-version: [2.3.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] cmake-build-type: [Release] # [Debug, ClangTidy] env: CCACHE_DIR: ${{ github.workspace }}/ccache diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index eab0329..f8ba981 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -3,7 +3,7 @@ name: OpenSplat (Ubuntu CUDA) on: push: branches: - - main + - torch-2.3.x pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [ubuntu-22.04, ubuntu-20.04] # [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] arch: [x64] # [x64, x86] - torch-version: [2.1.2, 2.2.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] + torch-version: [2.3.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] cuda-version: [11.8.0, 12.1.1] # [12.3.1, 12.1.1, 11.8.0, 11.7.1, 11.6.2, 11.5.2,11.4.4, 11.3.1, 11.2.2, 11.1.1, 11.0.3, cpu] cmake-build-type: [Release] # [Debug, ClangTidy] env: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 481df1f..2cd844e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,7 +3,7 @@ name: OpenSplat (Windows CUDA) on: push: branches: - - main + - torch-2.3.x pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [windows-2019, windows-2022] # [windows-2019, windows-2022] arch: [x64] # [x64, x86] - torch-version: [2.1.2, 2.2.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] + torch-version: [2.3.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] cuda-version: [11.8.0, 12.1.1] # [12.3.1, 12.1.1, 11.8.0, 11.7.1, 11.6.2, 11.5.2,11.4.4, 11.3.1, 11.2.2, 11.1.1, 11.0.3, cpu] opencv-version: [4.9.0] # [4.7.0, 4.8.1, 4.9.0] cmake-build-type: [ Release ] # [Debug, ClangTidy] From 240cf14f086da3976622d5eaab4ce3fb8712dc73 Mon Sep 17 00:00:00 2001 From: Pengfei Xuan Date: Tue, 25 Jun 2024 10:26:20 -0400 Subject: [PATCH 2/4] Exclude macos-13 x86_64 CPU build with libtorch 2.3.x --- .github/workflows/macos.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 85b2059..57eb564 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -26,6 +26,9 @@ jobs: - os: macos-14 arch: arm64 torch-version: 2.1.2 + - os: macos-13 + arch: x86_64 + torch-version: 2.3.1 - os: macos-13 arch: arm64 env: From d0c70ee1addb938fd46790f692d4d12e56f23fa3 Mon Sep 17 00:00:00 2001 From: Pengfei Xuan Date: Tue, 25 Jun 2024 10:41:14 -0400 Subject: [PATCH 3/4] Test ROCm 6.x with libtorch 2.3.x --- .github/workflows/docker.yml | 2 +- .github/workflows/hip.yml | 2 +- .github/workflows/macos.yml | 4 ++-- .github/workflows/rocm6.yml | 4 ++-- .github/workflows/ubuntu-cpu.yml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3cdd5c4..89ee0d1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,7 +3,7 @@ name: OpenSplat (Docker CUDA) on: push: branches: - - torch-2.3.x + - main pull_request: types: [ assigned, opened, synchronize, reopened ] release: diff --git a/.github/workflows/hip.yml b/.github/workflows/hip.yml index 1b44a09..b142393 100644 --- a/.github/workflows/hip.yml +++ b/.github/workflows/hip.yml @@ -3,7 +3,7 @@ name: OpenSplat (Ubuntu ROCm/HIP) on: push: branches: - - torch-2.3.x + - main pull_request: types: [ assigned, opened, synchronize, reopened ] release: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 57eb564..c14668d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -3,7 +3,7 @@ name: OpenSplat (MacOS X86 and ARM) on: push: branches: - - torch-2.3.x + - main pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [macos-14, macos-13] # [macos-14, macos-13, macos-12, macos-11] arch: [arm64, x86_64] # [arm64, x86_64] - torch-version: [2.3.1] # [2.2.1, 2.2.0, 2.1.2, 2.1.1, 2.1.0, 2.0.0, 1.13.0, 1.12.0] + torch-version: [2.3.1, 2.2.1, 2.1.2] # [2.2.1, 2.2.0, 2.1.2, 2.1.1, 2.1.0, 2.0.0, 1.13.0, 1.12.0] cmake-build-type: [Release] # [Debug, ClangTidy] exclude: - os: macos-14 diff --git a/.github/workflows/rocm6.yml b/.github/workflows/rocm6.yml index c64f16a..16d4c59 100644 --- a/.github/workflows/rocm6.yml +++ b/.github/workflows/rocm6.yml @@ -3,7 +3,7 @@ name: OpenSplat (Docker ROCm 6.x) on: push: branches: - - main + - torch-2.3.x pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [ubuntu-22.04] # [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] arch: [x64] # [x64, x86] - torch-version: [2.1.2] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] + torch-version: [2.3.1, 2.1.2] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] rocm-version: [6.0.2] cmake-build-type: [Release] # [Debug, ClangTidy] steps: diff --git a/.github/workflows/ubuntu-cpu.yml b/.github/workflows/ubuntu-cpu.yml index e3c39f0..b21b005 100644 --- a/.github/workflows/ubuntu-cpu.yml +++ b/.github/workflows/ubuntu-cpu.yml @@ -3,7 +3,7 @@ name: OpenSplat (Ubuntu CPU) on: push: branches: - - torch-2.3.x + - main pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [ubuntu-22.04, ubuntu-20.04] # [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] arch: [x64] # [x64, x86] - torch-version: [2.3.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] + torch-version: [2.3.1, 2.2.1, 2.1.2] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] cmake-build-type: [Release] # [Debug, ClangTidy] env: CCACHE_DIR: ${{ github.workspace }}/ccache diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f8ba981..b29287b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -3,7 +3,7 @@ name: OpenSplat (Ubuntu CUDA) on: push: branches: - - torch-2.3.x + - main pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [ubuntu-22.04, ubuntu-20.04] # [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] arch: [x64] # [x64, x86] - torch-version: [2.3.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] + torch-version: [2.3.1, 2.2.1, 2.1.2] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] cuda-version: [11.8.0, 12.1.1] # [12.3.1, 12.1.1, 11.8.0, 11.7.1, 11.6.2, 11.5.2,11.4.4, 11.3.1, 11.2.2, 11.1.1, 11.0.3, cpu] cmake-build-type: [Release] # [Debug, ClangTidy] env: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2cd844e..fa56837 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,7 +3,7 @@ name: OpenSplat (Windows CUDA) on: push: branches: - - torch-2.3.x + - main pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [windows-2019, windows-2022] # [windows-2019, windows-2022] arch: [x64] # [x64, x86] - torch-version: [2.3.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] + torch-version: [2.3.1, 2.2.1, 2.1.2] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] cuda-version: [11.8.0, 12.1.1] # [12.3.1, 12.1.1, 11.8.0, 11.7.1, 11.6.2, 11.5.2,11.4.4, 11.3.1, 11.2.2, 11.1.1, 11.0.3, cpu] opencv-version: [4.9.0] # [4.7.0, 4.8.1, 4.9.0] cmake-build-type: [ Release ] # [Debug, ClangTidy] From 22fd8a1ee8219b8085dd64e035485cb86dd26c92 Mon Sep 17 00:00:00 2001 From: Pengfei Xuan Date: Tue, 25 Jun 2024 10:50:53 -0400 Subject: [PATCH 4/4] Switch ci trigger back to the main branch --- .github/workflows/rocm6.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rocm6.yml b/.github/workflows/rocm6.yml index 16d4c59..c64f16a 100644 --- a/.github/workflows/rocm6.yml +++ b/.github/workflows/rocm6.yml @@ -3,7 +3,7 @@ name: OpenSplat (Docker ROCm 6.x) on: push: branches: - - torch-2.3.x + - main pull_request: types: [ assigned, opened, synchronize, reopened ] release: @@ -18,7 +18,7 @@ jobs: matrix: os: [ubuntu-22.04] # [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] arch: [x64] # [x64, x86] - torch-version: [2.3.1, 2.1.2] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] + torch-version: [2.1.2] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1] rocm-version: [6.0.2] cmake-build-type: [Release] # [Debug, ClangTidy] steps: