Fix all imports and paths

tatsuya-ishihara · Oct 4, 2023 · f1c3e24 · f1c3e24
1 parent 6265e9a
commit f1c3e24
Show file tree

Hide file tree

Showing 501 changed files with 3,008 additions and 3,983 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,6 @@ slurm-*.out
 __pycache__
 *.blend
 *.blend1
-*/worldgen/terrain/gen_occlusions/dependencies/*
 *.obj
 *.DS_Store
 **._.DS_Store

diff --git a/.gitmodules b/.gitmodules
@@ -2,32 +2,32 @@
 	path = infinigen/infinigen_gpl
 	url = https://github.com/princeton-vl/infinigen_gpl.git
 [submodule "infinigen/datagen/custom_ground_truth/dependencies/eigen"]
-	path = infinigen/datagen/custom_ground_truth/dependencies/eigen
+	path = infinigen/datagen/customgt/dependencies/eigen
 	url = https://gitlab.com/libeigen/eigen.git
 [submodule "infinigen/datagen/custom_ground_truth/dependencies/argparse"]
-	path = infinigen/datagen/custom_ground_truth/dependencies/argparse
+	path = infinigen/datagen/customgt/dependencies/argparse
 	url = https://github.com/p-ranav/argparse.git
 [submodule "infinigen/datagen/custom_ground_truth/dependencies/cnpy"]
-	path = infinigen/datagen/custom_ground_truth/dependencies/cnpy
+	path = infinigen/datagen/customgt/dependencies/cnpy
 	url = https://github.com/rogersce/cnpy.git
 [submodule "infinigen/datagen/custom_ground_truth/dependencies/indicators"]
-	path = infinigen/datagen/custom_ground_truth/dependencies/indicators
+	path = infinigen/datagen/customgt/dependencies/indicators
 	url = https://github.com/p-ranav/indicators.git
 [submodule "infinigen/datagen/custom_ground_truth/dependencies/tinycolormap"]
-	path = infinigen/datagen/custom_ground_truth/dependencies/tinycolormap
+	path = infinigen/datagen/customgt/dependencies/tinycolormap
 	url = https://github.com/yuki-koyama/tinycolormap.git
 [submodule "infinigen/datagen/custom_ground_truth/dependencies/glm"]
-	path = infinigen/datagen/custom_ground_truth/dependencies/glm
+	path = infinigen/datagen/customgt/dependencies/glm
 	url = https://github.com/g-truc/glm.git
 [submodule "infinigen/datagen/custom_ground_truth/dependencies/fast_obj"]
-	path = infinigen/datagen/custom_ground_truth/dependencies/fast_obj
+	path = infinigen/datagen/customgt/dependencies/fast_obj
 	url = https://github.com/thisistherk/fast_obj.git
 [submodule "infinigen/datagen/custom_ground_truth/dependencies/json"]
-	path = infinigen/datagen/custom_ground_truth/dependencies/json
+	path = infinigen/datagen/customgt/dependencies/json
 	url = https://github.com/nlohmann/json.git
 [submodule "infinigen/datagen/custom_ground_truth/dependencies/stb"]
-	path = infinigen/datagen/custom_ground_truth/dependencies/stb
+	path = infinigen/datagen/customgt/dependencies/stb
 	url = https://github.com/nothings/stb.git
 [submodule "infinigen/datagen/custom_ground_truth/dependencies/glfw"]
-	path = infinigen/datagen/custom_ground_truth/dependencies/glfw
+	path = infinigen/datagen/customgt/dependencies/glfw
 	url = https://github.com/glfw/glfw.git
diff --git a/Dockerfile b/Dockerfile
@@ -32,7 +32,7 @@ fi
 RUN mkdir /opt/infinigen
 WORKDIR /opt/infinigen
 COPY . .
-RUN chmod +x worldgen/tools/install/compile_opengl.sh
+RUN chmod +x infinigen/tools/install/compile_opengl.sh
 RUN conda init bash \
     && . ~/.bashrc \
     && conda create --name infinigen python=3.10 \

diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ docker-run:
 		-e "DISPLAY=$(DISPLAY)" \
 		-e "QT_X11_NO_MITSHM=1" \
 		-v "/tmp/.X11-unix:/tmp/.X11-unix:rw" \
-		-v $(PWD)/worldgen/outputs:/opt/infinigen/worldgen/outputs \
+		-v $(PWD)/outputs:/opt/infinigen/outputs \
 		-e "XAUTHORITY=$(XAUTH)" \
 		-e ROS_IP=127.0.0.1 \
 		--cap-add=SYS_PTRACE \
@@ -57,14 +57,14 @@ docker-run:
 		-e "DISPLAY=$(DISPLAY)" \
 		-e "QT_X11_NO_MITSHM=1" \
 		-v "/tmp/.X11-unix:/tmp/.X11-unix:rw" \
-		-v $(PWD)/worldgen/outputs:/opt/infinigen/worldgen/outputs \
+		-v $(PWD)/outputs:/opt/infinigen/outputs \
 		-e "XAUTHORITY=$(XAUTH)" \
 		-e ROS_IP=127.0.0.1 \
 		--cap-add=SYS_PTRACE \
 		-v /etc/group:/etc/group:ro \
 		"$(DOCKER_TAG)" bash
 
-	docker exec infinigen /bin/bash -c worldgen/tools/install/compile_opengl.sh
+	docker exec infinigen /bin/bash -c infinigen/tools/install/compile_opengl.sh
 
 docker-run-no-opengl:
 	echo "Launching Docker image without OpenGL ground truth"
@@ -73,7 +73,7 @@ docker-run-no-opengl:
 		--gpus=all \
 		--env NVIDIA_DISABLE_REQUIRE=1 \
 		-e "BLENDER=/opt/infinigen/blender/blender" \
-		-v $(PWD)/worldgen/outputs:/opt/infinigen/worldgen/outputs \
+		-v $(PWD)/outputs:/opt/infinigen/outputs \
 		"$(DOCKER_TAG)" /bin/bash
 
 docker-run-no-gpu:
@@ -84,20 +84,20 @@ docker-run-no-gpu:
 		-e "DISPLAY=$(DISPLAY)" \
 		-e "QT_X11_NO_MITSHM=1" \
 		-v "/tmp/.X11-unix:/tmp/.X11-unix:rw" \
-		-v $(PWD)/worldgen/outputs:/opt/infinigen/worldgen/outputs \
+		-v $(PWD)/outputs:/opt/infinigen/outputs \
 		-e "XAUTHORITY=$(XAUTH)" \
 		-e ROS_IP=127.0.0.1 \
 		--cap-add=SYS_PTRACE \
 		-v /etc/group:/etc/group:ro \
 		"$(DOCKER_TAG)" /bin/bash \
 
-	docker exec infinigen /bin/bash -c worldgen/tools/install/compile_opengl.sh
+	docker exec infinigen /bin/bash -c infinigen/tools/install/compile_opengl.sh
 
 docker-run-no-gpu-opengl:
 	echo "Launching Docker image without GPU passthrough or OpenGL"
 	docker run -td --rm --privileged --net=host --ipc=host \
 		--name="infinigen" \
 		-e "BLENDER=/opt/infinigen/blender/blender" \
-		-v $(PWD)/worldgen/outputs:/opt/infinigen/worldgen/outputs \
+		-v $(PWD)/outputs:/opt/infinigen/outputs \
 		"$(DOCKER_TAG)" /bin/bash
 
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ Please see our [project roadmap](https://infinigen.org/roadmap) and follow us at
 ### Contributing
 We welcome contributions! You can contribute in many ways:
 - **Contribute code to this repository** - We welcome code contributions. More guidelines coming soon.
-- **Contribute procedural generators** - `worldgen/nodes/node_transpiler/dev_script.py` provides tools to convert artist-friendly [Blender Nodes](https://docs.blender.org/manual/en/2.79/render/blender_render/materials/nodes/introduction.html) into python code. Tutorials and guidelines coming soon.
+- **Contribute procedural generators** - `infinigen/nodes/node_transpiler/dev_script.py` provides tools to convert artist-friendly [Blender Nodes](https://docs.blender.org/manual/en/2.79/render/blender_render/materials/nodes/introduction.html) into python code. Tutorials and guidelines coming soon.
 - **Contribute pre-generated data** - Anyone can contribute their computing power to create data and share it with the community. Please stay tuned for a repository of pre-generated data.
 
 ### Getting Help
@@ -63,7 +63,7 @@ Please post this repository's Github Issues page for help. Please run your comma
 - What version of the code are you using (link a commit hash), and what if any modifications have you made (new configs, code edits)
 - What exact command did you run?
 - What were the output logs of the command you ran? 
-    - If using `manage_datagen_jobs`, look in `outputs/MYJOB/MYSEED/logs/` to find the right one.
+    - If using `manage_jobs`, look in `outputs/MYJOB/MYSEED/logs/` to find the right one.
     - What was the exact python error and stacktrace, if applicable?
 
 ### Acknowledgements