Unverified Commit 934f5e9f authored by Matthew Tancik's avatar Matthew Tancik Committed by GitHub
Browse files

Support python 3.7 (#77)

* Support python 3.7

* Add dependency
parent 62e70d39
...@@ -185,7 +185,7 @@ if __name__ == "__main__": ...@@ -185,7 +185,7 @@ if __name__ == "__main__":
elapsed_time = time.time() - tic elapsed_time = time.time() - tic
loss = F.mse_loss(rgb[alive_ray_mask], pixels[alive_ray_mask]) loss = F.mse_loss(rgb[alive_ray_mask], pixels[alive_ray_mask])
print( print(
f"elapsed_time={elapsed_time:.2f}s | {step=} | " f"elapsed_time={elapsed_time:.2f}s | step={step} | "
f"loss={loss:.5f} | " f"loss={loss:.5f} | "
f"alive_ray_mask={alive_ray_mask.long().sum():d} | " f"alive_ray_mask={alive_ray_mask.long().sum():d} | "
f"n_rendering_samples={n_rendering_samples:d} | num_rays={len(pixels):d} |" f"n_rendering_samples={n_rendering_samples:d} | num_rays={len(pixels):d} |"
...@@ -235,7 +235,7 @@ if __name__ == "__main__": ...@@ -235,7 +235,7 @@ if __name__ == "__main__":
# ) # )
# break # break
psnr_avg = sum(psnrs) / len(psnrs) psnr_avg = sum(psnrs) / len(psnrs)
print(f"evaluation: {psnr_avg=}") print(f"evaluation: psnr_avg={psnr_avg}")
train_dataset.training = True train_dataset.training = True
if step == max_steps: if step == max_steps:
......
...@@ -211,7 +211,7 @@ if __name__ == "__main__": ...@@ -211,7 +211,7 @@ if __name__ == "__main__":
elapsed_time = time.time() - tic elapsed_time = time.time() - tic
loss = F.mse_loss(rgb[alive_ray_mask], pixels[alive_ray_mask]) loss = F.mse_loss(rgb[alive_ray_mask], pixels[alive_ray_mask])
print( print(
f"elapsed_time={elapsed_time:.2f}s | {step=} | " f"elapsed_time={elapsed_time:.2f}s | step={step} | "
f"loss={loss:.5f} | " f"loss={loss:.5f} | "
f"alive_ray_mask={alive_ray_mask.long().sum():d} | " f"alive_ray_mask={alive_ray_mask.long().sum():d} | "
f"n_rendering_samples={n_rendering_samples:d} | num_rays={len(pixels):d} |" f"n_rendering_samples={n_rendering_samples:d} | num_rays={len(pixels):d} |"
...@@ -257,7 +257,7 @@ if __name__ == "__main__": ...@@ -257,7 +257,7 @@ if __name__ == "__main__":
# ) # )
# break # break
psnr_avg = sum(psnrs) / len(psnrs) psnr_avg = sum(psnrs) / len(psnrs)
print(f"evaluation: {psnr_avg=}") print(f"evaluation: psnr_avg={psnr_avg}")
train_dataset.training = True train_dataset.training = True
if step == max_steps: if step == max_steps:
......
...@@ -254,7 +254,7 @@ if __name__ == "__main__": ...@@ -254,7 +254,7 @@ if __name__ == "__main__":
elapsed_time = time.time() - tic elapsed_time = time.time() - tic
loss = F.mse_loss(rgb[alive_ray_mask], pixels[alive_ray_mask]) loss = F.mse_loss(rgb[alive_ray_mask], pixels[alive_ray_mask])
print( print(
f"elapsed_time={elapsed_time:.2f}s | {step=} | " f"elapsed_time={elapsed_time:.2f}s | step={step} | "
f"loss={loss:.5f} | " f"loss={loss:.5f} | "
f"alive_ray_mask={alive_ray_mask.long().sum():d} | " f"alive_ray_mask={alive_ray_mask.long().sum():d} | "
f"n_rendering_samples={n_rendering_samples:d} | num_rays={len(pixels):d} |" f"n_rendering_samples={n_rendering_samples:d} | num_rays={len(pixels):d} |"
...@@ -301,7 +301,7 @@ if __name__ == "__main__": ...@@ -301,7 +301,7 @@ if __name__ == "__main__":
# ) # )
# break # break
psnr_avg = sum(psnrs) / len(psnrs) psnr_avg = sum(psnrs) / len(psnrs)
print(f"evaluation: {psnr_avg=}") print(f"evaluation: psnr_avg={psnr_avg}")
train_dataset.training = True train_dataset.training = True
if step == max_steps: if step == max_steps:
......
""" """
Copyright (c) 2022 Ruilong Li, UC Berkeley. Copyright (c) 2022 Ruilong Li, UC Berkeley.
""" """
from importlib.metadata import version try:
from importlib.metadata import version
except ImportError:
# Running on pre-3.8 Python; use importlib-metadata package
from importlib_metadata import version
__version__ = version("nerfacc") __version__ = version("nerfacc")
...@@ -9,8 +9,9 @@ description = "A General NeRF Acceleration Toolbox." ...@@ -9,8 +9,9 @@ description = "A General NeRF Acceleration Toolbox."
readme = "README.md" readme = "README.md"
authors = [{name = "Ruilong", email = "ruilongli94@gmail.com"}] authors = [{name = "Ruilong", email = "ruilongli94@gmail.com"}]
license = { text="MIT" } license = { text="MIT" }
requires-python = ">=3.8" requires-python = ">=3.7"
dependencies = [ dependencies = [
"importlib_metadata>=5.0.0; python_version<'3.8'",
"ninja>=1.10.2.3", "ninja>=1.10.2.3",
"pybind11>=2.10.0", "pybind11>=2.10.0",
"torch>=1.12.0", "torch>=1.12.0",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment