From 59181cfa08075ee9d9d1d88cc968f8616b68623f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= <tmueller@nvidia.com> Date: Mon, 18 Jul 2022 11:52:44 +0200 Subject: [PATCH] Alphabetic include ordering --- include/neural-graphics-primitives/marching_cubes.h | 2 ++ src/marching_cubes.cu | 4 ++-- src/nerf_loader.cu | 2 +- src/render_buffer.cu | 2 +- src/testbed.cu | 4 ++-- src/testbed_image.cu | 6 +++--- src/testbed_nerf.cu | 7 ++++--- src/testbed_sdf.cu | 2 +- src/testbed_volume.cu | 4 ++-- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/include/neural-graphics-primitives/marching_cubes.h b/include/neural-graphics-primitives/marching_cubes.h index 2a0ebfe..6f36b7d 100644 --- a/include/neural-graphics-primitives/marching_cubes.h +++ b/include/neural-graphics-primitives/marching_cubes.h @@ -14,6 +14,8 @@ #pragma once +#include <neural-graphics-primitives/bounding_box.cuh> + #include <tiny-cuda-nn/common.h> NGP_NAMESPACE_BEGIN diff --git a/src/marching_cubes.cu b/src/marching_cubes.cu index c4363ee..bf68b1e 100644 --- a/src/marching_cubes.cu +++ b/src/marching_cubes.cu @@ -12,9 +12,9 @@ * @author Alex Evans, NVIDIA */ -#include <neural-graphics-primitives/common.h> -#include <neural-graphics-primitives/common_device.cuh> #include <neural-graphics-primitives/bounding_box.cuh> +#include <neural-graphics-primitives/common_device.cuh> +#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/random_val.cuh> // helpers to generate random values, directions #include <neural-graphics-primitives/thread_pool.h> diff --git a/src/nerf_loader.cu b/src/nerf_loader.cu index a6d4bcb..eb44b01 100644 --- a/src/nerf_loader.cu +++ b/src/nerf_loader.cu @@ -13,8 +13,8 @@ * @brief Loads a NeRF data set from NeRF's original format */ -#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/common_device.cuh> +#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/nerf_loader.h> #include <neural-graphics-primitives/thread_pool.h> #include <neural-graphics-primitives/tinyexr_wrapper.h> diff --git a/src/render_buffer.cu b/src/render_buffer.cu index ae619fc..c107ed1 100644 --- a/src/render_buffer.cu +++ b/src/render_buffer.cu @@ -12,9 +12,9 @@ * @author Thomas Müller & Alex Evans, NVIDIA */ +#include <neural-graphics-primitives/common_device.cuh> #include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/render_buffer.h> -#include <neural-graphics-primitives/common_device.cuh> #include <neural-graphics-primitives/tinyexr_wrapper.h> #include <tiny-cuda-nn/gpu_memory.h> diff --git a/src/testbed.cu b/src/testbed.cu index 271a166..7b0e2ee 100644 --- a/src/testbed.cu +++ b/src/testbed.cu @@ -12,8 +12,8 @@ * @author Thomas Müller & Alex Evans, NVIDIA */ -#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/common_device.cuh> +#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/json_binding.h> #include <neural-graphics-primitives/marching_cubes.h> #include <neural-graphics-primitives/nerf_loader.h> @@ -28,8 +28,8 @@ #include <tiny-cuda-nn/encodings/grid.h> #include <tiny-cuda-nn/loss.h> -#include <tiny-cuda-nn/network.h> #include <tiny-cuda-nn/network_with_input_encoding.h> +#include <tiny-cuda-nn/network.h> #include <tiny-cuda-nn/optimizer.h> #include <tiny-cuda-nn/trainer.h> diff --git a/src/testbed_image.cu b/src/testbed_image.cu index e749b98..561cda5 100644 --- a/src/testbed_image.cu +++ b/src/testbed_image.cu @@ -12,15 +12,15 @@ * @author Thomas Müller & Alex Evans, NVIDIA */ -#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/common_device.cuh> -#include <neural-graphics-primitives/render_buffer.h> +#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/random_val.cuh> +#include <neural-graphics-primitives/render_buffer.h> #include <neural-graphics-primitives/testbed.h> #include <tiny-cuda-nn/gpu_matrix.h> -#include <tiny-cuda-nn/network.h> #include <tiny-cuda-nn/network_with_input_encoding.h> +#include <tiny-cuda-nn/network.h> #include <tiny-cuda-nn/trainer.h> #include <fstream> diff --git a/src/testbed_nerf.cu b/src/testbed_nerf.cu index 222bfd8..d63bfcc 100644 --- a/src/testbed_nerf.cu +++ b/src/testbed_nerf.cu @@ -13,20 +13,21 @@ */ #include <neural-graphics-primitives/adam_optimizer.h> -#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/common_device.cuh> +#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/envmap.cuh> +#include <neural-graphics-primitives/marching_cubes.h> #include <neural-graphics-primitives/nerf_loader.h> #include <neural-graphics-primitives/nerf_network.h> -#include <neural-graphics-primitives/marching_cubes.h> #include <neural-graphics-primitives/render_buffer.h> #include <neural-graphics-primitives/testbed.h> #include <neural-graphics-primitives/trainable_buffer.cuh> +#include <neural-graphics-primitives/triangle_octree.cuh> #include <tiny-cuda-nn/encodings/grid.h> #include <tiny-cuda-nn/loss.h> -#include <tiny-cuda-nn/network.h> #include <tiny-cuda-nn/network_with_input_encoding.h> +#include <tiny-cuda-nn/network.h> #include <tiny-cuda-nn/optimizer.h> #include <tiny-cuda-nn/trainer.h> diff --git a/src/testbed_sdf.cu b/src/testbed_sdf.cu index 1b68f9a..fc20e8f 100644 --- a/src/testbed_sdf.cu +++ b/src/testbed_sdf.cu @@ -12,8 +12,8 @@ * @author Thomas Müller & Alex Evans, NVIDIA */ -#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/common_device.cuh> +#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/discrete_distribution.h> #include <neural-graphics-primitives/envmap.cuh> #include <neural-graphics-primitives/random_val.cuh> // helpers to generate random values, directions diff --git a/src/testbed_volume.cu b/src/testbed_volume.cu index a7d3205..cea6c9e 100644 --- a/src/testbed_volume.cu +++ b/src/testbed_volume.cu @@ -12,8 +12,8 @@ * @author Thomas Müller & Alex Evans, NVIDIA */ -#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/common_device.cuh> +#include <neural-graphics-primitives/common.h> #include <neural-graphics-primitives/random_val.cuh> // helpers to generate random values, directions #include <neural-graphics-primitives/render_buffer.h> #include <neural-graphics-primitives/testbed.h> @@ -21,8 +21,8 @@ #include <tiny-cuda-nn/common_device.h> #include <tiny-cuda-nn/gpu_matrix.h> -#include <tiny-cuda-nn/network.h> #include <tiny-cuda-nn/network_with_input_encoding.h> +#include <tiny-cuda-nn/network.h> #include <tiny-cuda-nn/trainer.h> #include <nanovdb/NanoVDB.h> -- GitLab