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.

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

Pass max_length_time_axis instead of max_size #43

Merged
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
28 changes: 9 additions & 19 deletions flashbax/buffers/flat_buffer.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import warnings
from typing import TYPE_CHECKING, Generic, Optional

from chex import PRNGKey
Expand Down Expand Up @@ -113,24 +112,15 @@ def create_flat_buffer(
add_batch_size=add_batch_size,
)

with warnings.catch_warnings():
warnings.filterwarnings(
"ignore",
message="Setting max_size dynamically sets the `max_length_time_axis` to "
f"be `max_size`//`add_batch_size = {max_length // add_batch_size}`."
"This allows one to control exactly how many transitions are stored in the buffer."
"Note that this overrides the `max_length_time_axis` argument.",
)

buffer = make_trajectory_buffer(
max_length_time_axis=None, # Unused because max_size is specified
min_length_time_axis=min_length // add_batch_size + 1,
add_batch_size=add_batch_size,
sample_batch_size=sample_batch_size,
sample_sequence_length=2,
period=1,
max_size=max_length,
)
buffer = make_trajectory_buffer(
max_length_time_axis=max_length // add_batch_size,
min_length_time_axis=min_length // add_batch_size + 1,
add_batch_size=add_batch_size,
sample_batch_size=sample_batch_size,
sample_sequence_length=2,
period=1,
max_size=None,
)

add_fn = buffer.add

Expand Down
32 changes: 11 additions & 21 deletions flashbax/buffers/prioritised_flat_buffer.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import warnings
from typing import TYPE_CHECKING, Optional

from chex import PRNGKey
Expand Down Expand Up @@ -100,26 +99,17 @@ def make_prioritised_flat_buffer(
if not validate_device(device):
device = "cpu"

with warnings.catch_warnings():
warnings.filterwarnings(
"ignore",
message="Setting max_size dynamically sets the `max_length_time_axis` to "
f"be `max_size`//`add_batch_size = {max_length // add_batch_size}`."
"This allows one to control exactly how many transitions are stored in the buffer."
"Note that this overrides the `max_length_time_axis` argument.",
)

buffer = make_prioritised_trajectory_buffer(
max_length_time_axis=None, # Unused because max_size is specified
min_length_time_axis=min_length // add_batch_size + 1,
add_batch_size=add_batch_size,
sample_batch_size=sample_batch_size,
sample_sequence_length=2,
period=1,
max_size=max_length,
priority_exponent=priority_exponent,
device=device,
)
buffer = make_prioritised_trajectory_buffer(
max_length_time_axis=max_length // add_batch_size,
min_length_time_axis=min_length // add_batch_size + 1,
add_batch_size=add_batch_size,
sample_batch_size=sample_batch_size,
sample_sequence_length=2,
period=1,
max_size=None,
priority_exponent=priority_exponent,
device=device,
)

add_fn = buffer.add

Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ filterwarnings = [
"error",
"ignore:`sample_sequence_length` greater than `min_length_time_axis`:UserWarning:flashbax",
"ignore:Setting period greater than sample_sequence_length will result in no overlap betweentrajectories:UserWarning:flashbax",
"ignore:Setting max_size dynamically sets the `max_length_time_axis` to be `max_size`//`add_batch_size = .*`:UserWarning:flashbax",
"ignore:jax.tree_map is deprecated:DeprecationWarning:flashbax",
]

Expand Down
Loading