From cca945fbaf5838ab16c6cb9adc53e56efb86836d Mon Sep 17 00:00:00 2001 From: Keunhong Park Date: Sun, 5 Dec 2021 17:12:31 -0800 Subject: [PATCH 01/11] Fix #5. --- notebooks/HyperNeRF_Render_Video.ipynb | 5 ++--- notebooks/HyperNeRF_Training.ipynb | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/notebooks/HyperNeRF_Render_Video.ipynb b/notebooks/HyperNeRF_Render_Video.ipynb index 40570ab..08dc65c 100644 --- a/notebooks/HyperNeRF_Render_Video.ipynb +++ b/notebooks/HyperNeRF_Render_Video.ipynb @@ -151,8 +151,7 @@ { "cell_type": "code", "metadata": { - "id": "2QYJ7dyMcw2f", - "cellView": "form" + "id": "2QYJ7dyMcw2f" }, "source": [ "# @title Model and dataset configuration\n", @@ -195,7 +194,7 @@ "eval_config = configs.EvalConfig()\n", "\n", "display(Markdown(\n", - " gin.config.markdownify_operative_config_str(gin.config_str())))" + " gin.config.markdown(gin.config_str())))" ], "execution_count": null, "outputs": [] diff --git a/notebooks/HyperNeRF_Training.ipynb b/notebooks/HyperNeRF_Training.ipynb index 593a7c8..f357b2f 100644 --- a/notebooks/HyperNeRF_Training.ipynb +++ b/notebooks/HyperNeRF_Training.ipynb @@ -6,8 +6,7 @@ "name": "HyperNeRF Training.ipynb", "private_outputs": true, "provenance": [], - "collapsed_sections": [], - "toc_visible": true + "collapsed_sections": [] }, "kernelspec": { "name": "python3", @@ -180,8 +179,7 @@ { "cell_type": "code", "metadata": { - "id": "rz7wRm7YT9Ka", - "cellView": "form" + "id": "rz7wRm7YT9Ka" }, "source": [ "# @title Model and dataset configuration\n", @@ -314,7 +312,7 @@ "eval_config = configs.EvalConfig()\n", "\n", "display(Markdown(\n", - " gin.config.markdownify_operative_config_str(gin.config_str())))" + " gin.config.markdown(gin.config_str())))" ], "execution_count": null, "outputs": [] From 7d39491931bd78cc60a546ed6d05936ac868884d Mon Sep 17 00:00:00 2001 From: Keunhong Park Date: Sun, 5 Dec 2021 17:15:49 -0800 Subject: [PATCH 02/11] Update tensorflow version. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index be3cbd0..782180c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,5 +14,5 @@ opt-einsum==3.3.0 optax==0.0.9 Pillow==8.3.2 scipy==1.7.1 -tensorflow==2.6.0 +tensorflow==2.6.1 tqdm==4.62.2 From 0a30489f16857e245f1f6af5e50d93791f93eff0 Mon Sep 17 00:00:00 2001 From: Keunhong Park Date: Sat, 11 Dec 2021 16:33:36 -0800 Subject: [PATCH 03/11] Update bibtex. --- README.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3d8826a..2f1e1a1 100644 --- a/README.md +++ b/README.md @@ -87,10 +87,16 @@ The dataset uses the [same format as Nerfies](https://github.com/google/nerfies# ## Citing If you find our work useful, please consider citing: ```BibTeX -@article{park2021hypernerf - author = {Park, Keunhong and Sinha, Utkarsh and Hedman, Peter and Barron, Jonathan T. and Bouaziz, Sofien and Goldman, Dan B and Martin-Brualla, Ricardo and Seitz, Steven M.}, - title = {HyperNeRF: A Higher-Dimensional Representation for Topologically Varying Neural Radiance Fields}, - journal = {arXiv preprint arXiv:2106.13228}, - year = {2021}, +@article{park2021hypernerf, +author = {Park, Keunhong and Sinha, Utkarsh and Hedman, Peter and Barron, Jonathan T. and Bouaziz, Sofien and Goldman, Dan B and Martin-Brualla, Ricardo and Seitz, Steven M.}, +title = {HyperNeRF: A Higher-Dimensional Representation for Topologically Varying Neural Radiance Fields}, +journal = {ACM Trans. Graph.}, +issue_date = {December 2021}, +publisher = {ACM}, +volume = {40}, +number = {6}, +month = {dec}, +year = {2021}, +articleno = {238}, } ``` From 32a59b1b28a5d879f349dbdd0315a909cbef0768 Mon Sep 17 00:00:00 2001 From: Keunhong Park Date: Sat, 11 Dec 2021 16:34:03 -0800 Subject: [PATCH 04/11] Update README.md --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 2f1e1a1..c0e3bc8 100644 --- a/README.md +++ b/README.md @@ -88,15 +88,15 @@ The dataset uses the [same format as Nerfies](https://github.com/google/nerfies# If you find our work useful, please consider citing: ```BibTeX @article{park2021hypernerf, -author = {Park, Keunhong and Sinha, Utkarsh and Hedman, Peter and Barron, Jonathan T. and Bouaziz, Sofien and Goldman, Dan B and Martin-Brualla, Ricardo and Seitz, Steven M.}, -title = {HyperNeRF: A Higher-Dimensional Representation for Topologically Varying Neural Radiance Fields}, -journal = {ACM Trans. Graph.}, -issue_date = {December 2021}, -publisher = {ACM}, -volume = {40}, -number = {6}, -month = {dec}, -year = {2021}, -articleno = {238}, + author = {Park, Keunhong and Sinha, Utkarsh and Hedman, Peter and Barron, Jonathan T. and Bouaziz, Sofien and Goldman, Dan B and Martin-Brualla, Ricardo and Seitz, Steven M.}, + title = {HyperNeRF: A Higher-Dimensional Representation for Topologically Varying Neural Radiance Fields}, + journal = {ACM Trans. Graph.}, + issue_date = {December 2021}, + publisher = {ACM}, + volume = {40}, + number = {6}, + month = {dec}, + year = {2021}, + articleno = {238}, } ``` From 959d752ec108c3a80660003ef615c67ca8b75d91 Mon Sep 17 00:00:00 2001 From: Keunhong Park Date: Sat, 11 Dec 2021 16:34:39 -0800 Subject: [PATCH 05/11] Update README.md --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c0e3bc8..031228c 100644 --- a/README.md +++ b/README.md @@ -88,15 +88,15 @@ The dataset uses the [same format as Nerfies](https://github.com/google/nerfies# If you find our work useful, please consider citing: ```BibTeX @article{park2021hypernerf, - author = {Park, Keunhong and Sinha, Utkarsh and Hedman, Peter and Barron, Jonathan T. and Bouaziz, Sofien and Goldman, Dan B and Martin-Brualla, Ricardo and Seitz, Steven M.}, - title = {HyperNeRF: A Higher-Dimensional Representation for Topologically Varying Neural Radiance Fields}, - journal = {ACM Trans. Graph.}, - issue_date = {December 2021}, - publisher = {ACM}, - volume = {40}, - number = {6}, - month = {dec}, - year = {2021}, - articleno = {238}, + author = {Park, Keunhong and Sinha, Utkarsh and Hedman, Peter and Barron, Jonathan T. and Bouaziz, Sofien and Goldman, Dan B and Martin-Brualla, Ricardo and Seitz, Steven M.}, + title = {HyperNeRF: A Higher-Dimensional Representation for Topologically Varying Neural Radiance Fields}, + journal = {ACM Trans. Graph.}, + issue_date = {December 2021}, + publisher = {ACM}, + volume = {40}, + number = {6}, + month = {dec}, + year = {2021}, + articleno = {238}, } ``` From 0711f2dfd77cd607d17aa20b4f70736ee3786813 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jan 2022 00:38:06 +0000 Subject: [PATCH 06/11] Bump pillow from 8.3.2 to 9.0.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/8.3.2...9.0.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 782180c..0d9ca75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ oauthlib==3.1.1 opencv-python==4.5.3.56 opt-einsum==3.3.0 optax==0.0.9 -Pillow==8.3.2 +Pillow==9.0.0 scipy==1.7.1 tensorflow==2.6.1 tqdm==4.62.2 From fd9a42fbb71d7db1ffdbe4e6f5acc5510ec69b13 Mon Sep 17 00:00:00 2001 From: Keunhong Park Date: Sat, 5 Feb 2022 22:18:21 -0800 Subject: [PATCH 07/11] Fix flax.linen import. --- hypernerf/configs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypernerf/configs.py b/hypernerf/configs.py index 0a70423..874ef89 100644 --- a/hypernerf/configs.py +++ b/hypernerf/configs.py @@ -16,7 +16,7 @@ import dataclasses from typing import Any, Callable, Optional -from flax import nn +from flax import linen import nn import gin import immutabledict import jax.numpy From 31d54dde10bddeb0eefa6c7979020124016da149 Mon Sep 17 00:00:00 2001 From: Keunhong Park Date: Sat, 5 Feb 2022 22:18:32 -0800 Subject: [PATCH 08/11] Update configs.py --- hypernerf/configs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypernerf/configs.py b/hypernerf/configs.py index 874ef89..809ff52 100644 --- a/hypernerf/configs.py +++ b/hypernerf/configs.py @@ -16,7 +16,7 @@ import dataclasses from typing import Any, Callable, Optional -from flax import linen import nn +from flax import linen as nn import gin import immutabledict import jax.numpy From d7661d4685f8a0b6a9a9da1257ca283ab15d8b08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 6 Feb 2022 23:05:42 +0000 Subject: [PATCH 09/11] Bump numpy from 1.19.5 to 1.21.0 Bumps [numpy](https://github.com/numpy/numpy) from 1.19.5 to 1.21.0. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt) - [Commits](https://github.com/numpy/numpy/compare/v1.19.5...v1.21.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0d9ca75..329f42b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ jax==0.2.20 jaxlib==0.1.71+cuda111 Markdown==3.3.4 matplotlib==3.4.3 -numpy==1.19.5 +numpy==1.21.0 oauthlib==3.1.1 opencv-python==4.5.3.56 opt-einsum==3.3.0 From c59529de226f1f3ba7f195891c824c78cdc3a2ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 03:20:12 +0000 Subject: [PATCH 10/11] Bump tensorflow from 2.6.1 to 2.6.3 Bumps [tensorflow](https://github.com/tensorflow/tensorflow) from 2.6.1 to 2.6.3. - [Release notes](https://github.com/tensorflow/tensorflow/releases) - [Changelog](https://github.com/tensorflow/tensorflow/blob/master/RELEASE.md) - [Commits](https://github.com/tensorflow/tensorflow/compare/v2.6.1...v2.6.3) --- updated-dependencies: - dependency-name: tensorflow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 329f42b..9b3b128 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,5 +14,5 @@ opt-einsum==3.3.0 optax==0.0.9 Pillow==9.0.0 scipy==1.7.1 -tensorflow==2.6.1 +tensorflow==2.6.3 tqdm==4.62.2 From 1f87f3fd1f9fdada1933fd644021d8adc6384945 Mon Sep 17 00:00:00 2001 From: JamesPerlman Date: Thu, 17 Feb 2022 00:43:37 -0800 Subject: [PATCH 11/11] Save result from jax.local_device_count() Identical issue to https://github.com/google/nerfies/pull/47 --- hypernerf/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypernerf/utils.py b/hypernerf/utils.py index 5060a60..6e7e97f 100644 --- a/hypernerf/utils.py +++ b/hypernerf/utils.py @@ -285,7 +285,7 @@ def points_bounding_size(points): def shard(xs, device_count=None): """Split data into shards for multiple devices along the first dimension.""" if device_count is None: - jax.local_device_count() + device_count = jax.local_device_count() return jax.tree_map(lambda x: x.reshape((device_count, -1) + x.shape[1:]), xs)