Merge pull request #1997 from swahtz/omni_fvdb_update

fVDB 0.2.1 update

.github/workflows/nanovdb.yml

@@ -83,6 +83,7 @@ jobs:
           --cargs=\'
           -DUSE_EXPLICIT_INSTANTIATION=OFF
           -DNANOVDB_USE_CUDA=ON
+          -DCMAKE_CUDA_ARCHITECTURES="80"
           -DNANOVDB_USE_OPENVDB=ON
           -DCMAKE_INSTALL_PREFIX=`pwd`
           -DUSE_BLOSC=OFF
@@ -127,6 +128,7 @@ jobs:
         -DMSVC_COMPRESS_PDB=ON
         -DUSE_EXPLICIT_INSTANTIATION=OFF
         -DNANOVDB_USE_CUDA=ON
+        -DCMAKE_CUDA_ARCHITECTURES="80"
         -DNANOVDB_USE_OPENVDB=ON
         -DVCPKG_TARGET_TRIPLET=${VCPKG_DEFAULT_TRIPLET}
         -DCMAKE_TOOLCHAIN_FILE=\"${VCPKG_INSTALLATION_ROOT}\\scripts\\buildsystems\\vcpkg.cmake\"

.gitignore

@@ -1,2 +1,3 @@
 /build/*
+**/src/benchmarks/build/*
 .DS_Store

ci/build.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -e
 

ci/build_sonar.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 

ci/download_houdini.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 

ci/download_vdb_caches.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 import os
 import sys

ci/extract_test_examples.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 #################################################################################
 # This script extracts all code blocks from AX documentation which are NOT      #
 # marked as cpp/sh/unparsed and attempts to parse or compile them through the   #

ci/install_blosc.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 

ci/install_cppunit.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 CURL_VERSION="$1"

ci/install_doxygen.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 

ci/install_glfw.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 GLFW_VERSION="$1"

ci/install_gtest.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 

ci/install_llvm_windows.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 

ci/install_macos.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -x
 

ci/install_nanobind.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 

ci/install_tbb_macos.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -x
 

ci/test_install.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 set -e
 
 # Various tests to test the FindOpenVDB CMake modules and

ci/test_sonar.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright Contributors to the OpenVDB Project
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 

fvdb/.clang-format

@@ -74,13 +74,23 @@ BreakConstructorInitializersBeforeComma: false
 BreakInheritanceList: BeforeColon
 BreakStringLiterals: false
 Cpp11BracedListStyle: false
-IncludeBlocks: Preserve
+IncludeBlocks: Regroup
 IncludeIsMainRegex: "$"
 IncludeCategories:
-  - Regex: '^<.*\.(h|cuh)>'
-    Priority: 1
-  - Regex: ".*"
-    Priority: 2
+  - Regex:           '^"' # quoted includes
+    Priority:        1
+  - Regex:           '^<(detail/|Types.h|JaggedTensor.h|GridBatch.h|SparseConvPackInfo.h|Config.h|FVDB.h|GaussianSplatting.h)' # fvdb includes
+    Priority:        1
+  - Regex:           '^<nanovdb/' # nanovdb includes
+    Priority:        2
+  - Regex:           '^<(torch|c10|THC|ATen)/' # torch includes
+    Priority:        3
+  - Regex:           '^<(cooperative_groups|cuco|cuda.h|cuda_|device_types|math_constants|nvtx3|cute)' # CUDA includes
+    Priority:        4
+  - Regex:           '^<.*\..*' # other system includes (e.g. with a '.')
+    Priority:        5
+  - Regex:           '^<[^.]+' # STL includes (no '.')
+    Priority:        6
 IncludeIsMainSourceRegex: "$"
 IndentPPDirectives: None
 IndentWrappedFunctionNames: false

fvdb/.github/workflows/tests.yml

@@ -20,8 +20,8 @@ permissions:
   deployments: write
 
 jobs:
-
   fvdb-build:
+    if: ${{ !startsWith(github.event.pull_request.title, 'Draft:') }}
     name: fVDB Build
     runs-on:
       - self-hosted
@@ -47,7 +47,7 @@ jobs:
 
       - name: Buid fvdb
         run: |
-          TORCH_CUDA_ARCH_LIST="8.0;8.6;8.9+PTX" MAX_JOBS=$(($(nproc) < $(free -g | awk '/^Mem:/{jobs=int($7/2.5); if(jobs<1) jobs=1; print jobs}') ? $(nproc) : $(free -g | awk '/^Mem:/{jobs=int($7/2.5); if(jobs<1) jobs=1; print jobs}'))) conda run --no-capture-output -n fvdb_build python setup.py bdist_wheel --dist-dir=dist
+          TORCH_CUDA_ARCH_LIST="7.0;7.5;8.0;8.6+PTX" MAX_JOBS=$(($(nproc) < $(free -g | awk '/^Mem:/{jobs=int($4/2.5); if(jobs<1) jobs=1; print jobs}') ? $(nproc) : $(free -g | awk '/^Mem:/{jobs=int($4/2.5); if(jobs<1) jobs=1; print jobs}'))) conda run --no-capture-output -n fvdb_build python setup.py bdist_wheel --dist-dir=dist
 
       - name: Upload package
         uses: actions/upload-artifact@v4
@@ -218,4 +218,4 @@ jobs:
         run: |
           echo "Cleaning up /__w/_temp directory"
           sudo rm -rf /__w/_temp/*
-          echo "Cleanup completed"
+          echo "Cleanup completed"

fvdb/.gitignore

@@ -1,4 +1,6 @@
 /build/*
+/src/benchmarks/build/*
+/src/tests/build/*
 *.creator
 *.includes
 *.files

fvdb/.vscode/c_cpp_properties.json

@@ -6,7 +6,7 @@
                 "${env:CONDA_PREFIX}/envs/fvdb/include",
                 "${env:CONDA_PREFIX}/envs/fvdb/include/cuda",
                 "${workspaceFolder}/src",
-                "${workspaceFolder}/external/openvdb/nanovdb",
+                "${workspaceFolder}/../nanovdb",
                 "${workspaceFolder}/external/glm",
                 "${workspaceFolder}/external/cudnn_fe/include",
                 "${workspaceFolder}/external/cutlass/include",

fvdb/.vscode/settings.json

@@ -154,4 +154,5 @@
     "json.format.keepLines": true,
     "C_Cpp.formatting": "clangFormat",
     "C_Cpp.clang_format_path": "${env:CONDA_PREFIX}/envs/fvdb/bin/clang-format-18",
-}
+    "files.insertFinalNewline": true,
+}

fvdb/docs/conf.py

@@ -16,8 +16,8 @@
 # -- Project information -----------------------------------------------------
 
 project = "fVDB"
-copyright = "2023, NVIDIA Corporation"
-author = "NVIDIA Corporation"
+copyright = "Contributors to the OpenVDB Project"
+author = "Contributors to the OpenVDB Project"
 
 
 # -- General configuration ---------------------------------------------------

fvdb/env/build_environment.yml

@@ -1,25 +1,21 @@
 name: fvdb_build
 channels:
-  - pytorch
-  - nvidia
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.10
-  - pytorch::pytorch=2.4.0
-  - pytorch::pytorch-cuda=12.1
-  - pytorch::pytorch-mutex=*=cuda
+  - python=3.11
+  - pytorch-gpu=2.4.1[build=cuda120*]
   - git
   - gitpython
   - ca-certificates
   - certifi
   - openssl
-  - cuda-toolkit=12.1
-  - cuda-compiler=12.1
-  - cuda-nvcc=12.1
-  - cuda-cccl=12.1
-  - cuda-libraries-static=12.1
-  - cuda-cudart-static=12.1
+  - cuda-version=12.0
+  - cuda-command-line-tools
+  - cuda-compiler
+  - libcusparse-dev
+  - libcublas-dev
+  - libcusolver-dev
   - gcc_linux-64=11
   - gxx_linux-64=11
   - cxx-compiler

fvdb/env/dev_environment.yml

@@ -1,29 +1,25 @@
 name: fvdb
 channels:
-  - pytorch
-  - nvidia
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.10
+  - python=3.11
+  - pytorch-gpu=2.4.1[build=cuda120*]
   - jupyterlab
-  - pytorch::pytorch=2.4.0
-  - pytorch::pytorch-cuda=12.1
-  - pytorch::pytorch-mutex=*=cuda
-  - pytorch::torchvision
+  - torchvision=0.19
   - tensorboard
   - pip
   - git
   - gitpython
   - ca-certificates
   - certifi
   - openssl
-  - cuda-toolkit=12.1
-  - cuda-compiler=12.1
-  - cuda-nvcc=12.1
-  - cuda-cccl=12.1
-  - cuda-libraries-static=12.1
-  - cuda-cudart-static=12.1
+  - cuda-version=12.0
+  - cuda-command-line-tools
+  - cuda-compiler
+  - libcusparse-dev
+  - libcublas-dev
+  - libcusolver-dev
   - libcurand-dev
   - gcc_linux-64=11
   - gxx_linux-64=11
@@ -40,27 +36,28 @@ dependencies:
   - numpy<2
   - tqdm
   - sparsehash
-  - pyg::pytorch-scatter=2.1.2
   - pandas
   - pytest-benchmark
   - polyscope
   - pyrender
   - rich
   - parameterized
   - ipython
-  - py-openimageio
   - matplotlib
     ## 3dgs
   - imageio
   - torchmetrics
-  - py-opencv
+  - fastai::opencv-python-headless
   - tyro
   - pillow
   - pyyaml
   - scikit-learn
   - pip:
     - point-cloud-utils
-    - https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu121/torchsparse_20-2.0.0b0-cp310-cp310-linux_x86_64.whl
-    - https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu121/torchsparse-2.1.0-cp310-cp310-linux_x86_64.whl
+    - https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu120/torchsparse-2.1.0-cp311-cp311-linux_x86_64.whl
+    - https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu120/torchsparse_20-2.0.0b0-cp311-cp311-linux_x86_64.whl
+    - https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu120/torch_scatter-2.1.2-cp311-cp311-linux_x86_64.whl
     ## 3dgs
-    - viser
+    - viser
+    ## 3dgs tests
+    - oiio-static-python

fvdb/env/learn_environment.yml

@@ -1,16 +1,13 @@
 name: fvdb_learn
 channels:
-  - pytorch
-  - nvidia
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.10
+  - python=3.11
+  - pytorch-gpu=2.4.1[build=cuda120*]
+  - cuda-version=12.0
   - jupyterlab
-  - pytorch::pytorch=2.4.0
-  - pytorch::pytorch-cuda=12.1
-  - pytorch::pytorch-mutex=*=cuda
-  - pytorch::torchvision
+  - torchvision
   - tensorboard
   - pip
   - git
@@ -23,7 +20,6 @@ dependencies:
   - matplotlib
   - tqdm
   - sparsehash
-  - pyg::pytorch-scatter=2.1.2
   - pandas
   - pytest-benchmark
   - polyscope
@@ -33,12 +29,13 @@ dependencies:
   ## 3dgs
   - imageio
   - torchmetrics
-  - py-opencv
+  - fastai::opencv-python-headless
   - tyro
   - pillow
   - pyyaml
   - scikit-learn
   - pip:
     - point-cloud-utils
     ## 3dgs
-    - viser
+    - viser
+    - https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu120/torch_scatter-2.1.2-cp311-cp311-linux_x86_64.whl