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

Feat: Support latest Jumanji version #1134

Merged
merged 21 commits into from
Dec 6, 2024
Merged

Conversation

WiemKhlifi
Copy link
Contributor

@WiemKhlifi WiemKhlifi commented Nov 11, 2024

What?

Upgrade to the latest Jumanji version of 1.0.1 instead of 0.3.1 and pin to the original and latest Jumanji and Matrax.

How?

  • Change the requirements.txt to use original versions instead of a fork.
  • Adapt all the wrappers and systems to use cached specs similar to jumanji wrappers and envs.

Extra:

  • Note that this PR will be merged after pushing this PR into jumanji for Connector env updates.
  • Note that in some wrappers, since the specs outputs will be cached, some attributes can't be retrieved if defined after the super().__init__(env) ( The self.__getattr__(env,name) in parent class can't get the attribute from env if it's defined with different name in the env wrapper class).
    For example:
# Should work:
super().__init__(env)
self.time_limit = self._env.time_limit 

# Shouldn't work:
super().__init__(env)
self.time_limit = self._env.max_episode_length

Copy link
Collaborator

@RuanJohn RuanJohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this @WiemKhlifi! Just a few questions, but it looks mostly good to me.
As a sanity check can you please do a few test runs to just check that the system performance is unaffected?

mava/configs/env/connector.yaml Show resolved Hide resolved
mava/wrappers/jumanji.py Outdated Show resolved Hide resolved
mava/wrappers/jumanji.py Show resolved Hide resolved
Copy link
Contributor

@sash-a sash-a left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Wiem, couple small things, mostly removing the git stuff from requirements.txt where possible

requirements/requirements.txt Outdated Show resolved Hide resolved
requirements/requirements.txt Outdated Show resolved Hide resolved
requirements/requirements.txt Show resolved Hide resolved
mava/wrappers/jumanji.py Outdated Show resolved Hide resolved
mava/systems/sable/anakin/ff_sable.py Show resolved Hide resolved
mava/systems/sable/anakin/rec_sable.py Show resolved Hide resolved
Copy link
Collaborator

@RuanJohn RuanJohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @WiemKhlifi. Some suggestions from my side.

mava/configs/env/vector-connector.yaml Outdated Show resolved Hide resolved
mava/wrappers/jumanji.py Outdated Show resolved Hide resolved
mava/wrappers/jumanji.py Outdated Show resolved Hide resolved
mava/wrappers/jumanji.py Outdated Show resolved Hide resolved
mava/wrappers/jumanji.py Show resolved Hide resolved
mava/wrappers/jumanji.py Outdated Show resolved Hide resolved
sash-a
sash-a previously approved these changes Dec 3, 2024
Copy link
Contributor

@sash-a sash-a left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Collaborator

@RuanJohn RuanJohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a marl-eval dependency suggestion.

requirements/requirements.txt Outdated Show resolved Hide resolved
Copy link
Collaborator

@RuanJohn RuanJohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🕹️

@WiemKhlifi WiemKhlifi merged commit ae736ff into develop Dec 6, 2024
4 checks passed
@WiemKhlifi WiemKhlifi deleted the feat/update_juamnji branch December 6, 2024 08:57
sash-a pushed a commit that referenced this pull request Dec 13, 2024
Feat: Support latest Jumanji version
sash-a pushed a commit that referenced this pull request Jan 10, 2025
- chore:add git path to marll-eval
- Merge branch develop into feat/update_juamnji
- ci: increase time-out to 10
- chore: set the default aggregate_rewards to True
- chore: cleaning based on review
- Merge branch develop into feat/update_juamnji
- Merge branch develop into feat/update_juamnji
- ci: remove git path from requirements
- fix: use cached action_spec
- revert: add mpe to configs
- chore: pin to latest jumanji now
- Merge branch develop into feat/update_juamnji
- feat: use multi-agent connector instead
- chore: remove uneeded comments
- Merge branch develop into feat/update_juamnji
- chore: remove extra space
- feat: fully support recent jumanji!
- fix: fix connector shape bug
- feat: add cached_prop decorator to all specs
- feat: Remove Maconnector and use connector from main jumanji
- feat: update jumanji version

Co-authored-by: Ruan de Kock <[email protected]>
sash-a pushed a commit that referenced this pull request Jan 10, 2025
- chore:add git path to marll-eval
- Merge branch develop into feat/update_juamnji
- ci: increase time-out to 10
- chore: set the default aggregate_rewards to True
- chore: cleaning based on review
- Merge branch develop into feat/update_juamnji
- Merge branch develop into feat/update_juamnji
- ci: remove git path from requirements
- fix: use cached action_spec
- revert: add mpe to configs
- chore: pin to latest jumanji now
- Merge branch develop into feat/update_juamnji
- feat: use multi-agent connector instead
- chore: remove uneeded comments
- Merge branch develop into feat/update_juamnji
- chore: remove extra space
- feat: fully support recent jumanji!
- fix: fix connector shape bug
- feat: add cached_prop decorator to all specs
- feat: Remove Maconnector and use connector from main jumanji
- feat: update jumanji version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants