Skip to content

update to pytorch 1.0 #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manuelli merged 1 commit into from
Jun 26, 2019
Merged

update to pytorch 1.0 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@ trained_models
*.jupyter
*.nv
*.ssh/
data
data
build
sandbox
tmp
scratch
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "pytorch-segmentation-detection"]
path = pytorch-segmentation-detection
path = external/pytorch-segmentation-detection
url = https://github.com/warmspringwinds/pytorch-segmentation-detection.git
4 changes: 4 additions & 0 deletions config/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ iiwa-2:
manuelli:
cuda_visible_devices: [] # this means use all gpus

iiwa-workstation:
manulli:
cuda_visible_devices: [0]

2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/4_shoes_all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- shoe_brown_boot.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/baymax_1_train.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- baymax_1_train.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/baymax_front_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- baymax_front.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/baymax_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- baymax.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/brown_boot_shoe_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- shoe_brown_boot.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/caterpillar_baymax.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- caterpillar_17_scenes.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/caterpillar_baymax_starbot_all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- caterpillar_9_train.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/caterpillar_baymax_starbot_all_front.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- caterpillar_9_train.yaml
Expand Down
2 changes: 1 addition & 1 deletion ...se_correspondence/dataset/composite/caterpillar_baymax_starbot_all_front_single_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- caterpillar_9_train.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/caterpillar_baymax_starbot_onlymulti.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files: []

Expand Down
2 changes: 1 addition & 1 deletion ...ig/dense_correspondence/dataset/composite/caterpillar_baymax_starbot_onlymulti_front.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files: []

Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/caterpillar_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- caterpillar_17_scenes.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/caterpillar_only_9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- caterpillar_9_train.yaml
Expand Down
6 changes: 6 additions & 0 deletions config/dense_correspondence/dataset/composite/caterpillar_single_scene_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
logs_root_path: code/data_volume/pdc/logs_test

single_object_scenes_config_files:
- caterpillar_single_scene_test.yaml

multi_object_scenes_config_files: []
6 changes: 6 additions & 0 deletions config/dense_correspondence/dataset/composite/caterpillar_upright.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
logs_root_path: logs_proto

single_object_scenes_config_files:
- caterpillar_upright.yaml

multi_object_scenes_config_files: []
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/entire_dataset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- entire_dataset.yaml # this also contains multi-object-scenes, but keeps in one file
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/gray_nike_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- shoe_gray_nike.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/green_nike_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- shoe_green_nike.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/hat_mit_black_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- hat_mit_black.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/hat_mit_red_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- hat_mit_red.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/hat_princeton_orange_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- hat_princeton_orange.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/hat_train_6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- hat_banjo_camp_north.yaml
Expand Down
4 changes: 3 additions & 1 deletion config/dense_correspondence/dataset/composite/mugs_all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- mugs.yaml
- white_plastic_mug.yaml
- blue_plastic_mug.yaml

multi_object_scenes_config_files: []
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/red_bowl_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- red_bowl.yaml
Expand Down
4 changes: 2 additions & 2 deletions config/dense_correspondence/dataset/composite/red_nike_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- shoe_red_nike.yaml

multi_object_scenes_config_files:
- "code/data_volume/pdc/evaluation_labeled_data/shoe_red_nike.yaml"
- "evaluation_labeled_data/shoe_red_nike.yaml"

6 changes: 6 additions & 0 deletions config/dense_correspondence/dataset/composite/shoe_train_1_brown_boot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
logs_root_path: code/data_volume/pdc/logs_proto

single_object_scenes_config_files:
- shoe_brown_boot.yaml

multi_object_scenes_config_files: []
6 changes: 6 additions & 0 deletions config/dense_correspondence/dataset/composite/shoe_train_1_gray_nike.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
logs_root_path: code/data_volume/pdc/logs_proto

single_object_scenes_config_files:
- shoe_gray_nike.yaml

multi_object_scenes_config_files: []
6 changes: 6 additions & 0 deletions config/dense_correspondence/dataset/composite/shoe_train_1_green_nike.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
logs_root_path: code/data_volume/pdc/logs_proto

single_object_scenes_config_files:
- shoe_green_nike.yaml

multi_object_scenes_config_files: []
6 changes: 6 additions & 0 deletions config/dense_correspondence/dataset/composite/shoe_train_1_red_nike.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
logs_root_path: code/data_volume/pdc/logs_proto

single_object_scenes_config_files:
- shoe_red_nike.yaml

multi_object_scenes_config_files: []
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/shoe_train_4_shoes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- shoe_brown_boot.yaml
Expand Down
16 changes: 16 additions & 0 deletions config/dense_correspondence/dataset/composite/shoe_train_all_shoes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
logs_root_path: logs_proto

single_object_scenes_config_files:
- shoe_gray_nike.yaml
- shoe_green_nike_close_up.yaml
- shoe_red_nike_close_up.yaml
- shoe_green_nike.yaml
- shoe_fashion_or_sport_white.yaml
- shoe_red_nike.yaml
- shoe_brown_boot.yaml
- shoe_globalwin_light_brown.yaml
- shoe_tesla_maroon.yaml
- shoe_globalwin_blue_grey.yaml
- shoe_tall_brown_boot.yaml

multi_object_scenes_config_files: []
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/shoes_all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- shoes.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/six_objects_and_multi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- caterpillar_17_scenes.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/star_bot_front_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- star_bot_front.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/star_bot_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- star_bot.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/composite/starbot_1_train.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto

single_object_scenes_config_files:
- starbot_1_train.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/multi_object/4_shoes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto
object_id_list: ["shoe_gray_nike", "shoe_green_nike", "shoe_red_nike", "shoe_brown_boot"]
train:
- "2018-05-17-00-46-45"
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/multi_object/caterpillar_baymax_starbot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto
object_id_list: ["star_bot", "caterpillar", "baymax"]
train:
- "2018-05-04-20-12-25"
Expand Down
4 changes: 2 additions & 2 deletions config/dense_correspondence/dataset/multi_object/caterpillar_baymax_starbot_front_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto
object_id_list: ["star_bot", "caterpillar", "baymax"]
train:
- "2018-05-04-20-12-25" # singulated (mostly)
Expand All @@ -22,4 +22,4 @@ test:
- "2018-05-04-20-22-22"
- "2018-05-04-20-35-49"
evaluation_labeled_data_path:
- "code/data_volume/pdc/evaluation_labeled_data/caterpillar_starbot_baymax_multi_cross_scene_labels.yaml"
- "evaluation_labeled_data/caterpillar_starbot_baymax_multi_cross_scene_labels.yaml"
4 changes: 2 additions & 2 deletions config/dense_correspondence/dataset/multi_object/multi_object.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto
train:
- "2018-04-24-18-10-31"
- "2018-04-24-18-14-35"
Expand All @@ -12,4 +12,4 @@ test:
- "2018-04-24-18-33-20"
- "2018-04-24-18-36-29"
evaluation_labeled_data_path:
- "code/data_volume/pdc/evaluation_labeled_data/caterpillar_cross_scene_labels.yaml"
- "evaluation_labeled_data/caterpillar_cross_scene_labels.yaml"
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/single_object/10_caterpillar_scenes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto
object_id: "caterpillar"
train:
- "2018-04-10-16-02-59"
Expand Down
2 changes: 1 addition & 1 deletion config/dense_correspondence/dataset/single_object/10_drill_scenes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto
object_id: "drill"
train:
- "05_drill_long_downsampled"
Expand Down
4 changes: 2 additions & 2 deletions config/dense_correspondence/dataset/single_object/baymax.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto
object_id: "baymax"
train:
- "2018-04-24-17-16-40"
Expand All @@ -13,4 +13,4 @@ test:
- "2018-04-24-17-40-34"
- "2018-04-24-17-42-27"
evaluation_labeled_data_path:
- "code/data_volume/pdc/evaluation_labeled_data/baymax_cross_scene_labels.yaml"
- "evaluation_labeled_data/baymax_cross_scene_labels.yaml"
4 changes: 2 additions & 2 deletions config/dense_correspondence/dataset/single_object/baymax_1_train.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
logs_root_path: code/data_volume/pdc/logs_proto
logs_root_path: logs_proto
object_id: "baymax"
train:
- "2018-04-24-17-16-40"
test:
- "2018-04-24-17-40-34"
- "2018-04-24-17-42-27"
evaluation_labeled_data_path:
- "code/data_volume/pdc/evaluation_labeled_data/baymax_cross_scene_labels.yaml"
- "evaluation_labeled_data/baymax_cross_scene_labels.yaml"
4 changes: 2 additions & 2 deletions config/dense_correspondence/dataset/single_object/baymax_front.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
qlogs_root_path: code/data_volume/pdc/logs_proto
qlogs_root_path: logs_proto
object_id: "baymax"
train:
- "2018-04-24-17-16-40" # head pointed down left
Expand All @@ -13,4 +13,4 @@ test:
- "2018-04-24-17-42-27" # head pointed up and right
- "2018-04-24-17-30-08" # head pointed down
evaluation_labeled_data_path:
- "code/data_volume/pdc/evaluation_labeled_data/baymax_front_cross_scene_labels.yaml"
- "evaluation_labeled_data/baymax_front_cross_scene_labels.yaml"
Loading