Merge branch 'main' of github.com:MarkFzp/act-plus-plus into main

这个提交包含在:
Zipeng Fu
2023-10-25 21:56:24 -07:00
当前提交 3474cc38e7
共有 2 个文件被更改,包括 26 次插入 和 5 次删除

查看文件

@ -404,7 +404,7 @@ def train_bc(train_dataloader, val_dataloader, config):
summary_string += f'{k}: {v.item():.3f} '
print(summary_string)
if epoch % 100 == 0:
if epoch % 1000 == 0:
ckpt_path = os.path.join(ckpt_dir, f'policy_epoch_{epoch}_seed_{seed}.ckpt')
torch.save(policy.state_dict(), ckpt_path)
plot_history(train_history, validation_history, epoch, ckpt_dir, seed)

查看文件

@ -28,7 +28,9 @@ class EpisodicDataset(torch.utils.data.Dataset):
with h5py.File(dataset_path, 'r') as root:
is_sim = root.attrs['sim']
if '/base_action' in root:
action = np.concatenate([root['/action'][()], root['/base_action'][()]], axis=-1)
base_action = root['/base_action'][()]
base_action = preprocess_base_action(base_action)
action = np.concatenate([root['/action'][()], base_action], axis=-1)
else:
action = root['/action'][()]
original_action_shape = action.shape
@ -89,7 +91,9 @@ def get_norm_stats(dataset_dir, num_episodes):
with h5py.File(dataset_path, 'r') as root:
qpos = root['/observations/qpos'][()]
qvel = root['/observations/qvel'][()]
action = np.concatenate([root['/action'][()], root['/base_action'][()]], axis=-1)
base_action = root['/base_action'][()]
base_action = preprocess_base_action(base_action)
action = np.concatenate([root['/action'][()], base_action], axis=-1)
except:
print(f'Error loading {dataset_path}')
quit()
@ -130,11 +134,28 @@ def load_data(dataset_dir, num_episodes, camera_names, batch_size_train, batch_s
# construct dataset and dataloader
train_dataset = EpisodicDataset(train_indices, dataset_dir, camera_names, norm_stats)
val_dataset = EpisodicDataset(val_indices, dataset_dir, camera_names, norm_stats)
train_dataloader = DataLoader(train_dataset, batch_size=batch_size_train, shuffle=True, pin_memory=True, num_workers=1, prefetch_factor=1)
val_dataloader = DataLoader(val_dataset, batch_size=batch_size_val, shuffle=True, pin_memory=True, num_workers=1, prefetch_factor=1)
train_dataloader = DataLoader(train_dataset, batch_size=batch_size_train, shuffle=True, pin_memory=True, num_workers=1, prefetch_factor=1, persistent_workers=True)
val_dataloader = DataLoader(val_dataset, batch_size=batch_size_val, shuffle=True, pin_memory=True, num_workers=1, prefetch_factor=1, persistent_workers=True)
return train_dataloader, val_dataloader, norm_stats, train_dataset.is_sim
def calibrate_linear_vel(base_action):
c = 0.19
v = base_action[:, 0]
w = base_action[:, 1]
base_action[:, 0] = v - c * w
return base_action
def smooth_base_action(base_action):
return np.stack([
np.convolve(base_action[:, i], np.ones(20)/20, mode='same') for i in range(base_action.shape[1])
], axis=-1, dtype=np.float32)
def preprocess_base_action(base_action):
base_action = calibrate_linear_vel(base_action)
base_action = smooth_base_action(base_action)
return base_action
### env utils