Skip to content

Nicolas #5

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.

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/Diff-Control.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions Diff-Control/BCZ_LSTM_engine.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
import argparse
import logging
import os
import numpy as np
import torch
import torch.nn as nn
from einops import rearrange, repeat
import clip
from model import BCZ_LSTM
from dataset.lid_pick_and_place import *
from dataset.tomato_pick_and_place import *
from dataset.pick_duck import *
from dataset.drum_hit import *
from optimizer import build_optimizer
from optimizer import build_lr_scheduler
from torch.utils.tensorboard import SummaryWriter
import copy
import time
import random
import pickle
import torch.optim as optim

Expand Down
13 changes: 1 addition & 12 deletions Diff-Control/BCZ_engine.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
import argparse
import logging
import os
import numpy as np
import torch
import torch.nn as nn
from einops import rearrange, repeat
import clip
from model import ModAttn_ImageBC
from dataset import UR5_dataloader
#from dataset import UR5_dataloader
from dataset.lid_pick_and_place import *
from dataset.tomato_pick_and_place import *
from dataset.pick_duck import *
from dataset.drum_hit import *
from optimizer import build_optimizer
from optimizer import build_lr_scheduler
from torch.utils.tensorboard import SummaryWriter
import copy
import time
import random
import pickle
import torch.optim as optim

Expand Down
2 changes: 2 additions & 0 deletions Diff-Control/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@
cfg.test.eigen_crop = False # crops according to Eigen NIPS14
cfg.test.garg_crop = False # crops according to Garg ECCV16



cfg.network = CN()
cfg.network.name = "alpha-MDF"
cfg.network.encoder = ""
Expand Down
10 changes: 5 additions & 5 deletions Diff-Control/config/duck_controlnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ train:
input_size_2: ''
input_size_3: ''
data_path: [
'/tf/datasets/pick_duck/pick_duck_1',
'/tf/datasets/pick_duck/pick_duck_2',
'/home/ssdArray/datasets/diff_control_data/pick_duck/pick_duck_1',
'/home/ssdArray/datasets/diff_control_data/pick_duck/pick_duck_2'
]
batch_size: 64
num_epochs: 1000
Expand All @@ -45,16 +45,16 @@ test:
win_size: 24
model_name: 'duck_controlnet'
data_path: [
'/tf/datasets/pick_duck/pick_duck_1',
'/home/ssdArray/datasets/diff_control_data/pick_duck/pick_duck_2'
]
sensor_len: 2
channel_img_1: 3
channel_img_2: ''
input_size_1: 77
input_size_2: ''
input_size_3: ''
checkpoint_path_1: './experiments/duck_model/ema-model-98000'
checkpoint_path_2: './experiments/duck_model/sensor_model-98000'
checkpoint_path_1: './experiments/duck_diffusion/v1.0-ema-model-19600'
checkpoint_path_2: './experiments/duck_diffusion/v1.0-sensor_model-19600'
dataset: 'Duck'
optim:
optim: 'adamw'
Expand Down
6 changes: 3 additions & 3 deletions Diff-Control/config/duck_diffusion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ train:
input_size_2: ''
input_size_3: ''
data_path: [
'/tf/datasets/pick_duck/pick_duck_1',
'/tf/datasets/pick_duck/pick_duck_2',
'/home/ssdArray/datasets/diff_control_data/pick_duck/pick_duck_1',
'/home/ssdArray/datasets/diff_control_data/pick_duck/pick_duck_2'
]
batch_size: 64
num_epochs: 3000
Expand All @@ -45,7 +45,7 @@ test:
win_size: 24
model_name: 'duck_diffusion'
data_path: [
'/tf/datasets/pick_duck/pick_duck_2',
'/home/ssdArray/datasets/diff_control_data/pick_duck/pick_duck_2'
]
sensor_len: 2
channel_img_1: 3
Expand Down
108 changes: 108 additions & 0 deletions Diff-Control/config/pusht_diffusion.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
mode:
mode: 'train'
model_zoo: 'diffusion-model'
multiprocessing_distributed: False
dist_url: tcp://127.0.0.1:2345
num_threads: 1
do_online_eval: True
parameter_path: ''
train:
dim_x: 10
dim_z: ''
dim_a: 10
dim_gt: 10
num_ensemble: 32
win_size: 24
seed: 0
model_name: 'pusht_diffusion'
dataset: 'PushTDataset'
sensor_len: 2
channel_img_1: 3
channel_img_2: ''
input_size_1: 77
input_size_2: ''
input_size_3: ''
#data_path: [
# '/home/ssdArray/datasets/diff_control_data/pick_duck/pick_duck_1',
# '/home/ssdArray/datasets/diff_control_data/pick_duck/pick_duck_2'
#]
#data_path: /home/ssdArray/datasets/diffusion_policy_data/robomimic/robomimic/datasets/square/ph/image_abs.hdf5
data_path: /home/nicolasl/diffusion_imitation_learning/diffusion_policy/data/pusht/pusht_cchi_v7_replay.zarr
batch_size: 64
num_epochs: 3000
learning_rate: 1e-4
weight_decay: 1e-6
adam_eps: 1e-3
log_freq: 10
eval_freq: 50
save_freq: 50
log_directory: './experiments'
loss: 'mse'
task:
dataset:
_target_: diffusion_policy.dataset.pusht_image_dataset.PushTImageDataset
horizon: 24 # was 16
max_train_episodes: 90
pad_after: 7
pad_before: 1
seed: 42
val_ratio: 0.02
zarr_path: data/pusht/pusht_cchi_v7_replay.zarr
env_runner:
_target_: diffusion_policy.env_runner.pusht_image_runner_diff_ctrl.PushTImageRunnerDiffCtrl
fps: 10
legacy_test: true
max_steps: 300
n_action_steps: 8
n_envs: null
n_obs_steps: 2
n_test: 50
n_test_vis: 4
n_train: 6
n_train_vis: 2
past_action: false
test_start_seed: 100000
train_start_seed: 0
image_shape:
- 3
- 96
- 96
name: pusht_image
shape_meta:
action:
shape:
- 2
obs:
agent_pos:
shape:
- 2
type: low_dim
image:
shape:
- 3
- 96
- 96
type: rgb
test:
dim_x: 10
dim_z: ''
dim_a: 10
dim_gt: 10
num_ensemble: 32
win_size: 24
model_name: 'pusht_diffusion'
data_path: [
'/home/ssdArray/datasets/diff_control_data/pick_duck/pick_duck_2'
]
sensor_len: 2
channel_img_1: 3
channel_img_2: ''
input_size_1: 77
input_size_2: ''
input_size_3: ''
checkpoint_path_1: ''
checkpoint_path_2: ''
dataset: 'PushTDataset'
optim:
optim: 'adamw'
lr_scheduler: 'polynomial_decay'
Loading