solve conflict

.gitattributes

@@ -0,0 +1,5 @@
+*.pb filter=lfs diff=lfs merge=lfs -text
+*.pt filter=lfs diff=lfs merge=lfs -text
+*.pth filter=lfs diff=lfs merge=lfs -text
+*tfevents* filter=lfs diff=lfs merge=lfs -text
+models/** filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -0,0 +1,132 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# VS Code settings
+.vscode

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/

.idea/inspectionProfiles/Project_Default.xml

@@ -1,18 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredPackages">
-        <value>
-          <list size="4">
-            <item index="0" class="java.lang.String" itemvalue="tensorboard" />
-            <item index="1" class="java.lang.String" itemvalue="shapely" />
-            <item index="2" class="java.lang.String" itemvalue="geopandas" />
-            <item index="3" class="java.lang.String" itemvalue="sklearn" />
-          </list>
-        </value>
-      </option>
-    </inspection_tool>
-  </profile>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/misc.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Remote Python 3.8.8 (sftp://stella@147.46.112.43:8022/home/stella/anaconda3/envs/python3.8-pytorch17.1/bin/python)" project-jdk-type="Python SDK" />
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/putting-nerf-on-a-diet.iml" filepath="$PROJECT_DIR$/.idea/putting-nerf-on-a-diet.iml" />
-    </modules>
-  </component>
-</project>

.idea/putting-nerf-on-a-diet.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

.idea/workspace.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="8de53f6a-fbe7-4721-b732-1dc320acbf49" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="1vp155NJAtsxo45TIukog9dgVgZ" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.detected.package.tslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.tslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/assets" />
+    </key>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="8de53f6a-fbe7-4721-b732-1dc320acbf49" name="Default Changelist" comment="" />
+      <created>1627244031095</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1627244031095</updated>
+      <workItem from="1627244032826" duration="9796000" />
+      <workItem from="1627809909499" duration="444000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
+</project>

README.md

@@ -24,15 +24,13 @@ streamlit run app.py
 
 ## ✨ Implementation
 
-Our code is written in JAX/ Flax and mainly based upon [jaxnerf](https://github.com/google-research/google-research/tree/master/jaxnerf) from Google Research. The base code is highly optimized in GPU & TPU. For semantic consistency loss, we utilize pretrained CLIP Vision Transformer from [transformers](https://github.com/huggingface/transformers) library.  
-
+Our code is written in JAX/ Flax and mainly based upon [jaxnerf](https://github.com/google-research/google-research/tree/master/jaxnerf) from Google Research. The base code is highly optimized in GPU & TPU. For semantic consistency loss, we utilize pretrained CLIP Vision Transformer from [transformers](https://github.com/huggingface/transformers) library.
 To learn more about DietNeRF, our experiments and implementation, you are highly recommended to check out our very detailed **[Notion write-up](https://www.notion.so/DietNeRF-Putting-NeRF-on-a-Diet-4aeddae95d054f1d91686f02bdb74745)**!
 
 <p align="center"><img width="500" height="600" alt="스크린샷 2021-07-04 오후 4 11 51" src="assets/report_thumbnail.png"></p> 
 
-##  🤗 Hugging Face Hub Repo URL:
-We will also upload our project on the Hugging Face Hub Repository Also. 
-[https://huggingface.co/flax-community/putting-nerf-on-a-diet/](https://huggingface.co/flax-community/putting-nerf-on-a-diet/)
+##  🤗 Hugging Face Model Hub Repo
+You can also find our project on the [Hugging Face Model Hub Repository](https://huggingface.co/flax-community/putting-nerf-on-a-diet/).
 
 Our JAX/Flax implementation currently supports:
 
@@ -73,19 +71,19 @@ Our JAX/Flax implementation currently supports:
 
 ```bash
 # Clone the repo
-svn export https://github.com/google-research/google-research/trunk/jaxnerf
+git clone https://github.com/codestella/putting-nerf-on-a-diet
 # Create a conda environment, note you can use python 3.6-3.8 as
 # one of the dependencies (TensorFlow) hasn't supported python 3.9 yet.
 conda create --name jaxnerf python=3.6.12; conda activate jaxnerf
 # Prepare pip
 conda install pip; pip install --upgrade pip
 # Install requirements
-pip install -r jaxnerf/requirements.txt
+pip install -r requirements.txt
 # [Optional] Install GPU and TPU support for Jax
 # Remember to change cuda101 to your CUDA version, e.g. cuda110 for CUDA 11.0.
-pip install --upgrade jax jaxlib==0.1.57+cuda101 -f https://storage.googleapis.com/jax-releases/jax_releases.html
+!pip install --upgrade jax "jax[cuda110]" -f https://storage.googleapis.com/jax-releases/jax_releases.html
 # install flax and flax-transformer
-pip install flax transformer[flax]
+pip install flax transformers[flax]
 ```
 
 ## ⚽ Dataset 
@@ -96,8 +94,7 @@ in the place you like. Let's assume they are placed under `/tmp/jaxnerf/data/`.
 
 ## 💖 Methods
 
-You can check more detail explaination about DietNeRF on following **Notion Report**
-* 👉👉 VEEEERY Detail DietNeRF Explaination Docs : https://www.notion.so/DietNeRF-Putting-NeRF-on-a-Diet-4aeddae95d054f1d91686f02bdb74745
+* 👉👉 You can check VEEEERY detailed explanation about our project on [Notion Report](https://www.notion.so/DietNeRF-Putting-NeRF-on-a-Diet-4aeddae95d054f1d91686f02bdb74745)
 
 <p align="center"><img width="400" alt="스크린샷 2021-07-04 오후 4 11 51" src="https://user-images.githubusercontent.com/77657524/124376591-b312b780-dce2-11eb-80ad-9129d6f5eedb.png"></p> 
 
@@ -123,7 +120,7 @@ python -m train \
 ```
 You can toggle the semantic loss by “use_semantic_loss” in configuration files.
 
-## 💎 Expriment Result
+## 💎 Experimental Results
 
 ### ❗ Rendered Rendering images by 8-shot learned Diet-NeRF
 
@@ -136,9 +133,9 @@ DietNeRF has a strong capacity to generalise on novel and challenging views with
 
 ### ❗ Rendered GIF by occluded 14-shot learned NeRF and Diet-NeRF
 
-We made aritificial occulusion on the right side of image (Only picked left side training poses).
+We made artificial occlusion on the right side of image (Only picked left side training poses).
 The reconstruction quality can be compared with this experiment.
-Diet NeRF shows better quailty than Original NeRF when It is occulused.
+DietNeRF shows better quality than Original NeRF when It is occluded.
 
 #### Training poses
 <img width="1400" src="https://user-images.githubusercontent.com/26036843/126111980-4f332c87-a7f0-42e0-a355-8e77621bbca4.png">
@@ -166,9 +163,9 @@ Diet NeRF shows better quailty than Original NeRF when It is occulused.
 | Project Managing | [Stella Yang](https://github.com/codestella) To Watch Our Project Progress, Please Check [Our Project Notion](https://www.notion.so/Putting-NeRF-on-a-Diet-e0caecea0c2b40c3996c83205baf870d) |
 | NeRF Team        | [Stella Yang](https://github.com/codestella), [Alex Lau](https://github.com/riven314), [Seunghyun Lee](https://github.com/sseung0703), [Hyunkyu Kim](https://github.com/minus31),  [Haswanth Aekula](https://github.com/hassiahk), [JaeYoung Chung](https://github.com/robot0321)          |
 | CLIP Team        | [Seunghyun Lee](https://github.com/sseung0703), [Sasikanth Kotti](https://github.com/ksasi), [Khali Sifullah](https://github.com/khalidsaifullaah) , [Sunghyun Kim](https://github.com/MrBananaHuman)                                |
-| Cloud TPU Team   | [Alex Lau](https://github.com/riven314), [Aswin Pyakurel](https://github.com/masapasa) , [JaeYoung Chung](https://github.com/robot0321),  [Sunghyun Kim](https://github.com/MrBananaHuman)                                                    |
+| Cloud TPU Team   | [Alex Lau](https://github.com/riven314), [Aswin Pyakurel](https://github.com/masapasa), [JaeYoung Chung](https://github.com/robot0321),  [Sunghyun Kim](https://github.com/MrBananaHuman)                                                    |
 
-* Extremely Don't Sleep Contributors 🤣 :  [Seunghyun Lee](https://github.com/sseung0703), [Alex Lau](https://github.com/riven314), [Stella Yang](https://github.com/codestella), [Haswanth Aekula](https://github.com/hassiahk)
+* Extremely Don't Sleep Contributors 🤣:  [Seunghyun Lee](https://github.com/sseung0703), [Alex Lau](https://github.com/riven314), [Stella Yang](https://github.com/codestella), [Haswanth Aekula](https://github.com/hassiahk)
 
 ## 😎 What we improved from original JAX-NeRF : Innovation
  - Neural rendering with fewshot images
@@ -221,16 +218,14 @@ This project is based on “Putting NeRF on a Diet”.
 
 ## ❤️ Special Thanks 
 
-
-Our Project is started in the HuggingFace X GoogleAI (JAX) Community Week Event.
-https://discuss.huggingface.co/t/open-to-the-community-community-week-using-jax-flax-for-nlp-cv/7104
+Our Project is started in the [HuggingFace X GoogleAI (JAX) Community Week Event](https://discuss.huggingface.co/t/open-to-the-community-community-week-using-jax-flax-for-nlp-cv/7104).
 
 Thank you for our mentor Suraj and organizers in JAX/Flax Community Week! 
 Our team grows up with this community learning experience. It was wonderful time!
 
 <img width="250" alt="스크린샷 2021-07-04 오후 4 11 51" src="https://user-images.githubusercontent.com/77657524/126369170-5664076c-ac99-4157-bc53-b91dfb7ed7e1.jpeg">
 
-Common Computer AI(https://comcom.ai/ko/) sponsored the multiple V100 GPUs for our project!
+[Common Computer AI](https://comcom.ai/en/) sponsored multiple V100 GPUs for our project!
 Thank you so much for your support!
 <img width="250" alt="스크린샷" src="https://user-images.githubusercontent.com/77657524/126914984-d959be06-19f4-4228-8d3a-a855396b2c3f.jpeg">
 

models/14_shot_occluded/fine_plus_coarse/lego_14_shot_occluded_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:604e590e4b4233a7494e344cf25723cd9195837615f909fc6caaa9efd6fbd4ff
+size 14305645

models/14_shot_occluded/fine_plus_coarse/lego_14_shot_occluded_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3786cf8dd77aa5aba5afe3632e801c37083be11e031901c31a4a90713eb0c2b6
+size 14305645

models/14_shot_occluded/fine_plus_coarse/ship_14_shot_occluded_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36809817fe7dda0323127b3e1852d21a86885aac281c0b2e3115696eff07afe3
+size 14305645

models/14_shot_occluded/fine_plus_coarse/ship_14_shot_occluded_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fd4a0baad6c81946578f479ba821bdfd0a3968ececa1bf72462478fb039e42a
+size 14305645

models/4_shot/fine_plus_coarse/hotdog_4_shot_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a19b47f668920b012148f976a33d798b4f62fd9ec60bb3b81a65f300489fa4b
+size 14305645

models/4_shot/fine_plus_coarse/hotdog_4_shot_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f149bbfddb76db3d28a6629490dae4761b921e42152ba89e1add7c5267a25504
+size 14305645

models/4_shot/fine_plus_coarse/materials_4_shot_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef250be5cd68b1ca96ea36d2e1e96f6eb17d01ed988cb25ebff45be33c5aad6c
+size 14305645

models/4_shot/fine_plus_coarse/materials_4_shot_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3af5846194f143fd8a2a2100c5dcd6d5a55e488b66542aa9d9fe741f121df0e4
+size 14305645

models/4_shot/fine_plus_coarse/mic_4_shot_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a343b1630046fc9063997577941e755841da2f2df52ab4962020e5e140577632
+size 14305645

models/4_shot/fine_plus_coarse/mic_4_shot_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ec606fde58cef9a22d4d7b695ca777990ff0daf53fdbc64d32fd64b657f8528
+size 14305645

models/8_shot/coarse/chair_8_shot_coarse_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a58308112c8a39cbe394bb147b22039043133284324470192cff28e9e77ee24
+size 14305645

models/8_shot/coarse/drums_8_shot_coarse_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32004a6b543c3159497b6166dfd39c86f0a1055eb74f397ce7bbb6ab1142eead
+size 14305645

models/8_shot/coarse/hotdog_8_shot_coarse_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0f9216085509c996d6551de32929af4580b68ffb54d27dfa3212c4f28e405bd
+size 14305645

models/8_shot/coarse/lego_8_shot_coarse_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:252f85cde306ff6994659b4ae9428867d68d4c0d424a6cf5e2599001fba94934
+size 14305645

models/8_shot/coarse/materials_8_shot_coarse_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0eca4684c1ac755f4e08950645e0b3815042085e1cc7ae6644460a2fbb745bf3
+size 14305645

models/8_shot/coarse/mic_8_shot_coarse_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f0e8b34abdc7fd642cb9d3ceb27c6653d67b3f6f1bed436c014b286c023e7ef
+size 14305645

models/8_shot/coarse/ship_8_shot_coarse_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fedd2d5534bf2a9cbfc58ba66b4f91675c6122f005c5fe9c4ea9502f051168de
+size 14305645

models/8_shot/fine_plus_coarse/chair_8_shot_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:503a2cacf7cdebecb45556e97b786addcf2270cc45700331b00b63ef236a1c98
+size 14305645

models/8_shot/fine_plus_coarse/drums_8_shot_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:243316a2086a6b3f8dfb5d6ee7a9f4ff0d3fd00d7b049a8b34a409e6c125bcde
+size 14305645

models/8_shot/fine_plus_coarse/hotdog_8_shot_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a68d92db33c39a65e416fc01925c0ecd2caa613cbc9c74263be7b88f4219b3c
+size 14305645

models/8_shot/fine_plus_coarse/lego_8_shot_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2220eb2ef51ab7a4734eabd43b58420f9f6e2eb762390c92b94f703a640a7525
+size 14305645

models/8_shot/fine_plus_coarse/materials_8_shot_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dca981b7884038cf7498fd21018e5f4a4721252b3a9af64761498c8db008c389
+size 14305645

models/8_shot/fine_plus_coarse/mic_8_shot_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d6dae142642e07c12be9d0ab5bfd11a2c0f968b128a64b8e0a076aa3b2dc2b4
+size 14305645

models/8_shot/fine_plus_coarse/ship_8_shot_diet_nerf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be28cdc08dd86ee57cae18b7f1d9098233d1fc3c6b1561c257d4737808acbedc
+size 14305645