Commit Graph
1648 Commits
Author SHA1 Message Date
maturk f2971b504e camera opt in tensorf 2023-07-22 11:30:19 +03:00
maturk aa7fd51462 update method configs 2023-07-22 11:29:50 +03:00
maturk 4ddbee9b08 type ignore 2023-07-20 18:23:46 +03:00
maturk e0c245156a type checker fixes 2023-07-20 18:11:31 +03:00
maturk dff0d32f20 ruff format, license, + docstrings 2023-07-20 17:53:28 +03:00
maturk 3e059a4394 refactor to use camera opt getters 2023-07-20 14:46:29 +03:00
maturk 6ebdab9814 add getters for param groups, metrics dict, and correction matrices 2023-07-20 14:45:49 +03:00
maturk 2e338a23c6 refactor + docstrings + eval dataset in main python process 2023-07-10 10:03:32 +03:00
maturk 37e763f2de optional pose noise in datamanager 2023-06-30 14:09:57 +03:00
maturk 4c3db790a4 barf 2023-06-30 14:08:05 +03:00
maturk d1350e1ecf max num threads as config parameter 2023-06-27 14:23:03 +03:00
maturk 5f85ef181d data queue as config parameter 2023-06-27 13:55:40 +03:00
Matias TurkulainenandPaul Wais 7121bc8c47 docstring
Co-authored-by: Paul Wais <paulwais@gmail.com>
2023-06-27 10:07:19 +03:00
maturk 10fc5f3657 explicitly catch full queue, notify of other exceptions 2023-06-26 15:21:13 +03:00
Justin 3f73e78bfd oops 2023-06-21 22:26:27 +00:00
Justin 1d8cef26f7 clean 2023-06-21 22:25:01 +00:00
Justin a73d892f21 params 2023-06-21 21:02:07 +00:00
Justin 09e9a71d3d minor speedup 2023-06-21 20:46:20 +00:00
Justin 75d1013d60 merge 2023-06-21 18:51:02 +00:00
Justin e26bd4d525 initial impl of parallel data manager 2023-06-21 18:50:22 +00:00
maturk f6b6ed8ca8 ensure that non_trainable_indices are on the correct device during training 2023-06-21 17:47:52 +03:00
Justin 807837a1dc merge main 2023-06-20 06:17:15 +00:00
Justin caf50a751a Merge branch 'main' of https://github.com/nerfstudio-project/nerfstudio 2023-06-20 05:46:06 +00:00
Justin 767dc100d1 param 2023-06-20 05:45:58 +00:00
Matias TurkulainenandMatthew Tancik e0e66ce9fb Add non-trainable camera indices to CameraOptimizer (#2080)
* add non-trainable indices to camera optimizer

* improve comment

* create on device

---------

Co-authored-by: Matthew Tancik <tancik@berkeley.edu>
2023-06-18 12:55:13 -04:00
ksnzhandZhang Jian c55f5d36b9 add gradient accumulation support (#2049)
* add gradient accumulation support

* fix 2 blank lines

* fix possibly unbound variable

* update gradient accumulation step with for loop

* add seert and ignore pyright check

---------

Co-authored-by: Zhang Jian <zhangjian49@lenovo.com>
2023-06-18 07:17:35 -07:00
Justin b9feec2a0e param 2023-06-18 07:05:13 +00:00
b17268e83b [WIP] dreamfusion implementation (#1008)
* starting the framework for dreamfusion

* Removed view direction from RGB to calculate albedo

* Started diffusion

* Added dreamfusion to CLI, removed direction embeddings

* Normals in dreamfusion

* Lambertian shading added

* Train normals in Dreamfusion

* Stable diffusion from Stable Dreamfusion

* Fix normal orientation loss

* Configurable light direction sampling

* adding density initalization at origin

* V1 datamanager

* Don't train normals for first 1k iters

* SDS loss added to dreamfusion

* Dreamfusion pipeline

* Background MLP and SphereCollider

* Normals prediction training fixed

* Sigmoid on background, prompt in config

* Shading hyperparameter adjustements

* Shading hyperparameter tuning

* Location based prompting, density initialization fades, LR change

* Cleaned imports, more config options

* Tuning, more config changes

* remove unused sampler, normalize predicted normals from network

* change position encoding to direction encoding for background color mlp

* Updating dreamfusion to use custom trainer, fixed bug, multi-gpu support (put diffusion on one specific device), merged with main

* Hard coding less, offloading to config

* Appeasing the linter

* First pass opacity / sparsity losses

* Small patches and configs

* Accidentally pushed logs

* Removing logs for real this time

* Transmittance loss bug fix

* 12 GB Dreamfusion!

* Lint

* Remove unecissary collider changes

* Start SD cleanup

* Cleanup SD code

* adding overhead location prompting

* Use lambertian renderer

* turn grad accum off by default, decrease background mlp size, add overhead text embedding

* Cleanup

* Fix normals vis

* change uniform sampler to prediction network, add option to jit unet for faster sds_loss

* Use shaders

* cleaning up jit code

* add warning if using non jit unet

* add proposal network optimizer to config

* speed up render and cleanup code

* Clean up datamanager

* Add distortion loss

* fix wanb

* adding interpolated location sampling

* Update configs

* interpolated location prompting option, lowering init density, transmittance loss interpolation flipped

* rename alphas mult to alphas loss mult

* Mess around with normals

* add option to use random bg color + bg mlp

* Remove Dreamfusion Trainer (#1423)

* Dreamfusion trainer no longer needed

* Added typing for grad scaler

* SDS return loss

* Fix CFG

* Cleanup

* Update configs

* Fix opacity loss, use unform sampling first round of prop

* add prompt edditing to viewer

* Choose your own diffusion

* remove dreamfusion pipeline file

* merging + remove dreamfusion pipeline file

* Update configs

* add stable diff utils

* cleanup

* cleanup

* Fix test

* positional prompting bugfix

* Warmups

* tune

* lint

* Remove dataparser

* merging + text embedding bugfix

* Set data path to launch viewer for DreamFusion (#1776)

* Set data path to launch viewer for DreamFusion

* Apply formatter

* Fallback to 'base_dir' if data manager has no path

* Make if statement non-inline

* Reformat

---------

Co-authored-by: Matthew Tancik <mattt4001@gmail.com>

* add deepfloyd option first try

* merging

* merging from main

* merging

* removing comments, cleaning code, making stable diff utils usable for deepfloyd, remove deepfloyd text encoder after use

* undo chagnes in data folder

* cleaning code, removing unneccesary changes from main, removed normals prediction network

* remove old scripts files, rename generative pipeline flag to no_input_data, revert to default histogram padding in proposal sampler

* changing pipeline flag

* move no input data flag from pipeline to datamanager

* undo config and merge in deepfloyd from main

* merging grad scaler pipeline addition

* merging + setting proposal net scheduler

* revert nerfacto config change

* typing + linting

* rename dreamfusion datamanager to random camras datamanager, check datamanager typing in pipeline and trainer

* fix test import

* fix test import

* changing datamanager check in trainer, add typing in random cameras datamanager

* add Tensor to randomcamerasdatamanager

* remove old comments

* resolve tyro warning

* update fields to use tcnn

* lint

* add packages for deepfloyd

* add versions

* docs first draft

* rename to generfacto, clean docs

* fix import error

* minor changes

* fix orientation loss bug, retune params

* cleanup

* typing

* trying docs fix

* fixing generative package imports

* fix pyright

* docs fix

* merge w main

* docs minor change

* tuning + bugfixes

* remove torch.backends

---------

Co-authored-by: Abhik Ahuja <ahujaabhik@berkeley.edu>
Co-authored-by: David McAllister <davidrmc2@gmail.com>
Co-authored-by: Jake Austin <jake-austin@berkeley.edu>
Co-authored-by: Matthew Tancik <tancik@berkeley.edu>
Co-authored-by: Matt Tancik <mattt4001@gmail.com>
Co-authored-by: SeungWoo Yoo <dreamy1534@gmail.com>
Co-authored-by: ayaanzhaque <ayaanzhaque@gmail.com>
Co-authored-by: Ayaan Haque <ayaanzhaque@berkeley.edu>
2023-06-17 23:34:04 -07:00
Justin 75153f6679 update viewer beta vis 2023-06-18 06:32:40 +00:00
Justin 2fb9cd7cb9 Merge branch 'justin/camera_clicking_beta' into justin/camera_opt_refactor 2023-06-18 06:09:52 +00:00
Justin be47ffca81 add l2 penalties on optimizers 2023-06-18 06:09:46 +00:00
Justin ae5ef15bed rip out camera optimization from datamanager and move to nerfacto.py 2023-06-18 05:43:31 +00:00
Justin 1182b18b48 Merge branch 'main' of https://github.com/nerfstudio-project/nerfstudio 2023-06-18 05:06:40 +00:00
Justin 0a9eb8a7c9 cleanup 2023-06-18 05:01:07 +00:00
Justin cb66e3149f fix fov calculation, update camera positions while training 2023-06-18 04:58:49 +00:00
Justin Kerr e4a5c38b28 Fix resolution rendering logic in statemachine for viewer beta (#2085)
* fix render statemachine logic for viewer beta
2023-06-17 21:15:33 -07:00
machenmusik 1066f8f433 don't force downscale factor to 1 for nerfacto-huge (#2088)
* per @kerrj, nerfacto-huge doesn't need downscale_factor=1
2023-06-16 23:49:56 -07:00
Matthew Tancik 7859f19f50 Fix data downscale paths (#2071)
* Fix data downscale paths

* ruff

* format

* Update process_data_utils.py
2023-06-16 11:40:12 -07:00
Justin efd18266f7 clicking on cameras in the viewer 2023-06-16 06:05:38 +00:00
Justin 9db97773b9 fix render statemachine logic for viewer beta 2023-06-16 05:03:06 +00:00
Justin d67e176afc Merge branch 'main' of https://github.com/nerfstudio-project/nerfstudio 2023-06-16 03:52:43 +00:00
Justin Kerr f9d06d1f9c reduce nerfacto-huge memory (#2082)
reduce memory to 24G by reducing appearance embed dim
2023-06-15 16:33:30 -07:00
Justin 46971227ee Merge branch 'main' of https://github.com/nerfstudio-project/nerfstudio 2023-06-15 18:06:09 +00:00
Justin Kerr 8fad92c39a nerfacto-huge (#2003)
An even larger version of nerfacto with scaled hashgrid resolution, MLP sizes, batch sizes, appearance embeddings, proposal sampler resolution, and more.
Also includes some minor tweaks to nerfacto-big configs
2023-06-15 11:05:53 -07:00
Matthew Tancik 26fc1c95dc Update data_utils doc (#2076) 2023-06-14 17:57:33 -07:00
LSong 10dab142d0 Move out NeRFPlayer: clean files and add method link (#2072)
* clean files and add method link

* fix black

* update
2023-06-14 13:51:09 -07:00
Frédéric DevernayandFrédéric Devernay d18588d5d4 colormaps: add "gray" (#2058)
* colormaps: remove useless "pca" choice, add "gray"

- The "pca" choice didn't work when applied to a single-channel image (it crashed the viewer), and it's applied by default to any image of more than 3 channels, where the colormap choice is ignore anyway.
- Add the trivial "gray" colormap, useful to eg extract accumulation.

* colormaps.py: re-add "pca"

* control_panel: don't show the "pca" option either

---------

Co-authored-by: Frédéric Devernay <f-dy@users.noreply.github.com>
2023-06-11 18:41:23 -07:00
Justin c06e2b5070 Merge branch 'main' of https://github.com/nerfstudio-project/nerfstudio 2023-06-11 23:52:44 +00:00
Weihang Li f2fdd10d9b fix for scannet dataset camera pose loading (#2056)
* fix scannet dataparser pose issue

* camera pose corrected
2023-06-10 09:07:57 -07:00
Frédéric DevernayandFrédéric Devernay e2e5637d05 nerfstudio dataparser: avoid loading images at inference time (#2051)
Also remove the image skipping logic, which seems to be a remnant of some old code (all images should exist)

Co-authored-by: Frédéric Devernay <f-dy@users.noreply.github.com>
2023-06-09 21:29:32 -04:00