rename the remaining stuff

r-pad · May 14, 2024 · 5b26ff2 · 5b26ff2
1 parent ff3798d
commit 5b26ff2
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 305 deletions.
diff --git a/README.md b/README.md
@@ -70,9 +70,6 @@ pip install -r requirements-gpu.txt
 ```
 
 
-# NOTE
-Cursed vglrun requires us to pipe in our own custom LD_LIBRARY_PATH. This is a hacky way to do it, but it works for now.
-
 ## Install `taxpose`.
 
 This part should be really simple:

diff --git a/notebooks/aggregate_rlbench_results.ipynb b/notebooks/aggregate_rlbench_results.ipynb
@@ -1,5 +1,12 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Aggregate the various rlbench evals into a single dataframe which can be easily copied."
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -92,24 +99,6 @@
     "display(df)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cfg = get_config(run_ids[1])"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cfg[\"task\"][\"name\"]"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,

diff --git a/notebooks/explore_rlbench_demos.ipynb → notebooks/explore_rlbench_dataset.ipynb b/notebooks/explore_rlbench_demos.ipynb → notebooks/explore_rlbench_dataset.ipynb
@@ -1,5 +1,12 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Explore the RLBench dataset (which we made)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,

diff --git a/notebooks/check_real.ipynb → notebooks/inspect_real_world_dataset.ipynb b/notebooks/check_real.ipynb → notebooks/inspect_real_world_dataset.ipynb
diff --git a/notebooks/rebuttal_results.ipynb → ...ooks/mlat_iclr_2024_rebuttal_tables.ipynb b/notebooks/rebuttal_results.ipynb → ...ooks/mlat_iclr_2024_rebuttal_tables.ipynb
diff --git a/notebooks/eval_results_table.ipynb → notebooks/ndf_eval_results_table.ipynb b/notebooks/eval_results_table.ipynb → notebooks/ndf_eval_results_table.ipynb
@@ -1,5 +1,12 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# NDF evaluation result aggregation"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,

diff --git a/notebooks/make_imgs.ipynb → notebooks/ndf_mug_grid.ipynb b/notebooks/make_imgs.ipynb → notebooks/ndf_mug_grid.ipynb
diff --git a/notebooks/penetration_analysis.ipynb → notebooks/ndf_penetration_analysis.ipynb b/notebooks/penetration_analysis.ipynb → notebooks/ndf_penetration_analysis.ipynb
diff --git a/notebooks/vis_symmetries.ipynb → notebooks/ndf_vis_symmetries.ipynb b/notebooks/vis_symmetries.ipynb → notebooks/ndf_vis_symmetries.ipynb
diff --git a/notebooks/visualize_eval_imgs.ipynb → notebooks/ndf_visualize_eval_imgs.ipynb b/notebooks/visualize_eval_imgs.ipynb → notebooks/ndf_visualize_eval_imgs.ipynb
diff --git a/notebooks/visualize_eval_predictions.ipynb → ...ooks/ndf_visualize_eval_predictions.ipynb b/notebooks/visualize_eval_predictions.ipynb → ...ooks/ndf_visualize_eval_predictions.ipynb
diff --git a/notebooks/symmetric_cls.ipynb → ...books/original_taxpose_ndf_symmetry.ipynb b/notebooks/symmetric_cls.ipynb → ...books/original_taxpose_ndf_symmetry.ipynb
diff --git a/notebooks/viz_final_eps.ipynb → notebooks/rlbench_make_demo_grid.ipynb b/notebooks/viz_final_eps.ipynb → notebooks/rlbench_make_demo_grid.ipynb
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,7 +14,6 @@ authors = [
 ]
 dependencies = [
   # "chamferdist",
-  "dill",
   "dgl",
   "dglgo",
   "h5py",
@@ -56,13 +55,14 @@ develop = [
   "pytest-xdist",
   "types-tqdm",
 ]
+build_docs = ["mkdocs-material", "mkdocstrings[python]"]
 rlbench = [
   # These should be installed manually...
   # "pyrep",
   # "rlbench @ git+https://github.com/stepjam/RLBench.git",
   "rpad-rlbench-utils @ git+https://github.com/r-pad/rlbench_utils.git",
 ]
-build_docs = ["mkdocs-material", "mkdocstrings[python]"]
+
 
 # This is required to allow us to have notebooks/ at the top level.
 [tool.setuptools]

diff --git a/scripts/README.md b/scripts/README.md
diff --git a/scripts/get_results.py b/scripts/get_results.py
@@ -21,42 +21,6 @@ def main(res_dir: str, n_trials: int = 100):
         # Get the path to the result file
         result_path = os.path.join(res_dir, seed, result_file)
 
-        # res = np.load(result_path)
-        # # Set the index of the dataframe to be the seed
-
-        # succ = np.logical_and(
-        #     res["grasp_success_list"], res["place_success_teleport_list"]
-        # )
-        # mp_succ = np.logical_and(res["grasp_success_list"], res["place_success_list"])
-
-        # ress = {
-        #     "seed": seed,
-        #     "Grasp": res["grasp_success_list"].astype(float).mean(),
-        #     "Place": res["place_success_teleport_list"].astype(float).mean(),
-        #     "Overall": succ.astype(float).mean(),
-        #     "Overall_mp": mp_succ.astype(float).mean(),
-        # }
-
-        # for thresh in [0.0, 0.01, 0.02, 0.03, 0.04, 0.05]:
-        #     ps_at_t = np.logical_and(
-        #         res["place_success_teleport_list"], res["penetration_list"] < thresh
-        #     ).mean(axis=-1)
-        #     s_at_t = np.logical_and(succ, res["penetration_list"] < thresh).mean(
-        #         axis=-1
-        #     )
-
-        #     ress[f"Place@{thresh}"] = ps_at_t.mean()
-        #     ress[f"Overall@{thresh}"] = s_at_t.mean()
-
-        # results = pd.DataFrame(
-        #     ress,
-        #     columns=["seed", "Grasp", "Place", "Overall", "Overall_mp"]
-        #     + [f"Place@{thresh}" for thresh in [0.0, 0.01, 0.02, 0.03, 0.04, 0.05]]
-        #     + [f"Overall@{thresh}" for thresh in [0.0, 0.01, 0.02, 0.03, 0.04, 0.05]],
-        #     index=[0],
-        # )
-        # # set the seed column as the index
-        # results.set_index("seed", inplace=True)
         results = get_result_df(result_path, seed)
         dfs.append(results)