Merge pull request yenchenlin#35 from WillBrennan/feature/replace-sea…

…rchsorted replace searchsorted with in-built function
zjrandom951 · Jun 21, 2021 · f1e5b3f · f1e5b3f
2 parents ec26d1c + 434e781
commit f1e5b3f
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 914 deletions.
diff --git a/README.md b/README.md
@@ -14,9 +14,6 @@ This project is a faithful PyTorch implementation of [NeRF](http://www.matthewta
 git clone https://github.com/yenchenlin/nerf-pytorch.git
 cd nerf-pytorch
 pip install -r requirements.txt
-cd torchsearchsorted
-pip install .
-cd ../
 ```
 
 <details>

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,9 @@
-torch>=1.4.0
-torchvision>=0.2.1
+torch>=1.8
+torchvision>=0.9.1
 imageio
 imageio-ffmpeg
 matplotlib
 configargparse
-tensorboard==1.14.0
+tensorboard>=2.0
 tqdm
 opencv-python
diff --git a/run_nerf_helpers.py b/run_nerf_helpers.py
@@ -4,9 +4,6 @@
 import torch.nn.functional as F
 import numpy as np
 
-# TODO: remove this dependency
-from torchsearchsorted import searchsorted
-
 
 # Misc
 img2mse = lambda x, y : torch.mean((x - y) ** 2)
@@ -223,7 +220,7 @@ def sample_pdf(bins, weights, N_samples, det=False, pytest=False):
 
     # Invert CDF
     u = u.contiguous()
-    inds = searchsorted(cdf, u, side='right')
+    inds = torch.searchsorted(cdf, u, right=True)
     below = torch.max(torch.zeros_like(inds-1), inds-1)
     above = torch.min((cdf.shape[-1]-1) * torch.ones_like(inds), inds)
     inds_g = torch.stack([below, above], -1)  # (batch, N_samples, 2)

diff --git a/torchsearchsorted/.gitignore b/torchsearchsorted/.gitignore
diff --git a/torchsearchsorted/LICENSE b/torchsearchsorted/LICENSE
diff --git a/torchsearchsorted/README.md b/torchsearchsorted/README.md
diff --git a/torchsearchsorted/examples/benchmark.py b/torchsearchsorted/examples/benchmark.py