Merge pull request #1399 from NVlabs/replace-glm

Replace GLM with tcnn's vector math, bugfixes and extra bindings

.gitmodules

@@ -28,6 +28,3 @@
 [submodule "dependencies/OpenXR-SDK"]
 	path = dependencies/OpenXR-SDK
 	url = https://github.com/KhronosGroup/OpenXR-SDK.git
-[submodule "dependencies/glm"]
-	path = dependencies/glm
-	url = https://github.com/g-truc/glm

CMakeLists.txt

@@ -54,7 +54,6 @@ if (MSVC)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP24")
 else()
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fms-extensions")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 endif()
 
@@ -76,7 +75,6 @@ if (MSVC)
 else()
 	list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=-Wno-float-conversion")
 	list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=-fno-strict-aliasing")
-	list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=-fms-extensions")
 	list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=-fPIC")
 endif()
 list(APPEND CUDA_NVCC_FLAGS "--extended-lambda")
@@ -203,7 +201,6 @@ endif(NGP_BUILD_WITH_GUI)
 list(APPEND NGP_INCLUDE_DIRECTORIES
 	"dependencies"
 	"dependencies/filesystem"
-	"dependencies/glm"
 	"dependencies/nanovdb"
 	"dependencies/NaturalSort"
 	"dependencies/tinylogger"
@@ -261,8 +258,7 @@ endif()
 list(APPEND NGP_SOURCES
 	${GUI_SOURCES}
 	src/camera_path.cu
-	src/common.cu
-	src/common_device.cu
+	src/common_host.cu
 	src/marching_cubes.cu
 	src/nerf_loader.cu
 	src/render_buffer.cu
@@ -273,7 +269,7 @@ list(APPEND NGP_SOURCES
 	src/testbed_volume.cu
 	src/thread_pool.cpp
 	src/tinyexr_wrapper.cu
-	src/tinyobj_loader_wrapper.cpp
+	src/tinyobj_loader_wrapper.cu
 	src/triangle_bvh.cu
 )
 
@@ -284,6 +280,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
 
 get_filename_component(CUDA_COMPILER_BIN "${CMAKE_CUDA_COMPILER}" DIRECTORY)
+get_filename_component(CUDA_DIR "${CUDA_COMPILER_BIN}" DIRECTORY)
+set(CUDA_INCLUDE "${CUDA_DIR}/include")
 
 if (NGP_OPTIX)
 	add_library(optix_program OBJECT

include/neural-graphics-primitives/adam_optimizer.h

@@ -20,7 +20,7 @@
 
 #include <json/json.hpp>
 
-NGP_NAMESPACE_BEGIN
+namespace ngp {
 
 class VarAdamOptimizer {
 public:
@@ -241,7 +241,7 @@ class RotationAdamOptimizer {
 		float actual_learning_rate = m_hparams.learning_rate * std::sqrt(1 - std::pow(m_hparams.beta2, m_state.iter)) / (1 - std::pow(m_hparams.beta1, m_state.iter));
 		m_state.first_moment = m_hparams.beta1 * m_state.first_moment + (1 - m_hparams.beta1) * gradient;
 		m_state.second_moment = m_hparams.beta2 * m_state.second_moment + (1 - m_hparams.beta2) * gradient * gradient;
-		vec3 rot = actual_learning_rate * m_state.first_moment / (sqrt(m_state.second_moment) + vec3(m_hparams.epsilon));
+		vec3 rot = actual_learning_rate * m_state.first_moment / (sqrt(m_state.second_moment) + m_hparams.epsilon);
 
 		m_state.variable = rotvec(rotmat(-rot) * rotmat(variable()));
 	}
@@ -308,4 +308,4 @@ inline void from_json(const nlohmann::json& j, RotationAdamOptimizer& opt) {
 	opt.from_json(j);
 }
 
-NGP_NAMESPACE_END
+}

include/neural-graphics-primitives/bounding_box.cuh

@@ -19,7 +19,7 @@
 #include <neural-graphics-primitives/common_device.cuh>
 #include <neural-graphics-primitives/triangle.cuh>
 
-NGP_NAMESPACE_BEGIN
+namespace ngp {
 
 template <int N_POINTS>
 NGP_HOST_DEVICE inline void project(vec3 points[N_POINTS], const vec3& axis, float& min, float& max) {
@@ -51,16 +51,16 @@ struct BoundingBox {
 		enlarge(tri.c);
 	}
 
-	BoundingBox(std::vector<Triangle>::iterator begin, std::vector<Triangle>::iterator end) {
+	NGP_HOST_DEVICE BoundingBox(Triangle* begin, Triangle* end) {
 		min = max = begin->a;
 		for (auto it = begin; it != end; ++it) {
 			enlarge(*it);
 		}
 	}
 
 	NGP_HOST_DEVICE void enlarge(const BoundingBox& other) {
-		min = glm::min(min, other.min);
-		max = glm::max(max, other.max);
+		min = tcnn::min(min, other.min);
+		max = tcnn::max(max, other.max);
 	}
 
 	NGP_HOST_DEVICE void enlarge(const Triangle& tri) {
@@ -70,8 +70,8 @@ struct BoundingBox {
 	}
 
 	NGP_HOST_DEVICE void enlarge(const vec3& point) {
-		min = glm::min(min, point);
-		max = glm::max(max, point);
+		min = tcnn::min(min, point);
+		max = tcnn::max(max, point);
 	}
 
 	NGP_HOST_DEVICE void inflate(float amount) {
@@ -93,8 +93,8 @@ struct BoundingBox {
 
 	NGP_HOST_DEVICE BoundingBox intersection(const BoundingBox& other) const {
 		BoundingBox result = *this;
-		result.min = glm::max(result.min, other.min);
-		result.max = glm::min(result.max, other.max);
+		result.min = tcnn::max(result.min, other.min);
+		result.max = tcnn::min(result.max, other.max);
 		return result;
 	}
 
@@ -165,14 +165,14 @@ struct BoundingBox {
 		float tmax = (max.x - pos.x) / dir.x;
 
 		if (tmin > tmax) {
-			tcnn::host_device_swap(tmin, tmax);
+			host_device_swap(tmin, tmax);
 		}
 
 		float tymin = (min.y - pos.y) / dir.y;
 		float tymax = (max.y - pos.y) / dir.y;
 
 		if (tymin > tymax) {
-			tcnn::host_device_swap(tymin, tymax);
+			host_device_swap(tymin, tymax);
 		}
 
 		if (tmin > tymax || tymin > tmax) {
@@ -191,7 +191,7 @@ struct BoundingBox {
 		float tzmax = (max.z - pos.z) / dir.z;
 
 		if (tzmin > tzmax) {
-			tcnn::host_device_swap(tzmin, tzmax);
+			host_device_swap(tzmin, tzmax);
 		}
 
 		if (tmin > tzmax || tzmin > tmax) {
@@ -210,7 +210,7 @@ struct BoundingBox {
 	}
 
 	NGP_HOST_DEVICE bool is_empty() const {
-		return any(lessThan(max, min));
+		return max.x < min.x || max.y < min.y || max.z < min.z;
 	}
 
 	NGP_HOST_DEVICE bool contains(const vec3& p) const {
@@ -226,12 +226,12 @@ struct BoundingBox {
 	}
 
 	NGP_HOST_DEVICE float distance_sq(const vec3& p) const {
-		return length2(glm::max(glm::max(min - p, p - max), vec3(0.0f)));
+		return length2(tcnn::max(tcnn::max(min - p, p - max), vec3(0.0f)));
 	}
 
 	NGP_HOST_DEVICE float signed_distance(const vec3& p) const {
 		vec3 q = abs(p - min) - diag();
-		return length(glm::max(q, vec3(0.0f))) + std::min(compMax(q), 0.0f);
+		return length(tcnn::max(q, vec3(0.0f))) + std::min(tcnn::max(q), 0.0f);
 	}
 
 	NGP_HOST_DEVICE void get_vertices(vec3 v[8]) const {
@@ -249,12 +249,4 @@ struct BoundingBox {
 	vec3 max = vec3(-std::numeric_limits<float>::infinity());
 };
 
-inline std::ostream& operator<<(std::ostream& os, const ngp::BoundingBox& bb) {
-	os << "[";
-	os << "min=[" << bb.min.x << "," << bb.min.y << "," << bb.min.z << "], ";
-	os << "max=[" << bb.max.x << "," << bb.max.y << "," << bb.max.z << "]";
-	os << "]";
-	return os;
 }
-
-NGP_NAMESPACE_END

include/neural-graphics-primitives/camera_path.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <neural-graphics-primitives/common.h>
+#include <neural-graphics-primitives/common_host.h>
 
 #include <tiny-cuda-nn/common.h>
 
@@ -28,7 +28,7 @@
 
 struct ImDrawList;
 
-NGP_NAMESPACE_BEGIN
+namespace ngp {
 
 struct CameraKeyframe {
 	quat R;
@@ -40,7 +40,7 @@ struct CameraKeyframe {
 	int glow_mode;
 	float glow_y_cutoff;
 	mat4x3 m() const {
-		auto rot = toMat3(normalize(quat(R)));
+		auto rot = to_mat3(normalize(quat(R)));
 		return mat4x3(rot[0], rot[1], rot[2], T);
 	}
 
@@ -113,7 +113,7 @@ struct CameraPath {
 			// add size to ensure no negative value is generated by modulo
 			return keyframes[(i + size) % size];
 		} else {
-			return keyframes[tcnn::clamp(i, 0, (int)keyframes.size()-1)];
+			return keyframes[clamp(i, 0, (int)keyframes.size()-1)];
 		}
 	}
 	CameraKeyframe eval_camera_path(float t) {
@@ -142,5 +142,5 @@ void visualize_cube(ImDrawList* list, const mat4& world2proj, const vec3& a, con
 void visualize_nerf_camera(ImDrawList* list, const mat4& world2proj, const mat4x3& xform, float aspect, uint32_t col = 0x80ffffff, float thickness = 1.0f);
 #endif
 
-NGP_NAMESPACE_END
+}