Skip to content
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

Jump to bottom

fix demo exmample for init replay buffer error #57

Merged
merged 1 commit into from
Jun 7, 2024
Merged

fix demo exmample for init replay buffer error #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 10 additions & 14 deletions examples/async_bin_relocation_fwbw_drq/async_drq_randomized.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,17 @@ def update_params_bw(params):
##############################################################################


def learner(rng, agent: DrQAgent, replay_buffer, demo_buffer, wandb_logger=None):
def learner(rng, agent: DrQAgent, replay_buffer, demo_buffer):
"""
The learner loop, which runs when "--learner" is set to True.
"""
# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)

# To track the step in the training loop
update_steps = 0
env_steps = 0
Expand Down Expand Up @@ -496,24 +503,14 @@ def main(_):
jax.tree_map(jnp.array, agent), sharding.replicate()
)

def create_replay_buffer_and_wandb_logger():
if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer = MemoryEfficientReplayBufferDataStore(
env.observation_space,
env.action_space,
capacity=FLAGS.replay_buffer_capacity,
image_keys=image_keys,
)
# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev_fwbw",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)
return replay_buffer, wandb_logger

if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer, wandb_logger = create_replay_buffer_and_wandb_logger()
demo_buffer = MemoryEfficientReplayBufferDataStore(
env.observation_space,
env.action_space,
Expand All @@ -535,7 +532,6 @@ def create_replay_buffer_and_wandb_logger():
agent,
replay_buffer,
demo_buffer=demo_buffer,
wandb_logger=wandb_logger,
)

elif FLAGS.actor:
Expand Down
24 changes: 10 additions & 14 deletions examples/async_cable_route_drq/async_drq_randomized.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,17 @@ def update_params(params):
##############################################################################


def learner(rng, agent: DrQAgent, replay_buffer, demo_buffer, wandb_logger=None):
def learner(rng, agent: DrQAgent, replay_buffer, demo_buffer):
"""
The learner loop, which runs when "--learner" is set to True.
"""
# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)

# To track the step in the training loop
update_steps = 0

Expand Down Expand Up @@ -366,24 +373,14 @@ def main(_):
jax.tree_map(jnp.array, agent), sharding.replicate()
)

def create_replay_buffer_and_wandb_logger():
if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer = MemoryEfficientReplayBufferDataStore(
env.observation_space,
env.action_space,
capacity=FLAGS.replay_buffer_capacity,
image_keys=image_keys,
)
# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)
return replay_buffer, wandb_logger

if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer, wandb_logger = create_replay_buffer_and_wandb_logger()
demo_buffer = MemoryEfficientReplayBufferDataStore(
env.observation_space,
env.action_space,
Expand All @@ -409,7 +406,6 @@ def create_replay_buffer_and_wandb_logger():
agent,
replay_buffer,
demo_buffer=demo_buffer,
wandb_logger=wandb_logger,
)

elif FLAGS.actor:
Expand Down
32 changes: 13 additions & 19 deletions examples/async_drq_sim/async_drq_sim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,17 @@ def learner(
agent: DrQAgent,
replay_buffer: MemoryEfficientReplayBufferDataStore,
demo_buffer: Optional[MemoryEfficientReplayBufferDataStore] = None,
wandb_logger=None,
):
"""
The learner loop, which runs when "--learner" is set to True.
"""
# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)

# To track the step in the training loop
update_steps = 0

Expand Down Expand Up @@ -333,7 +339,8 @@ def main(_):
jax.tree_map(jnp.array, agent), sharding.replicate()
)

def create_replay_buffer_and_wandb_logger():
if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer = make_replay_buffer(
env,
capacity=FLAGS.replay_buffer_capacity,
Expand All @@ -342,18 +349,6 @@ def create_replay_buffer_and_wandb_logger():
image_keys=image_keys,
)

# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)
return replay_buffer, wandb_logger

if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer, wandb_logger = create_replay_buffer_and_wandb_logger()

print_green("replay buffer created")
print_green(f"replay_buffer size: {len(replay_buffer)}")

Expand All @@ -368,10 +363,10 @@ def preload_data_transform(data, metadata) -> Optional[Dict[str, Any]]:
# This default does nothing
return data

demo_buffer = MemoryEfficientReplayBufferDataStore(
env.observation_space,
env.action_space,
capacity=10000,
demo_buffer = make_replay_buffer(
env,
capacity=FLAGS.replay_buffer_capacity,
type="memory_efficient_replay_buffer",
image_keys=image_keys,
preload_rlds_path=FLAGS.preload_rlds_path,
preload_data_transform=preload_data_transform,
Expand All @@ -398,7 +393,6 @@ def preload_data_transform(data, metadata) -> Optional[Dict[str, Any]]:
agent,
replay_buffer,
demo_buffer=demo_buffer, # None if no demo data is provided
wandb_logger=wandb_logger,
)

elif FLAGS.actor:
Expand Down
24 changes: 10 additions & 14 deletions examples/async_pcb_insert_drq/async_drq_randomized.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,17 @@ def update_params(params):
##############################################################################


def learner(rng, agent: DrQAgent, replay_buffer, demo_buffer, wandb_logger=None):
def learner(rng, agent: DrQAgent, replay_buffer, demo_buffer):
"""
The learner loop, which runs when "--learner" is set to True.
"""
# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)

# To track the step in the training loop
update_steps = 0
global PAUSE_EVENT_FLAG
Expand Down Expand Up @@ -436,24 +443,14 @@ def main(_):
jax.tree_map(jnp.array, agent), sharding.replicate()
)

def create_replay_buffer_and_wandb_logger():
if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer = MemoryEfficientReplayBufferDataStore(
env.observation_space,
env.action_space,
capacity=FLAGS.replay_buffer_capacity,
image_keys=image_keys,
)
# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)
return replay_buffer, wandb_logger

if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer, wandb_logger = create_replay_buffer_and_wandb_logger()
demo_buffer = MemoryEfficientReplayBufferDataStore(
env.observation_space,
env.action_space,
Expand All @@ -475,7 +472,6 @@ def create_replay_buffer_and_wandb_logger():
agent,
replay_buffer,
demo_buffer=demo_buffer,
wandb_logger=wandb_logger,
)

elif FLAGS.actor:
Expand Down
24 changes: 10 additions & 14 deletions examples/async_peg_insert_drq/async_drq_randomized.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,17 @@ def update_params(params):
##############################################################################


def learner(rng, agent: DrQAgent, replay_buffer, demo_buffer, wandb_logger=None):
def learner(rng, agent: DrQAgent, replay_buffer, demo_buffer):
"""
The learner loop, which runs when "--learner" is set to True.
"""
# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)

# To track the step in the training loop
update_steps = 0

Expand Down Expand Up @@ -344,24 +351,14 @@ def main(_):
jax.tree_map(jnp.array, agent), sharding.replicate()
)

def create_replay_buffer_and_wandb_logger():
if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer = MemoryEfficientReplayBufferDataStore(
env.observation_space,
env.action_space,
capacity=FLAGS.replay_buffer_capacity,
image_keys=image_keys,
)
# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)
return replay_buffer, wandb_logger

if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer, wandb_logger = create_replay_buffer_and_wandb_logger()
demo_buffer = MemoryEfficientReplayBufferDataStore(
env.observation_space,
env.action_space,
Expand All @@ -383,7 +380,6 @@ def create_replay_buffer_and_wandb_logger():
agent,
replay_buffer,
demo_buffer=demo_buffer,
wandb_logger=wandb_logger,
)

elif FLAGS.actor:
Expand Down
25 changes: 10 additions & 15 deletions examples/async_sac_state_sim/async_sac_state_sim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,17 @@ def update_params(params):
##############################################################################


def learner(rng, agent: SACAgent, replay_buffer, replay_iterator, wandb_logger=None):
def learner(rng, agent: SACAgent, replay_buffer, replay_iterator):
"""
The learner loop, which runs when "--learner" is set to True.
"""
# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)

# To track the step in the training loop
update_steps = 0

Expand Down Expand Up @@ -266,26 +273,15 @@ def main(_):
jax.tree_map(jnp.array, agent), sharding.replicate()
)

def create_replay_buffer_and_wandb_logger():
if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer = make_replay_buffer(
env,
capacity=FLAGS.replay_buffer_capacity,
rlds_logger_path=FLAGS.log_rlds_path,
type="replay_buffer",
preload_rlds_path=FLAGS.preload_rlds_path,
)

# set up wandb and logging
wandb_logger = make_wandb_logger(
project="serl_dev",
description=FLAGS.exp_name or FLAGS.env,
debug=FLAGS.debug,
)
return replay_buffer, wandb_logger

if FLAGS.learner:
sampling_rng = jax.device_put(sampling_rng, device=sharding.replicate())
replay_buffer, wandb_logger = create_replay_buffer_and_wandb_logger()
replay_iterator = replay_buffer.get_iterator(
sample_args={
"batch_size": FLAGS.batch_size * FLAGS.utd_ratio,
Expand All @@ -299,7 +295,6 @@ def create_replay_buffer_and_wandb_logger():
agent,
replay_buffer,
replay_iterator=replay_iterator,
wandb_logger=wandb_logger,
)

elif FLAGS.actor:
Expand Down
Loading