Commit Graph
249 Commits
Author SHA1 Message Date
terrance eee05195c0 merging from main 2023-02-08 20:27:02 +00:00
NCJ 92cadf5ce4 Fix Multiple Typos (#1376)
fix multiple typos
2023-02-08 10:33:23 -08:00
Jonáš KulhánekandMatthew Tancik 2ff1d3b19e Improve ns-process-data images when using existing COLMAP model (#1371)
* Allow skipping copy+downscale of images in ns-process-data, fix bug when using --skip-colmap on images.bin with non-standard image names

* Rename flags and improve error messages

---------

Co-authored-by: Matthew Tancik <tancik@berkeley.edu>
2023-02-07 13:08:14 -08:00
Matthew Tancik e749fbcf78 Trace Stable Diffusion (#1362)
* Trace Stable Diffusion

* pylint

Co-authored by Terrance Wang
2023-02-06 18:33:59 -08:00
Matt Tancik 051771db07 Merge remote-tracking branch 'origin' into generative 2023-02-06 12:30:20 -08:00
machenmusik fad5a839aa double-quote filenames in process-data commands so that on Windows, paths with spaces don't fail (#1347)
* double-quote filenames in commands so that on Windows, paths with spaces don't fail

* reformatting by black
2023-02-03 21:01:37 -05:00
terrance 3c71429d30 cleaning up jit code 2023-02-03 22:28:03 +00:00
terrance 8ba8942779 change uniform sampler to prediction network, add option to jit unet for faster sds_loss 2023-02-03 01:42:05 +00:00
Matthew Tancik ef9e00e614 Check if curl is installed (#1337)
* check if curl is installed

* lint
2023-02-02 10:11:41 -08:00
MaroonAmor 91d61162b7 Corrected the order of texture arguments (#1300)
corrected the order of texture arguments
2023-01-29 09:22:10 -08:00
Matthew Tancik b5031dd814 Enable rendering with crop (#1295) 2023-01-26 14:22:43 -08:00
cvachha 2e843eb2df Updated Blender add-on for calculating duration (#1288)
Updated Blender on calculating duration

Updated how the Blender add on calculates duration with frame steps and added the case when frame step size is 0.
2023-01-25 18:05:31 -08:00
ManuConcepBrito 828d6bc893 Depth data loading for Polycam LiDAR data (#1253)
* Add depth data loading for polycam datasets

* misc: missing arguments in process_data_utils.downscale_images

* Move processing to polycam_utils

* delete unused imports

* process_data_utils: patch for frame%05d issue

* accidentally deleted neighbor flag from ffmpeg

* wrong ffmpeg command

* upscale directly

* redundant comment

* remove unused imports

* black formatting
2023-01-24 14:45:13 -08:00
cvachha 9eb880aa91 Blender addon script and documentation (#1218)
* Blender addon script and documentation

First version of blender addon python script located in scripts/blender and new documentation for the addon. The Blender addon is for importing or exporting a camera path for visual effects and compositing.

* Updated formatting of Blender script

Updated the formatting based on the script tests for the blender addon script.

* Updated Blender addon to fix FOV and alignment

Updated how FOV is calculated for both blender cam to json and json to blender cam. The FOV is calculated based on the aspect ratio, angle of view, and sensor fit and size.

* Updated Blender addon documentation with examples

Updated the Blender add-on documentation with a few example gif composite animations

* Updated Blender addon to match frame rate and fixed formatting

Updated the Blender add-on script and docs to match the Blender frame rate. Also the formatting should be fixed. There are also now error message popups instead of console prints for invalid input in the add-on.

* Updated the blender addon for formatting

Updated pylint formatting and comments
2023-01-19 22:31:07 -08:00
Matthew Tancik af41819611 Add support for RealityCapture (#1055)
* Add support for RealityCapture

* Fix coordinate bug

* Remove transform

* Update focal lengths

* isort
2023-01-19 20:50:02 -08:00
machenmusik f350650f1b create video writer later, to adapt to render image's width and height (fixes #1242) (#1245)
* create video writer later, to adapt to render image's width and height

* fix rendering with multiple output names
2023-01-17 09:40:26 -08:00
Matthew Tancik 5b50740f45 Add cropping options to data processing (#1236) 2023-01-16 15:34:20 -08:00
matsurenandMatthew Tancik 408ab709ec Fix typo (#1231)
* Fix typo COLAMP->COLMAP

* Fix more typo

Co-authored-by: Matthew Tancik <tancik@berkeley.edu>
2023-01-16 12:12:55 -08:00
Martin Piala a5eea5f14d Camera export (#1191)
* implement the camera exporter

* remove train_dataset from exporter

* fix linter errors

* add docstring

* correct comment

* fix linter errors

* make image_filenames a property of the dataset
2022-12-31 22:38:43 -07: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
Brent Yi 5495a8e146 Type and docs fixes (#1170) 2022-12-26 09:04:24 -07:00
Matthew Tancik 4a27e5e929 Fix downscaling and type errors (#1164) 2022-12-23 14:07:07 -07:00
machenmusikandMatthew Tancik 8d4a82ef0b work around mismatch to allow rgb depth side-by-side output (#1156)
* use max resolution when not moving or training

* work around mismatch to allow rgb depth side-by-side output

* Update render.py

Co-authored-by: Matthew Tancik <tancik@berkeley.edu>
2022-12-21 22:13:20 -05:00
machenmusik 0e1ea37308 when camera_type is equirectangular, add spherical metadata to rendered video (#1151)
* when camera_type is equirectangular, add spherical metadata to rendered video

* remove unnecessary CONSOLE.print

* refactor to make pylint happier

* get os.stat size properly; document camera_type argument

* write video on the fly to avoid holding all images in memory

Note: video render width and height were unspecified for spiral trajectory; this uses values for Nerfacto

* fix images output

* doc fix
2022-12-21 00:32:42 -05:00
Ethan Weber 3bf490e845 adding data subset (#1135)
* adding nerfstudio-dataset

* removed file
2022-12-15 17:29:41 -08:00
dozeri83anddror 96f269cc1a instant-ngp-bounded model (#1116)
* inerted a new model configuration instant-ngp-bounded

* added more remarks and small fixes

* went back to old near plane

* added the oprtion to get a file as well as directory in nerfstudio data parser

* pretify prev commit

* review fixes

* more clear explanation in README.md

* reverted readme changes

* fixed merge bug

* review changes. update config.data docs support for json files inputs

Co-authored-by: dror <you@example.com>
2022-12-13 13:05:48 -08:00
Nikhil Mohan 98f13cbed4 Fix circular imports (#1115)
* wip

* remove bad changes

* update dmeo

* cleanup

* change name

* cleanup
2022-12-13 10:09:31 -08:00
RandomPrototypesandRandomPrototypes 740cdebbb5 WIP : support for hloc toolbox (superpoint, superglue, netvlad,...) (#1026)
* basic support for hloc (includes netvlad, super point, superglue in colmap), just a first test, not ready yet

* add exhaustive match option for hloc

* add command line option to choose the type of feature, matcher,...

* make hloc an optional dependency, update doc, and small bug fixes

* fix missing imports

* fix warnings, pylint,...

* fix overwrite previous commits

* fix import order from isort

* move find_tool_feature_matcher_combination to process_data_utils, add type hints and Args/Returns doc

* error message when no valid combination of sfm tool, feature type, and matcher

Co-authored-by: RandomPrototypes <delmotte_ar@yahoo.fr>
2022-12-03 22:45:48 -08:00
Ethan Weber 3377c5344b [WIP] Mesh export UI (#1076)
* starting PR

* export mesh ui functional

* better descriptions
2022-12-02 17:51:21 -08:00
Ethan WeberandMatt Tancik 1052fccec2 Mesh export (#809)
* start of mesh PR

* point cloud export mvp

* start of mesh PR

* point cloud export mvp

* Save out mesh. Poor quality atm

* reorganized mesh algorithms and specified CLI

* CLI reorg

* tsdf algorithm in progress

* debugging

* tsdf functional but camera distortion params not in

* playing with distortion params

* TSDF works but texture looks bad

* added trimesh

* moved to exporter

* removed files

* saving progress

* save texture image

* seems to work w/o barycentric

* barycentric start

* gap between triangles

* blocking out diagonal

* new barcentric and scaling

* meshing working. need to remove extra rows

* fixed triangle packing

* gitignore changes

* removed package

* fix Literal import

* comments

* update .mtl file

* poisson mesh with model output normals & resolved some PR comments on git

* starting docs. breaking up big function. todo: add xatlas

* xatlas and nvdiffrast working

* triangle_id

* progress on expensive texture coordinates method

* pytorch meshing works

* removing nvdiffrast

* remove trimesh

* cleanup

* few changes

* pred normals by default and add minimum additions to viewer

* fix cli in viewer

* add xatlas as dependency

* make point cloud more dense

* reverted viewer changes

* turn off normals by default

* fix docs

* finished todos on github

* remove xatlas

* xatlas

* black

Co-authored-by: Matt Tancik <tancik@berkeley.edu>
2022-12-02 10:49:19 -08:00
Brent Yi c2ad46d60e More informative completion install error messages (#1068)
More informative completion install errors
2022-12-01 07:36:41 -08:00
Kevin Chen 87c3ead680 Add Support for Equirectangular Images (#966) 2022-11-28 21:29:02 -08:00
Matthew Tancik 666b43a577 Check is metashape xml is present (#1044) 2022-11-28 16:39:09 -08:00
Frédéric Devernay 8fc7950719 Fix benchmarking scripts (#1005)
* launch_eval_blender.sh: fix script

- add shebang
- add -s option to launch a single job per GPU
- last GPU was ignored
- kill all subprocesses when script is terminated

* launch_train_blender.sh: fix script

- add -s option to launch a single job per GPU
- add -v option to use tensorboard instead of wandb
- set nerfacto options according to https://github.com/nerfstudio-project/nerfstudio/issues/806#issuecomment-1284327844
- use a single timestamp for all training jobs
- last GPU was ignored
- kill all subprocesses when script is terminated
- print the eval script command-line

* launch_eval_blender.sh: fix script

* Update benchmarking.md

* launch_train_blender.sh: add -s to eval command-line

* Update launch_train_blender.sh

* Update benchmarking.md
2022-11-28 13:25:14 -08:00
cnsumnerandMatthew Tancik 3d70b4e614 Add support for insta360 single-file format (#1024)
* Add support for insta360 single-file format

* Improve some variable names

* Add documentation for crop_percentage parameter

Co-authored-by: Matthew Tancik <tancik@berkeley.edu>
2022-11-28 13:00:10 -08:00
Matthew Tancik 0a57c7c72b Ignore non-image files in ns-process-data (#1040)
* Ignore non-image files in ns-process-data

* Update reqs

* bump ipython
2022-11-28 10:38:37 -08:00
Alexander Kristoffersen aac7aa4786 Typo in ProcessRecord3D error (#1027)
small error fix.
2022-11-26 13:16:27 -08:00
Ethan Weber b23d76cc47 Cameras TensorDataclass and Phototourism (#961)
This branch gives us the flexibility to use Cameras as a tensordataclass, giving arbitrary batch dimensions, slicing, etc all for free. It tests this with the phototourism dataset.

Tensordataclass changes:
Originally, the tensordataclass would look at tensors in an object and take everything in front of the last dimension to be the batch dimensions, but in the case of the camera_to_world matrices, everything except for the last TWO are the important dimensions, so we needed to have a way for the tensordataclass to acknowledge these specific fields where there are multiple data dimensions behind the batch dimensions. This is important for things like reshaping where we need to know which dimensions get reshaped and which dimensions get left alone.

Cameras changes:
Now subclass of tensordataclass, which required a change to the tensordataclass itself.
The possibility of extra batch dimensions is the hairy part that requires the majority of these changes. The extra batch dimensions aren't a hassle in every function except in ray generation. The ray generation is where this operates different relative to the old cameras. The reason for this is before, for each ray we wanted to generate, we could specify a single index into our batch of cameras, but if you have multiple camera dimensions, for each ray, you need to now specify one index per camera batch dimension, meaning our camera_indices we specify need to have one extra dimension at the end, a dimension of size Cameras.ndim (number of batch dimensions in the camera object).
I also added some neat logic in generate_rays where if you want your output raybundle to be batched, if you specify batched camera_indices, you will receive the same batch size for the output raybundle, meaning you can easily generate raybundles corresponding to things like image patches and whatnot.

Phototourism changes:
The difficulty here is that images in the phototourism dataset are of different sizes, which is difficult because we can no longer batch the image tensors. We also need to better utilize caching in the CacheDataloader since the vanilladatamanager defaults don't really use it as well as they could, and without properly utilizing it, the rays / sec are maybe 25% of the standard nerfstudio dataset speeds (which are 10% of the size of the phototourism datasets). To do this, we specify a collate function in the existing datamanager configs, and we make a subclass of the vanilladatamanagerconfig named VariableResDataManagerConfig which will have a custom collate function storing the images in a list, and using better defaults for caching in the dataloader, caching ~40 images at a time. The slowest part of using a list is pixel sampling, where we added a custom if case for if our pixel sampler receives a batch of images that are in a list, and the lack of ability to vectorize operations over a list means that caching in the dataloader is even more important.
2022-11-25 22:16:11 -08:00
Jake Austin 1eae0839b4 Updating the script for downloading data (#968)
* Updating the script for downloading data

* Making update to config structure

* Updating documentation and colab

* Adding back the save directory

* Pushing an all flag for nerfstudio

* forgot to save some previous edits
2022-11-25 21:40:13 -08:00
Matthew Tancik 2c64ba5b6a Handle missing metashape data (#1015)
* Handle missing metashape data

* lint
2022-11-23 16:21:36 -08:00
Zak Murezandzmurez 0264aacbe1 create rays on device when rendering (#993)
Co-authored-by: zmurez <zmurez@eng.ucsd.edu>
2022-11-22 11:07:36 -08:00
Matthew Tancik 4065bb4733 Add Metashape support (#989)
Add metashape support
2022-11-20 14:55:41 -08:00
Matthew Tancik 532f8067fd Refactor process data (#976) 2022-11-18 09:19:44 -08:00
Matthew Tancik 95a27ecba5 Add support for polycam (#958)
* Add support for polycam

* Modify blur score

* Support processing zip and add undistort fallback

* Created using Colaboratory

* Update docs

* Update demo.ipynb

* Address comments

* fix lint
2022-11-15 17:55:29 -08:00
Nikhil Mohan b5c34f0154 Add 'inference' mode to pipeline (#956)
* cleanup test mode

* cleanup eval loading

* change default

* cleanup

* cleanup

* comment
2022-11-14 16:56:36 +00:00
Matthew Tancik 5b0f1ffacb Remove unimplemented interp render option (#953) 2022-11-12 17:18:11 -08:00
Zak Murezandzmurez 6ea7dbf934 NuScenes dataparser (#939)
* nuscenes dataparser

* cleanup

* style

* cleanup

* cleanup

* cleanup

Co-authored-by: zmurez <zmurez@eng.ucsd.edu>
2022-11-11 18:40:36 -08:00
Matthew Tancik d4119d4086 Add exporting docs (#940) 2022-11-10 22:01:21 -08:00
Matthew Tancik ee6b007155 Avoid boolean flag auto conversion (#929) 2022-11-09 20:23:05 -08:00
Matthew Tancik 8d3640c6a1 Support exporting point clouds (#924)
* Support exporting point clouds

* Fix typing

* lint

* Update requirements
2022-11-08 22:23:06 -08:00