Update tcnn

skywalkers-uav · Mar 17, 2022 · 18018d3 · 18018d3
1 parent 833f730
commit 18018d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dependencies/tiny-cuda-nn b/dependencies/tiny-cuda-nn
diff --git a/src/testbed_sdf.cu b/src/testbed_sdf.cu
@@ -774,7 +774,7 @@ void Testbed::FiniteDifferenceNormalsApproximator::enlarge(uint32_t n_elements)
 void Testbed::FiniteDifferenceNormalsApproximator::normal(uint32_t n_elements, const distance_fun_t& distance_function, GPUMemory<Vector3f>& pos, GPUMemory<Vector3f>& normal, float epsilon, cudaStream_t stream) {
 	enlarge(n_elements);
 
-	parallel_for_gpu(stream, n_elements, [=, *this] __device__ (size_t i) {
+	parallel_for_gpu(stream, n_elements, [pos=pos.data(), dx=dx.data(), dy=dy.data(), dz=dz.data(), epsilon] __device__ (size_t i) {
 		Vector3f p = pos[i];
 		dx[i] = Vector3f{p.x() + epsilon, p.y(), p.z()};
 		dy[i] = Vector3f{p.x(), p.y() + epsilon, p.z()};
@@ -785,7 +785,7 @@ void Testbed::FiniteDifferenceNormalsApproximator::normal(uint32_t n_elements, c
 	distance_function(n_elements, dy, dist_dy_pos, stream);
 	distance_function(n_elements, dz, dist_dz_pos, stream);
 
-	parallel_for_gpu(stream, n_elements, [=, *this] __device__ (size_t i) {
+	parallel_for_gpu(stream, n_elements, [pos=pos.data(), dx=dx.data(), dy=dy.data(), dz=dz.data(), epsilon] __device__ (size_t i) {
 		Vector3f p = pos[i];
 		dx[i] = Vector3f{p.x() - epsilon, p.y(), p.z()};
 		dy[i] = Vector3f{p.x(), p.y() - epsilon, p.z()};
@@ -796,7 +796,7 @@ void Testbed::FiniteDifferenceNormalsApproximator::normal(uint32_t n_elements, c
 	distance_function(n_elements, dy, dist_dy_neg, stream);
 	distance_function(n_elements, dz, dist_dz_neg, stream);
 
-	parallel_for_gpu(stream, n_elements, [=, *this] __device__ (size_t i) {
+	parallel_for_gpu(stream, n_elements, [normal=normal.data(), dist_dx_pos=dist_dx_pos.data(), dist_dx_neg=dist_dx_neg.data(), dist_dy_pos=dist_dy_pos.data(), dist_dy_neg=dist_dy_neg.data(), dist_dz_pos=dist_dz_pos.data(), dist_dz_neg=dist_dz_neg.data()] __device__ (size_t i) {
 		normal[i] = {dist_dx_pos[i] - dist_dx_neg[i], dist_dy_pos[i] - dist_dy_neg[i], dist_dz_pos[i] - dist_dz_neg[i]};
 	});
 }
+6 −1		bindings/torch/setup.py
+19 −33		include/tiny-cuda-nn/cutlass_matmul.h
+67 −64		include/tiny-cuda-nn/gpu_matrix.h
+3 −10		include/tiny-cuda-nn/gpu_memory.h
+3 −4		include/tiny-cuda-nn/losses/l1.h
+3 −4		include/tiny-cuda-nn/losses/l2.h
+2 −3		include/tiny-cuda-nn/losses/mape.h
+4 −5		include/tiny-cuda-nn/losses/relative_l1.h
+3 −4		include/tiny-cuda-nn/losses/relative_l2.h
+3 −4		include/tiny-cuda-nn/losses/relative_l2_luminance.h
+2 −3		include/tiny-cuda-nn/losses/smape.h