bugfix: raymarching when not forcing all rays

.gitignore

@@ -8,7 +8,10 @@ data/
 trial*/
 .vs/
 
-volsdf/
-**volsdf*
-tensorf/
-**tensorf*
+#**dnerf*
+#dnerf/
+dnerf/network_rf.py
+dnerf/network_basis_perpoint.py
+
+**neus*
+neus/

dnerf/renderer.py

@@ -448,7 +448,7 @@ def mark_untrained_grid(self, poses, intrinsic, S=64):
  # mark untrained grid as -1
  self.density_grid[count.unsqueeze(0).expand_as(self.density_grid) == 0] = -1
 
- #print(f'[mark untrained grid] {(count == 0).sum()} from {resolution ** 3 * self.cascade}')
+ print(f'[mark untrained grid] {(count == 0).sum()} from {self.grid_size ** 3 * self.cascade}')
 
  @torch.no_grad()
  def update_extra_state(self, decay=0.95, S=128):

nerf/renderer.py

@@ -439,7 +439,7 @@ def mark_untrained_grid(self, poses, intrinsic, S=64):
  # mark untrained grid as -1
  self.density_grid[count == 0] = -1
 
- #print(f'[mark untrained grid] {(count == 0).sum()} from {resolution ** 3 * self.cascade}')
+ print(f'[mark untrained grid] {(count == 0).sum()} from {self.grid_size ** 3 * self.cascade}')
 
  @torch.no_grad()
  def update_extra_state(self, decay=0.95, S=128):

nerf/utils.py

@@ -468,8 +468,8 @@ def train_step(self, data):
  else:
  gt_rgb = images
 
- # outputs = self.model.render(rays_o, rays_d, staged=False, bg_color=bg_color, perturb=True, force_all_rays=False if self.opt.patch_size == 1 else True, **vars(self.opt))
- outputs = self.model.render(rays_o, rays_d, staged=False, bg_color=bg_color, perturb=True, force_all_rays=True, **vars(self.opt))
+ outputs = self.model.render(rays_o, rays_d, staged=False, bg_color=bg_color, perturb=True, force_all_rays=False if self.opt.patch_size == 1 else True, **vars(self.opt))
+ # outputs = self.model.render(rays_o, rays_d, staged=False, bg_color=bg_color, perturb=True, force_all_rays=True, **vars(self.opt))
 
  pred_rgb = outputs['image']
 

raymarching/src/raymarching.cu

@@ -413,7 +413,7 @@ __global__ void kernel_march_rays_train(
  rays[ray_index * 3 + 2] = num_steps;
 
  if (num_steps == 0) return;
- if (point_index + num_steps >= M) return;
+ if (point_index + num_steps > M) return;
 
  xyzs += point_index * 3;
  dirs += point_index * 3;
@@ -518,7 +518,7 @@ __global__ void kernel_composite_rays_train_forward(
  uint32_t num_steps = rays[n * 3 + 2];
 
  // empty ray, or ray that exceed max step count.
- if (num_steps == 0 || offset + num_steps >= M) {
+ if (num_steps == 0 || offset + num_steps > M) {
  weights_sum[index] = 0;
  depth[index] = 0;
  image[index * 3] = 0;
@@ -621,7 +621,7 @@ __global__ void kernel_composite_rays_train_backward(
  uint32_t offset = rays[n * 3 + 1];
  uint32_t num_steps = rays[n * 3 + 2];
 
- if (num_steps == 0 || offset + num_steps >= M) return;
+ if (num_steps == 0 || offset + num_steps > M) return;
 
  grad_weights_sum += index;
  grad_image += index * 3;