Config restructure (#283)

* starting docs for pipelines

* working on an example

* clearing output

* starting to implement config changes and add documentation

* wip: removed cicular imports; porting basic config into python; todo: get python setups workin

* circular imports again

* wip: pausing at dataloader sort of working

* break for today

* running vanilla

* wip need to get all the config docs working

* laptop about to die

* instant ngp working

* added all configs for all methods; not tested yet: [mipnerf360, nerfw, semantic_nerf]

* unpacking later

* done with pylinting

* mostly done. just need to do docs and one test

* added import order to docs

* fixing near/far plane and other config things

* making loggers also instantiable via configs

* docs

* lint

* making --help work with dcargs

* moving configs back into flat

* convert list to tuples; fixed post init function with mutable params

* lint

* made run_eval and benchmarking scripts compatible with new config/dcargs

* lint

* added option to load configs from presaved config

Co-authored-by: evonneng <evonne_ng@berkeley.edu>
This commit is contained in:
Ethan Weberandevonneng authored and GitHub committed 2022-08-26 17:25:10 -07:00
1 parent e0856e3afc
commit 7e9a56fac4
46 files changed
+987 -916

No files matched your search

+3 -5
View File
@@ -59,11 +59,9 @@ for dataset in ${DATASETS[@]}; do
export CUDA_VISIBLE_DEVICES=${GPU_IDX[$idx]}
base_config_name=${config_name/"graph_"/""}
checkpoint_dir="${output_dir}/blender_${dataset}_${month}-${date}-${year}/${base_config_name}/${year}-${month}-${date}_${seconds}/nerfactory_models/"
python scripts/run_eval.py --config-name ${config_name} \
--checkpoint-dir ${checkpoint_dir} \
--rendered-output-name rgb \
--output-filename ${output_dir}/${base_config_name}/blender_${dataset}_${month}-${date}-${year}_${seconds}.json \
--config-overrides pipeline.dataloader.train_dataset.data_directory=data/blender/${dataset} &
python scripts/run_eval.py ${config_name} \
--eval.checkpoint-dir=${checkpoint_dir} \
--eval.output-filename=${output_dir}/${base_config_name}/blender_${dataset}_${month}-${date}-${year}_${seconds}.json &
echo "Launched ${checkpoint_dir} on gpu ${GPU_IDX[$idx]}"
# update gpu
+9 -10
View File
@@ -3,7 +3,7 @@
helpFunction_launch_train()
{
echo "Usage: $0 -c config_name -g gpu_list"
echo -e "\t-c name of config to benchmark (e.g. graph_mipnerf, graph_instant_ngp)"
echo -e "\t-c name of config to benchmark (e.g. mipnerf, instant_ngp)"
echo -e "\t-g list of space-separated gpu numbers to launch train on (e.g. 0 2 4 5)"
exit 1 # Exit program after printing help
}
@@ -53,15 +53,14 @@ len=${#GPU_IDX[@]}
for dataset in ${DATASETS[@]}; do
export CUDA_VISIBLE_DEVICES=${GPU_IDX[$idx]}
python scripts/run_train.py \
--config-name ${config_name} \
'~logging.writer.LocalWriter' \
pipeline.dataloader.train_dataset.data_directory=data/blender/${dataset} \
experiment_name=blender_${dataset}_${tag} \
trainer.model_dir=nerfactory_models/ \
trainer.steps_per_save=25000 \
trainer.max_num_iterations=2000000 \
viewer.enable=False \
logging.enable_profiler=False &
${config_name} \
--logging.writer.2.no-enable \
--pipeline.dataloader.train-dataset.data-directory=data/blender/${dataset} \
--experiment-name=blender_${dataset}_${tag} \
--trainer.model-dir=nerfactory_models/ \
--trainer.steps-per-save=16000 \
--trainer.max-num-iterations=16500 \
--logging.no-enable-profiler &
echo "Launched ${config_name} ${dataset} on gpu ${GPU_IDX[$idx]}, ${tag}"
# update gpu