Commit Graph
203 Commits
Author SHA1 Message Date
terrance 89731110d4 fix test import 2023-05-25 21:36:27 +00:00
terrance a130a1121d fix test import 2023-05-25 21:28:47 +00:00
terrance e343ea0b07 merge w main 2023-05-25 17:34:19 +00:00
Milan van Wouden d413ca4204 fix large number of typos in repository (#1977)
* fix large number of typos in repository

* fix typos in tests
2023-05-23 10:41:49 -07:00
Matthew Tancik 27e2c874cb Report tcnn import errors (#1969) 2023-05-22 09:36:00 -07:00
Matthew Tancik 8f4f89cf87 Don't run temporal tv loss test (#1952) 2023-05-18 16:03:25 -07:00
Matthew TancikandBrent Yi 2b0831b6d4 Final typing fixes + add Pyright to CI (#1944)
* knocking out a couple

* Fix more errors

* Add pyright

* Remove some unnecessary cv2 type ignores, warning on missing imports
(for missing tinycudann)

* Minor annotation fixes

* Update docs

* Drop `None` from temporal distortion output

---------

Co-authored-by: Brent Yi <yibrenth@gmail.com>
2023-05-18 02:25:34 -07:00
Brent YiandMatt Tancik d542646c72 Switch to ruff (#1939)
* `isort` -> `ruff`

* `pylint` -> `ruff`

* Remove line

* More minor cleanup

* Better documentation for rules we are enabling

* Fix gitignore, run black

* vscode settings

---------

Co-authored-by: Matt Tancik <mattt4001@gmail.com>
2023-05-17 10:08:14 -07:00
Brent YiandMatt Tancik 6ba2a18b2b torchtyping => jaxtyping (#1838)
* Run `ruff --fix`

* Add jaxtyping migration script

* Run migration scripts + ruff + black

* Merge remote-tracking branch 'origin/main' into brent/jaxtyping

* black

* Fix lint

* fix lint

* Cleanup and more specific types

* Fixed annotation errors

* Fix more errors

* Fix annotation

* Delete _torchtyping_to_jaxtyping.py

---------

Co-authored-by: Matt Tancik <mattt4001@gmail.com>
2023-05-16 15:57:47 -07:00
terrance 3e5a4b0236 merging from main 2023-05-10 21:54:10 +00:00
terrance 80cdb73406 merging main 2023-05-10 21:26:04 +00:00
Matthew Tancik 72a14b0b22 Move scripts folder into nerfstudio (#1897)
move scripts folder into nerfstudio
2023-05-09 16:44:21 -07:00
Yan XiaoandYan Xiao 38cbb0f358 implementing l1 and tv reg in the original tensorf paper (#1855)
* implementing l1 and tv reg in the original tensorf paper

* added documentation for tv loss

* added test for tv loss

* fix formating

* fix formatting

---------

Co-authored-by: Yan Xiao <yax010@ucsd.edu>
2023-05-09 09:32:51 -07:00
Jonáš Kulhánek 1147fe4d5c Make VanillaDataManager generic (#1868)
* Make VanillaDataManager generic

* Remove removed classes from docs

* Simplify generic datamanager

* Simplify code

* Add serialization tests
2023-05-06 09:54:52 -07:00
Jonáš Kulhánek 971c9eb307 Enable method config registration from env variable (#1869) 2023-05-04 20:53:52 +02:00
Milan van Wouden 8030367e6b Fix images to nerfstudio filename (#1853)
fix images to nerfstudio filename
2023-05-04 10:06:52 -07:00
Malcolm MielleandBrent Yi 3d2e62a480 Refactor of image and video dataset conversion (#1690)
* Refactor of image and video dataset conversion

The classes to convert images and video to a NerfStudio
dataset are moved to the main repo and refactor:
* Code duplications are removed
* Import of the class is now done from nerfstudio package instead of
  scripts

* Doc formatting nits

* Doc formatting

---------

Co-authored-by: Brent Yi <yibrenth@gmail.com>
2023-04-26 10:30:01 -07:00
Ruilong Li(李瑞龙) ea2993d5b1 Update NGP related models with nerfacc 0.5.2 (#1809)
* profiling

* set pose_optimizer to None if it's mode is "off"

* radial_and_tangential_undistort in nerfacc

* fix camera distortions

* update to nerfacc 0.5.1. Upgrade instant-ngp model.

* revert nerfacc to 0.5.1

* format

* allows to fall back to the pytorch undistortion

* format

* fix linting

* fix test

* fix test

* fix nerfplayer-ngp

* enable_collider=False for NGP

* nerfplayer verified.

* zero cone_angle for ngp bounded

* fix format

* fix pylint
2023-04-24 17:11:30 -07:00
6a7c8820b8 Viewer backend refactor (#1702)
* Copy in `viser` communication infrastructure

* Update background image

* Add build directory to fix viser HTTP server
May want to remove these later

* Copy in `viser` communication infrastructure

* Update background image

* Pass dataset vis using viser

* initial impl of ViewerParameter

* idk what i did but brent and matt know

* Suppress eslint typescript warnings

* implement ViewerElement base class, then ViewerButton, ViewerSlider, etc

* client -> server message setup

* multi folder stuff

* Stream controls over viser

* import

* add types to viewer_param.py

* Move another message to viser

* Update folder color

* Use non throttled messages

* multiple folders works

* Cleanup, more porting

* starting impl of control panel in viser

* More porting

* scenebox to viser

* Cleanup

* Fix render updates

* More cleanup, docs, typing

* start control_panel.py

* set_hidden logic but not merged in

* control_panel replicates behavior of existing control panel (visually), except for setting the list of output options. not yet integrated with viewer_utils.py for logic flow. also implemented set_disabled and set_hidden in javscript/ViewerElement side

* Remove some original leva components

* add some train util logic, attempt set_value, doesn't work on javascript side fully yet (value updates but not slider visually

* bye zmq

* missing call to decoder

* 'gui_set' works properly, control panel now replicates behavior of original

* remove print

* Fix status viewer message

* More cleanup

* support set_options in dropdown

* hiding buttons works correctly

* fix set_options, switch from cur_value to get_value()

* Fix slowdown

* output options

* colormap logic converted

* add handle to cb_hook

* fix some lambda bugs

* cleanup

* Save checkpoint logic readded

* Cleanup and minor fixes

* snappier ui

* Refactoring

* Fix state update bugs

* Bug fixes

* Write less to redux

* added comments to reducer code

* Render state machine (#1727)

* state machine works, but train step throttling not implemented

* more step logic, cleanup

* remove random try catcH

* mutex logic for render

* Update lock logic

* types and docs

* added some state machine logic to help rerenders

* merge

---------

Co-authored-by: Justin <justin.g.kerr@gmail.com>

* Refactor and cleanup

* More cleanup and docs

* docstring to gui_utils

* docstrings, rename viewer_param.py to viewer_elements.py

* Fix viewer, remove bridge stuff

* Render on connect

* Fix lint errors

* More eslint fixes

* render_freq logic

* better rerender logic for crop

* More cleanup

* Purge

* Cleanup

* Lint fixes

* Fix cache

* better parsing logic

* Fix infinite test

* More cleanup

* typo

* Update webdocs

* Update docs

* rerender on custom hooks

* add more docs

* Use shared utilities in `viser.infra`

* rework callback to use elements instead of handles

* Fix ESlint errors

* change naming of handle to element, add setter for value

* cleanup

---------

Co-authored-by: Matt Tancik <mattt4001@gmail.com>
Co-authored-by: Justin <justin.g.kerr@gmail.com>
Co-authored-by: Ethan Weber <eweb0124@gmail.com>
Co-authored-by: Matthew Tancik <tancik@berkeley.edu>
2023-04-14 14:53:10 -07:00
Pablo VelaandEthan Weber 8126d47d8c NeusFacto (#1654)
* add neus_facto method

* fix missing pixsfm from video process

* fix dev errors and small typos

---------

Co-authored-by: Ethan Weber <eweb0124@gmail.com>
2023-04-12 19:08:53 -05:00
835a0151f2 Create nerfacto-big config for nerfacto with sampling, network size, resolution, and train steps cranked up (#1668)
* Increase max_res of first proposal network

* nerfacto-big params

* skip nerfacto_big in test

---------

Co-authored-by: Matt Tancik <mattt4001@gmail.com>
Co-authored-by: Ethan Weber <ethanweber@berkeley.edu>
2023-04-05 07:43:39 -07:00
Zhensheng Yuan e104a3029e fix checkpoint generated by ddp training cannot be loaded (#1682)
* fix checkpoint generated by ddp training cannot be loaded

* fix typo

* reformatted nerfstudio/pipelines/base_pipeline.py

* rewritten as for loop

* add test case

* reformatted

* fix pylint test failed
2023-04-01 15:56:47 -07:00
wang shuai 24b3db8eb0 Fix bug: sh render is not correct (#1667)
* Update renderers.py

revise the SH renderer

* Update test_renderers.py

change the test target for sh render
2023-03-28 07:58:21 -07:00
Giodiroandgmeanti 78fbe6513e Add KPlanesEncoding encoding (#1658)
Co-authored-by: gmeanti <giacomo.meanti@gmail.com>
2023-03-24 08:18:57 -07:00
Jonáš Kulhánek c0464f8a91 Adds util function to convert transformed poses back + tests (#1594)
Improves tests of ns-process-data images +
Adds util function to convert poses back from transformed coordinates.
2023-03-19 12:09:33 +01:00
terrancewang a449219f91 merging + text embedding bugfix 2023-03-15 13:34:43 -07:00
Pablo Vela ddfa463f4d NeuS Implementation (#1444)
* add initial method configs and data manager

* add neus scheduler

* add initial surface model and neus

* add Neus ray sampler

* add sdf field

* move scale/shift calc to math utils

* add debug and fix sdf_dataset typo

* update vscode neus debug

* fix dataset and get initial working version

* add magic number from original repo

* black fixes

* clean up get weights/transmittance from alphas

* clean up typos in sdf datamanager

* type annotations on neus scheduler and remove unused params

* clean up and annotate sdf field along w/ other fixes

* more clean up

* remove unnessary directions norm

* resolve comments

* update neus scheduler to follow refactor

* fix linter errors

* fix some typos

* remove get_weights_from_alpha

* more comment fixes

* more linter error fixes

* clean up and add comments

* more little fixes for types/comments

* more comments

* rename NeuS Scheduler to DelayedScheduler

* rename DelayedScheduler to CosineDecayScheduler
2023-03-12 16:01:18 -04:00
Jonáš Kulhánek 2b8d5a9e5c Adds ns-process-data images tests and fixes #1586 (#1591)
* Adds ns-process-data images tests and fixes #1586

* Fix missing colmap and ffmpeg in github actions
2023-03-12 00:12:14 +01:00
Jonáš Kulhánek d9a391f79a Fixed: MinimalDataParser add options, allow Nerfstudio data format to specify test indices (#1586)
* MinimalDataParser add options, allow Nerfstudio data format to specify test indices

* Switch from indices to filenames and add tests

* Fix  #1581

* Fix changed interface
2023-03-11 22:14:45 +01:00
Matthew Tancik 510188b1e6 Revert "MinimalDataParser add options, allow Nerfstudio data format to specify test indices" (#1583)
Revert "MinimalDataParser add options, allow Nerfstudio data format to specify test indices (#1541)"

This reverts commit c61d3e9387.
2023-03-10 10:23:17 -08:00
Jonáš Kulhánek c61d3e9387 MinimalDataParser add options, allow Nerfstudio data format to specify test indices (#1541)
* MinimalDataParser add options, allow Nerfstudio data format to specify test indices

* Switch from indices to filenames and add tests
2023-03-09 19:14:24 +01:00
Matt Tancik 978bf1d12d Merge remote-tracking branch 'origin' into generative 2023-02-27 18:35:50 -08:00
Paul Wais 5c73766653 SFM: sfm-based depth, some breadcrumbs for pycolmap (#1457)
* save

* save

* more cleanup

* save

* save

* update phototourism

* save

* works

* works

* cleanup

* cleanup

* lint

* python3 default

* cleanup
2023-02-25 21:10:53 -08:00
Fernando Rivas-ManzanequeandMatthew Tancik 9053643932 Volinga model and NVOL documentation (#1486)
* added volinga model to NeRFStudio

* Removed unused dependencies

* Modified dockerfile to match main

* Corrected typo in core_code_checks.yml

* Corrected typo in core_code_checks.yml

* updated test with Volinga

* Added conversion to NVOL documentation

* [WIP] Refactor documentation and removing Volinga config

* Volinga use existing NerfactoModelConfig

* Added Unreal Engine documentation to extensions

* removed unused field class import

* Updated docs

* Documentation ready

* Update Dockerfile

---------

Co-authored-by: Matthew Tancik <tancik@berkeley.edu>
2023-02-25 14:49:53 -08:00
Jonáš Kulhánek 079f419e54 Fixes bug introduced in #1499 preventing load_from_checkpoint to work correctly (#1501)
* Call load_state_dict on model classes

* Fixing bug introduced in #1499
2023-02-25 08:06:08 -08:00
Jonáš Kulhánek 93359b131e Call load_state_dict on model classes (#1499) 2023-02-25 08:00:04 +01:00
Matt Tancik 36be1fe4b0 Merge remote-tracking branch 'origin' into generative 2023-02-20 09:48:41 -08:00
Sacha Lewin 8e4ae6bebf Allow use of black or white background in Nerfacto models (#1441)
* Allow black/white background color in Nerfacto

* Use white background in Nerfacto Blender Benchmark

* Fixed unused import

* Updated index for license headers script
2023-02-17 20:39:10 -08:00
terrance eee05195c0 merging from main 2023-02-08 20:27:02 +00:00
Jonáš Kulhánek 59f71eda0e Allow methods configs to be discovered from external packages. (#1357)
* Allow method_config to be registered from external packages

* Add license

* Add MethodSpecification class + fix linter errors

---------
2023-02-06 13:25:33 -08:00
Matt Tancik ae8a2f23c1 Merge remote-tracking branch 'origin/main' into generative 2023-02-01 14:40:15 -08:00
LSongandmachenmusik e73692e599 nerfplayer with ngp and nerfacto (#1277)
* nerfplayer with ngp and nerfacto

* update comments

* update cpp extension build

* avoid Windows repeated CUDA compile

---------

Co-authored-by: machenmusik <machenmusik@users.noreply.github.com>
2023-01-31 11:56:28 -08:00
terrance 3611381d8d merging 2023-01-23 15:44:09 +00:00
2120bd5dd9 CropBox GUI implementation (#1205)
* fixed an exception bug in case of num_samples is 0

fixed an exception bug when num samples is 0 , 
"IndexError tensors used as indices must be long, byte or bool tensors"

change type to long ( was float32)

* implemented crop box in gui. For now works on instant-ngp-bounded

* fixed import bugs

* update aabb every time and not only on training

* prevent crash when chosing accomulation and crop box

* Checkbox

* max_box is bounded by scevne box in the gui

* implemented altenative intesection to nerfacc

* convert str to bool correctly

* fixed isort bug

* fixed isort bug2

* update viewer version

* remove json bug

* Update UI

* Force black background

* Fix formatting

Co-authored-by: dror <you@example.com>
Co-authored-by: Matt Tancik <tancik@berkeley.edu>
Co-authored-by: Matthew Tancik <mattt4001@gmail.com>
2023-01-19 17:39:37 -08:00
LSong b170e175ed NeRFPlayer sliding window implementation (#1255)
* NeRFPlayer sliding window implementation

* add comments
2023-01-18 18:57:55 -08:00
terrance 68e8d3e9ce merging 2023-01-16 18:43:59 +00:00
86d8118b6d fix notebook, box drawing (#1202)
* fix notebook

* samples

* run all cells

* box center

* try saving again

* import order

* cube with different sides

* black

* black

* update metadata

* fix test

Co-authored-by: Katrin Schmid <kabischmid@gmail.com>
Co-authored-by: Matt Tancik <tancik@berkeley.edu>
2023-01-06 20:22:55 -08:00
Michal Pandy 3da877050d Depth supervision for Nerfacto (#1173)
* Implement depth supervision

* Fixes

* Change normalize dtype

* refactor

* Change depth weight

* Small refactor

* Change docstring

* Removu unused import

* Add assumption to depth comment

* Implement URF loss

* Remove default depth loss type param

* URF fixes

* Fix depth loss scale

* Visualize gt depths

* Fixes & documentation

* Documentation and formatting

* Fix formatting problems

* Fix linter problems

* Fix tests

* Fix tests
2023-01-02 10:13:38 +01:00
jake-austin 22340b37f3 Updating dreamfusion to use custom trainer, fixed bug, multi-gpu support (put diffusion on one specific device), merged with main 2022-12-28 07:06:15 +00:00
Jake Austin 3ffee522e0 TrainerConfig inherit from InstantiateConfig (#1175)
Making TrainerConfig an InstantiateConfig so it can be swapped in and out with different methods. Also made the TrainerConfig a subclass of ExperimentConfig (which was changed from a printableconfig to an instantiateconfig), since we were already instantiating the Trainer class with the ExperimentConfig

Removed the "config" field from the TrainerCallbackAttributes struct to eliminate circular dependencies when types are checked.

Minor scripts and docs changes to accommodate the update to the config struct, meaning the flags that were associated with the TrainerConfig were moved up to the top level of the config.
2022-12-27 18:19:34 -10:00