Skip to content

Commit 06f003e

Browse files
swahtzswahtz
authored
Merge pull request #1997 from swahtz/omni_fvdb_update
fVDB 0.2.1 update
2 parents 093a638 + 8145597 commit 06f003e

File tree

226 files changed

+6443
-3840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+6443
-3840
lines changed

‎.github/workflows/nanovdb.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
--cargs=\'
8484
-DUSE_EXPLICIT_INSTANTIATION=OFF
8585
-DNANOVDB_USE_CUDA=ON
86+
-DCMAKE_CUDA_ARCHITECTURES="80"
8687
-DNANOVDB_USE_OPENVDB=ON
8788
-DCMAKE_INSTALL_PREFIX=`pwd`
8889
-DUSE_BLOSC=OFF
@@ -127,6 +128,7 @@ jobs:
127128
-DMSVC_COMPRESS_PDB=ON
128129
-DUSE_EXPLICIT_INSTANTIATION=OFF
129130
-DNANOVDB_USE_CUDA=ON
131+
-DCMAKE_CUDA_ARCHITECTURES="80"
130132
-DNANOVDB_USE_OPENVDB=ON
131133
-DVCPKG_TARGET_TRIPLET=${VCPKG_DEFAULT_TRIPLET}
132134
-DCMAKE_TOOLCHAIN_FILE=\"${VCPKG_INSTALLATION_ROOT}\\scripts\\buildsystems\\vcpkg.cmake\"

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/build/*
2+
**/src/benchmarks/build/*
23
.DS_Store

‎ci/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -e
46

‎ci/build_sonar.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -ex
46

‎ci/download_houdini.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -ex
46

‎ci/download_vdb_caches.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env python3
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
import os
46
import sys

‎ci/extract_test_examples.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24
#################################################################################
35
# This script extracts all code blocks from AX documentation which are NOT #
46
# marked as cpp/sh/unparsed and attempts to parse or compile them through the #

‎ci/install_blosc.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -ex
46

‎ci/install_cppunit.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -ex
46
CURL_VERSION="$1"

‎ci/install_doxygen.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -ex
46

‎ci/install_glfw.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -ex
46
GLFW_VERSION="$1"

‎ci/install_gtest.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -ex
46

‎ci/install_llvm_windows.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -ex
46

‎ci/install_macos.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -x
46

‎ci/install_nanobind.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -ex
46

‎ci/install_tbb_macos.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -x
46

‎ci/test_install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24
set -e
35

46
# Various tests to test the FindOpenVDB CMake modules and

‎ci/test_sonar.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Copyright Contributors to the OpenVDB Project
3+
# SPDX-License-Identifier: Apache-2.0
24

35
set -ex
46

‎fvdb/.clang-format

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,23 @@ BreakConstructorInitializersBeforeComma: false
7474
BreakInheritanceList: BeforeColon
7575
BreakStringLiterals: false
7676
Cpp11BracedListStyle: false
77-
IncludeBlocks: Preserve
77+
IncludeBlocks: Regroup
7878
IncludeIsMainRegex: "$"
7979
IncludeCategories:
80-
- Regex: '^<.*\.(h|cuh)>'
81-
Priority: 1
82-
- Regex: ".*"
83-
Priority: 2
80+
- Regex: '^"' # quoted includes
81+
Priority: 1
82+
- Regex: '^<(detail/|Types.h|JaggedTensor.h|GridBatch.h|SparseConvPackInfo.h|Config.h|FVDB.h|GaussianSplatting.h)' # fvdb includes
83+
Priority: 1
84+
- Regex: '^<nanovdb/' # nanovdb includes
85+
Priority: 2
86+
- Regex: '^<(torch|c10|THC|ATen)/' # torch includes
87+
Priority: 3
88+
- Regex: '^<(cooperative_groups|cuco|cuda.h|cuda_|device_types|math_constants|nvtx3|cute)' # CUDA includes
89+
Priority: 4
90+
- Regex: '^<.*\..*' # other system includes (e.g. with a '.')
91+
Priority: 5
92+
- Regex: '^<[^.]+' # STL includes (no '.')
93+
Priority: 6
8494
IncludeIsMainSourceRegex: "$"
8595
IndentPPDirectives: None
8696
IndentWrappedFunctionNames: false

‎fvdb/.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ permissions:
2020
deployments: write
2121

2222
jobs:
23-
2423
fvdb-build:
24+
if: ${{ !startsWith(github.event.pull_request.title, 'Draft:') }}
2525
name: fVDB Build
2626
runs-on:
2727
- self-hosted
@@ -47,7 +47,7 @@ jobs:
4747

4848
- name: Buid fvdb
4949
run: |
50-
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
50+
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
5151
5252
- name: Upload package
5353
uses: actions/upload-artifact@v4
@@ -218,4 +218,4 @@ jobs:
218218
run: |
219219
echo "Cleaning up /__w/_temp directory"
220220
sudo rm -rf /__w/_temp/*
221-
echo "Cleanup completed"
221+
echo "Cleanup completed"

‎fvdb/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/build/*
2+
/src/benchmarks/build/*
3+
/src/tests/build/*
24
*.creator
35
*.includes
46
*.files

‎fvdb/.vscode/c_cpp_properties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"${env:CONDA_PREFIX}/envs/fvdb/include",
77
"${env:CONDA_PREFIX}/envs/fvdb/include/cuda",
88
"${workspaceFolder}/src",
9-
"${workspaceFolder}/external/openvdb/nanovdb",
9+
"${workspaceFolder}/../nanovdb",
1010
"${workspaceFolder}/external/glm",
1111
"${workspaceFolder}/external/cudnn_fe/include",
1212
"${workspaceFolder}/external/cutlass/include",

‎fvdb/.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,5 @@
154154
"json.format.keepLines": true,
155155
"C_Cpp.formatting": "clangFormat",
156156
"C_Cpp.clang_format_path": "${env:CONDA_PREFIX}/envs/fvdb/bin/clang-format-18",
157-
}
157+
"files.insertFinalNewline": true,
158+
}

‎fvdb/docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
# -- Project information -----------------------------------------------------
1717

1818
project = "fVDB"
19-
copyright = "2023, NVIDIA Corporation"
20-
author = "NVIDIA Corporation"
19+
copyright = "Contributors to the OpenVDB Project"
20+
author = "Contributors to the OpenVDB Project"
2121

2222

2323
# -- General configuration ---------------------------------------------------

‎fvdb/env/build_environment.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
name: fvdb_build
22
channels:
3-
- pytorch
4-
- nvidia
53
- conda-forge
64
- nodefaults
75
dependencies:
8-
- python=3.10
9-
- pytorch::pytorch=2.4.0
10-
- pytorch::pytorch-cuda=12.1
11-
- pytorch::pytorch-mutex=*=cuda
6+
- python=3.11
7+
- pytorch-gpu=2.4.1[build=cuda120*]
128
- git
139
- gitpython
1410
- ca-certificates
1511
- certifi
1612
- openssl
17-
- cuda-toolkit=12.1
18-
- cuda-compiler=12.1
19-
- cuda-nvcc=12.1
20-
- cuda-cccl=12.1
21-
- cuda-libraries-static=12.1
22-
- cuda-cudart-static=12.1
13+
- cuda-version=12.0
14+
- cuda-command-line-tools
15+
- cuda-compiler
16+
- libcusparse-dev
17+
- libcublas-dev
18+
- libcusolver-dev
2319
- gcc_linux-64=11
2420
- gxx_linux-64=11
2521
- cxx-compiler

‎fvdb/env/dev_environment.yml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
name: fvdb
22
channels:
3-
- pytorch
4-
- nvidia
53
- conda-forge
64
- nodefaults
75
dependencies:
8-
- python=3.10
6+
- python=3.11
7+
- pytorch-gpu=2.4.1[build=cuda120*]
98
- jupyterlab
10-
- pytorch::pytorch=2.4.0
11-
- pytorch::pytorch-cuda=12.1
12-
- pytorch::pytorch-mutex=*=cuda
13-
- pytorch::torchvision
9+
- torchvision=0.19
1410
- tensorboard
1511
- pip
1612
- git
1713
- gitpython
1814
- ca-certificates
1915
- certifi
2016
- openssl
21-
- cuda-toolkit=12.1
22-
- cuda-compiler=12.1
23-
- cuda-nvcc=12.1
24-
- cuda-cccl=12.1
25-
- cuda-libraries-static=12.1
26-
- cuda-cudart-static=12.1
17+
- cuda-version=12.0
18+
- cuda-command-line-tools
19+
- cuda-compiler
20+
- libcusparse-dev
21+
- libcublas-dev
22+
- libcusolver-dev
2723
- libcurand-dev
2824
- gcc_linux-64=11
2925
- gxx_linux-64=11
@@ -40,27 +36,28 @@ dependencies:
4036
- numpy<2
4137
- tqdm
4238
- sparsehash
43-
- pyg::pytorch-scatter=2.1.2
4439
- pandas
4540
- pytest-benchmark
4641
- polyscope
4742
- pyrender
4843
- rich
4944
- parameterized
5045
- ipython
51-
- py-openimageio
5246
- matplotlib
5347
## 3dgs
5448
- imageio
5549
- torchmetrics
56-
- py-opencv
50+
- fastai::opencv-python-headless
5751
- tyro
5852
- pillow
5953
- pyyaml
6054
- scikit-learn
6155
- pip:
6256
- point-cloud-utils
63-
- https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu121/torchsparse_20-2.0.0b0-cp310-cp310-linux_x86_64.whl
64-
- https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu121/torchsparse-2.1.0-cp310-cp310-linux_x86_64.whl
57+
- https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu120/torchsparse-2.1.0-cp311-cp311-linux_x86_64.whl
58+
- https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu120/torchsparse_20-2.0.0b0-cp311-cp311-linux_x86_64.whl
59+
- https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu120/torch_scatter-2.1.2-cp311-cp311-linux_x86_64.whl
6560
## 3dgs
66-
- viser
61+
- viser
62+
## 3dgs tests
63+
- oiio-static-python

‎fvdb/env/learn_environment.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
name: fvdb_learn
22
channels:
3-
- pytorch
4-
- nvidia
53
- conda-forge
64
- nodefaults
75
dependencies:
8-
- python=3.10
6+
- python=3.11
7+
- pytorch-gpu=2.4.1[build=cuda120*]
8+
- cuda-version=12.0
99
- jupyterlab
10-
- pytorch::pytorch=2.4.0
11-
- pytorch::pytorch-cuda=12.1
12-
- pytorch::pytorch-mutex=*=cuda
13-
- pytorch::torchvision
10+
- torchvision
1411
- tensorboard
1512
- pip
1613
- git
@@ -23,7 +20,6 @@ dependencies:
2320
- matplotlib
2421
- tqdm
2522
- sparsehash
26-
- pyg::pytorch-scatter=2.1.2
2723
- pandas
2824
- pytest-benchmark
2925
- polyscope
@@ -33,12 +29,13 @@ dependencies:
3329
## 3dgs
3430
- imageio
3531
- torchmetrics
36-
- py-opencv
32+
- fastai::opencv-python-headless
3733
- tyro
3834
- pillow
3935
- pyyaml
4036
- scikit-learn
4137
- pip:
4238
- point-cloud-utils
4339
## 3dgs
44-
- viser
40+
- viser
41+
- https://nksr.s3.ap-northeast-1.amazonaws.com/dev-whls/pt24cu120/torch_scatter-2.1.2-cp311-cp311-linux_x86_64.whl

0 commit comments

Comments
 (0)