Skip to content

Commit

Permalink
Improve logging paths
Browse files Browse the repository at this point in the history
  • Loading branch information
nepfaff committed Oct 17, 2023
1 parent 8c11128 commit b902dd6
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 47 deletions.
45 changes: 25 additions & 20 deletions experiments/icra/interaction_pushing/experiments.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,84 +6,89 @@ PREFIX="icra"
# Anvil onto dumbell
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_dumbell_sept/",
"~/representation_collections/representation_collection_anvil_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_dumbell_sept/",
"/home/gridsan/npfaff/representation_collections/representation_collection_anvil_sept/"
]' \
--experiment_description experiments/icra/interaction_pushing/anvil_onto_dumbell.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/dumbell",
"~/coacd_vhacd_mesh_pieces/anvil"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/dumbell",
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/anvil"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/interaction_pushing_anvil_onto_dumbell_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_interaction_pushing_anvil_onto_dumbell_${RUN_NUMBER}

# Mustard onto tomato
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_mustard_ring3_nerfstudio_sept/",
"~/representation_collections/representation_collection_tomato_can_nerfstudio_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_mustard_ring3_nerfstudio_sept/",
"/home/gridsan/npfaff/representation_collections/representation_collection_tomato_can_nerfstudio_sept/"
]' \
--experiment_description experiments/icra/interaction_pushing/mustard_onto_tomato.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/mustard",
"~/coacd_vhacd_mesh_pieces/tomato"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/mustard",
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/tomato"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/interaction_pushing_mustard_onto_tomato_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_interaction_pushing_mustard_onto_tomato_${RUN_NUMBER}

# Spam onto anvil
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_spam_sept/",
"~/representation_collections/representation_collection_anvil_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_spam_sept/",
"/home/gridsan/npfaff/representation_collections/representation_collection_anvil_sept/"
]' \
--experiment_description experiments/icra/interaction_pushing/spam_onto_anvil.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/spam",
"~/coacd_vhacd_mesh_pieces/anvil"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/spam",
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/anvil"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/interaction_pushing_spam_onto_anvil_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_interaction_pushing_spam_onto_anvil_${RUN_NUMBER}

# Spam onto mustard
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_spam_sept/",
"~/representation_collections/representation_collection_mustard_ring3_nerfstudio_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_spam_sept/",
"/home/gridsan/npfaff/representation_collections/representation_collection_mustard_ring3_nerfstudio_sept/"
]' \
--experiment_description experiments/icra/interaction_pushing/spam_onto_mustard.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/spam",
"~/coacd_vhacd_mesh_pieces/mustard"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/spam",
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/mustard"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/interaction_pushing_spam_onto_mustard_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_interaction_pushing_spam_onto_mustard_${RUN_NUMBER}

# Tomato onto hammer
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_tomato_can_nerfstudio_sept/",
"~/representation_collections/representation_collection_hammer_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_tomato_can_nerfstudio_sept/",
"/home/gridsan/npfaff/representation_collections/representation_collection_hammer_sept/"
]' \
--experiment_description experiments/icra/interaction_pushing/tomato_onto_hammer.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/tomato",
"~/coacd_vhacd_mesh_pieces/hammer"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/tomato",
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/hammer"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/interaction_pushing_tomato_onto_hammer_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_interaction_pushing_tomato_onto_hammer_${RUN_NUMBER}
30 changes: 18 additions & 12 deletions experiments/icra/planar_pushing/experiments.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,89 +6,95 @@ PREFIX="icra"
# Mustard
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_mustard_ring3_nerfstudio_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_mustard_ring3_nerfstudio_sept/"
]' \
--experiment_description experiments/icra/planar_pushing/mustard_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/mustard"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/mustard"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/planar_pushing_mustard_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_planar_pushing_mustard_${RUN_NUMBER}

# Tomato
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_tomato_can_nerfstudio_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_tomato_can_nerfstudio_sept/"
]' \
--experiment_description experiments/icra/planar_pushing/tomato_can_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/tomato"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/tomato"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/planar_pushing_tomato_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_planar_pushing_tomato_${RUN_NUMBER}

# Anvil
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_anvil_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_anvil_sept/"
]' \
--experiment_description experiments/icra/planar_pushing/anvil_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/anvil"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/anvil"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/planar_pushing_anvil_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_planar_pushing_anvil_${RUN_NUMBER}

# Dumbell
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_dumbell_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_dumbell_sept/"
]' \
--experiment_description experiments/icra/planar_pushing/dumbell_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/dumbell"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/dumbell"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/planar_pushing_dumbell_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_planar_pushing_dumbell_${RUN_NUMBER}

# Hammer
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_hammer_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_hammer_sept/"
]' \
--experiment_description experiments/icra/planar_pushing/hammer_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/hammer"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/hammer"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/planar_pushing_hammer_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_planar_pushing_hammer_${RUN_NUMBER}

# Spam
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_spam_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_spam_sept/"
]' \
--experiment_description experiments/icra/planar_pushing/spam_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/spam"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/spam"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/planar_pushing_spam_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_planar_pushing_spam_${RUN_NUMBER}
30 changes: 18 additions & 12 deletions experiments/icra/table_pid/experiments.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,89 +6,95 @@ PREFIX="icra"
# Mustard
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_mustard_ring3_nerfstudio_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_mustard_ring3_nerfstudio_sept/"
]' \
--experiment_description experiments/icra/table_pid/mustard_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/mustard"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/mustard"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/table_pid_mustard_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_table_pid_mustard_${RUN_NUMBER}

# Tomato
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_tomato_can_nerfstudio_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_tomato_can_nerfstudio_sept/"
]' \
--experiment_description experiments/icra/table_pid/tomato_can_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/tomato"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/tomato"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/table_pid_tomato_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_table_pid_tomato_${RUN_NUMBER}

# Anvil
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_anvil_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_anvil_sept/"
]' \
--experiment_description experiments/icra/table_pid/anvil_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/anvil"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/anvil"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/table_pid_anvil_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_table_pid_anvil_${RUN_NUMBER}

# Dumbell
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_dumbell_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_dumbell_sept/"
]' \
--experiment_description experiments/icra/table_pid/dumbell_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/dumbell"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/dumbell"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/table_pid_dumbell_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_table_pid_dumbell_${RUN_NUMBER}

# Hammer
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_hammer_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_hammer_sept/"
]' \
--experiment_description experiments/icra/table_pid/hammer_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/hammer"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/hammer"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/table_pid_hammer_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_table_pid_hammer_${RUN_NUMBER}

# Spam
python scripts/evaluate_primitive_representation_collection.py \
--paths '[
"~/representation_collections/representation_collection_spam_sept/"
"/home/gridsan/npfaff/representation_collections/representation_collection_spam_sept/"
]' \
--experiment_description experiments/icra/table_pid/spam_raw_tsdf_vs_spheres_equation_error.yaml \
--eval_contact_model \
--additional_collision_geometries_mesh_pieces_paths '[
"~/coacd_vhacd_mesh_pieces/spam"
"/home/gridsan/npfaff/coacd_vhacd_mesh_pieces/spam"
]' \
--num_trajectory_iou_samples 0 \
--include_gt \
--wandb_mode "offline" \
--logging_path "/home/gridsan/npfaff/sim2sim/logs/table_pid_spam_${RUN_NUMBER}" \
--wandb_name ${PREFIX}_table_pid_spam_${RUN_NUMBER}
5 changes: 2 additions & 3 deletions scripts/supercloud.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ source /etc/profile
module load anaconda/2022b
module load gurobi/gurobi-1000

cd sim2sim
. sim2sim_env/bin/activate

# Dummy run to compile everything
python scripts/run_experiment.py \
python ./scripts/run_experiment.py \
--experiment_description experiments/planar_pushing/box/mustard_raw_tsdf_vs_spheres_equation_error.yaml

# Actual experiments
bash scripts/experiments.sh 0
bash ./scripts/experiments.sh 9

0 comments on commit b902dd6

Please sign in to comment.