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

Develop #140

Merged
merged 37 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
71570b5
Rename ManualTrainer to StepTrainer
Toni-SM Aug 20, 2023
536304b
Update CHANGELOG
Toni-SM Aug 22, 2023
c73421b
Increase MINOR version
Toni-SM Aug 22, 2023
a97cf38
Add StepTrainer to docs and apply the corresponding changes
Toni-SM Aug 30, 2023
2ee77be
Update multi-agent annotation type for dictionaries
Toni-SM Aug 31, 2023
721f025
Update agent annotation type for dictionaries
Toni-SM Sep 2, 2023
bade6d5
Remove model's internal dictionaries for shared model implementation
Toni-SM Sep 19, 2023
7703f94
Add multi-categorical model mixin in torch
Toni-SM Sep 19, 2023
37237ef
Add multicategorical model to docs
Toni-SM Sep 21, 2023
f17b2eb
Add multicategorical models images to docs
Toni-SM Sep 22, 2023
00c64cf
Update manual training section in docs
Toni-SM Sep 27, 2023
c2e6ae4
Remove :linenos: from docs .rst files
Toni-SM Sep 28, 2023
770069d
Add comment before and after trainers' dictionary configuration to si…
Toni-SM Sep 28, 2023
5bba8c1
Parse trainers' configuration using labels
Toni-SM Sep 28, 2023
5222dbb
Add multi-categorical model mixin in jax
Toni-SM Sep 30, 2023
0fa50b5
Add MultiDiscrete space support in memories
Toni-SM Oct 1, 2023
4ffdb58
Add MultiDisctrete action space support for gym/gymnasium envs
Toni-SM Oct 1, 2023
08c01d9
Fix multi-categorical model jax tracer error with space nvec
Toni-SM Oct 2, 2023
1c87804
Return first multi-categorical distribution for compatibility
Toni-SM Oct 2, 2023
01d924e
Update agents spaces and models in docs
Toni-SM Oct 3, 2023
ac22064
Update multi-agents spaces and models in docs
Toni-SM Oct 3, 2023
29040dc
Update CHANGELOG
Toni-SM Oct 4, 2023
5dc7798
Return the environment output in StepTrainer's training and evaluatio…
Toni-SM Oct 7, 2023
7f41700
Add labels for manual training snippets
Toni-SM Oct 7, 2023
442d047
Fix image sizes in CNN model diagrams
Toni-SM Oct 10, 2023
1bf83ae
Fix jax wrappers import in Python environments without torch
Toni-SM Nov 4, 2023
b6b7011
Add jax CNN model snippets to docs
Toni-SM Nov 4, 2023
30f67c4
Add jax CNN model snippet files
Toni-SM Nov 4, 2023
9535022
Output tqdm progress messages to system's stdout
Toni-SM Nov 5, 2023
bb493a5
Update CHANGELOG
Toni-SM Nov 5, 2023
c6224d6
Get single observation/action spaces for vectorized environments
Toni-SM Feb 11, 2024
a7ef978
Update environment wrapper for latest Orbit version
Toni-SM Feb 11, 2024
7391c2a
Get single observation/action spaces for vectorized environments
Toni-SM Feb 11, 2024
c5b8a71
Update environment wrapper for latest Orbit version
Toni-SM Feb 11, 2024
fa10010
Update CHANGELOG
Toni-SM Feb 11, 2024
1281b2b
Update real-world examples to latest OIGE implementation
Toni-SM Feb 12, 2024
b350717
Update CHANGELOG
Toni-SM Feb 13, 2024
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
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [1.1.0] - 2024-02-12
### Added
- MultiCategorical mixin to operate MultiDiscrete action spaces

### Changed (breaking changes)
- Rename the `ManualTrainer` to `StepTrainer`
- Output training/evaluation progress messages to system's stdout
- Get single observation/action spaces for vectorized environments
- Update Isaac Orbit environment wrapper

## [1.0.0] - 2023-08-16

Transition from pre-release versions (`1.0.0-rc.1` and`1.0.0-rc.2`) to a stable version.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_static/imgs/model_categorical_cnn-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/source/_static/imgs/model_categorical_cnn-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/source/_static/imgs/model_deterministic_cnn-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/source/_static/imgs/model_deterministic_cnn-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/source/_static/imgs/model_gaussian_cnn-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/source/_static/imgs/model_gaussian_cnn-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/source/_static/imgs/model_multicategorical-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/source/_static/imgs/model_multicategorical-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion docs/source/api/agents/a2c.rst
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\blacksquare`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\blacksquare`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
Expand Down Expand Up @@ -194,7 +197,10 @@ The implementation uses 1 stochastic (discrete or continuous) and 1 deterministi
- :literal:`"policy"`
- observation
- action
- :ref:`Categorical <models_categorical>` / :ref:`Gaussian <models_gaussian>` / :ref:`MultivariateGaussian <models_multivariate_gaussian>`
- :ref:`Categorical <models_categorical>` /
|br| :ref:`Multi-Categorical <models_multicategorical>` /
|br| :ref:`Gaussian <models_gaussian>` /
|br| :ref:`MultivariateGaussian <models_multivariate_gaussian>`
* - :math:`V_\phi(s)`
- Value
- :literal:`"value"`
Expand Down
7 changes: 6 additions & 1 deletion docs/source/api/agents/amp.rst
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
Expand Down Expand Up @@ -194,7 +198,8 @@ The implementation uses 1 stochastic (continuous) and 2 deterministic function a
- :literal:`"policy"`
- observation
- action
- :ref:`Gaussian <models_gaussian>` / :ref:`MultivariateGaussian <models_multivariate_gaussian>`
- :ref:`Gaussian <models_gaussian>` /
|br| :ref:`MultivariateGaussian <models_multivariate_gaussian>`
* - :math:`V_\phi(s)`
- Value
- :literal:`"value"`
Expand Down
6 changes: 5 additions & 1 deletion docs/source/api/agents/cem.rst
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\blacksquare`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\blacksquare`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\square`
Expand Down Expand Up @@ -149,7 +152,8 @@ The implementation uses 1 discrete function approximator. This function approxim
- :literal:`"policy"`
- observation
- action
- :ref:`Categorical <models_categorical>`
- :ref:`Categorical <models_categorical>` /
|br| :ref:`Multi-Categorical <models_multicategorical>`

.. raw:: html

Expand Down
3 changes: 3 additions & 0 deletions docs/source/api/agents/ddpg.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
Expand Down
3 changes: 3 additions & 0 deletions docs/source/api/agents/ddqn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\blacksquare`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\square`
Expand Down
3 changes: 3 additions & 0 deletions docs/source/api/agents/dqn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\blacksquare`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\square`
Expand Down
8 changes: 7 additions & 1 deletion docs/source/api/agents/ppo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\blacksquare`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\blacksquare`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
Expand Down Expand Up @@ -210,7 +213,10 @@ The implementation uses 1 stochastic (discrete or continuous) and 1 deterministi
- :literal:`"policy"`
- observation
- action
- :ref:`Categorical <models_categorical>` / :ref:`Gaussian <models_gaussian>` / :ref:`MultivariateGaussian <models_multivariate_gaussian>`
- :ref:`Categorical <models_categorical>` /
|br| :ref:`Multi-Categorical <models_multicategorical>` /
|br| :ref:`Gaussian <models_gaussian>` /
|br| :ref:`MultivariateGaussian <models_multivariate_gaussian>`
* - :math:`V_\phi(s)`
- Value
- :literal:`"value"`
Expand Down
3 changes: 3 additions & 0 deletions docs/source/api/agents/q_learning.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - Box
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
Expand Down
6 changes: 5 additions & 1 deletion docs/source/api/agents/rpo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
Expand Down Expand Up @@ -249,7 +252,8 @@ The implementation uses 1 continuous stochastic and 1 deterministic function app
- :literal:`"policy"`
- observation
- action
- :ref:`Gaussian <models_gaussian>` / :ref:`MultivariateGaussian <models_multivariate_gaussian>`
- :ref:`Gaussian <models_gaussian>` /
|br| :ref:`MultivariateGaussian <models_multivariate_gaussian>`
* - :math:`V_\phi(s)`
- Value
- :literal:`"value"`
Expand Down
6 changes: 5 additions & 1 deletion docs/source/api/agents/sac.rst
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
Expand Down Expand Up @@ -190,7 +193,8 @@ The implementation uses 1 stochastic and 4 deterministic function approximators.
- :literal:`"policy"`
- observation
- action
- :ref:`Gaussian <models_gaussian>` / :ref:`MultivariateGaussian <models_multivariate_gaussian>`
- :ref:`Gaussian <models_gaussian>` /
|br| :ref:`MultivariateGaussian <models_multivariate_gaussian>`
* - :math:`Q_{\phi 1}(s, a)`
- Q1-network (critic 1)
- :literal:`"critic_1"`
Expand Down
3 changes: 3 additions & 0 deletions docs/source/api/agents/sarsa.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - Box
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
Expand Down
3 changes: 3 additions & 0 deletions docs/source/api/agents/td3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
Expand Down
6 changes: 5 additions & 1 deletion docs/source/api/agents/trpo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,9 @@ The implementation supports the following `Gym spaces <https://www.gymlibrary.de
* - Discrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - MultiDiscrete
- .. centered:: :math:`\square`
- .. centered:: :math:`\square`
* - Box
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
Expand Down Expand Up @@ -246,7 +249,8 @@ The implementation uses 1 stochastic and 1 deterministic function approximator.
- :literal:`"policy"`
- observation
- action
- :ref:`Gaussian <models_gaussian>` / :ref:`MultivariateGaussian <models_multivariate_gaussian>`
- :ref:`Gaussian <models_gaussian>` /
|br| :ref:`MultivariateGaussian <models_multivariate_gaussian>`
* - :math:`V_\phi(s)`
- Value
- :literal:`"value"`
Expand Down
4 changes: 4 additions & 0 deletions docs/source/api/models.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Models

Tabular <models/tabular>
Categorical <models/categorical>
Multi-Categorical <models/multicategorical>
Gaussian <models/gaussian>
Multivariate Gaussian <models/multivariate_gaussian>
Deterministic <models/deterministic>
Expand All @@ -29,6 +30,9 @@ Models (or agent models) refer to a representation of the agent's policy, value
* - :doc:`Categorical model <models/categorical>` (discrete domain)
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
* - :doc:`Multi-Categorical model <models/multicategorical>` (discrete domain)
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\square`
* - :doc:`Gaussian model <models/gaussian>` (continuous domain)
- .. centered:: :math:`\blacksquare`
- .. centered:: :math:`\blacksquare`
Expand Down
18 changes: 18 additions & 0 deletions docs/source/api/models/categorical.rst
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,24 @@ Usage
:start-after: [start-cnn-functional-torch]
:end-before: [end-cnn-functional-torch]

.. group-tab:: |_4| |jax| |_4|

.. tabs::

.. group-tab:: setup-style

.. literalinclude:: ../../snippets/categorical_model.py
:language: python
:start-after: [start-cnn-setup-jax]
:end-before: [end-cnn-setup-jax]

.. group-tab:: compact-style

.. literalinclude:: ../../snippets/categorical_model.py
:language: python
:start-after: [start-cnn-compact-jax]
:end-before: [end-cnn-compact-jax]

.. tab:: RNN

.. image:: ../../_static/imgs/model_categorical_rnn-light.svg
Expand Down
18 changes: 18 additions & 0 deletions docs/source/api/models/deterministic.rst
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,24 @@ Usage
:start-after: [start-cnn-functional-torch]
:end-before: [end-cnn-functional-torch]

.. group-tab:: |_4| |jax| |_4|

.. tabs::

.. group-tab:: setup-style

.. literalinclude:: ../../snippets/deterministic_model.py
:language: python
:start-after: [start-cnn-setup-jax]
:end-before: [end-cnn-setup-jax]

.. group-tab:: compact-style

.. literalinclude:: ../../snippets/deterministic_model.py
:language: python
:start-after: [start-cnn-compact-jax]
:end-before: [end-cnn-compact-jax]

.. tab:: RNN

.. image:: ../../_static/imgs/model_deterministic_rnn-light.svg
Expand Down
18 changes: 18 additions & 0 deletions docs/source/api/models/gaussian.rst
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,24 @@ Usage
:start-after: [start-cnn-functional-torch]
:end-before: [end-cnn-functional-torch]

.. group-tab:: |_4| |jax| |_4|

.. tabs::

.. group-tab:: setup-style

.. literalinclude:: ../../snippets/gaussian_model.py
:language: python
:start-after: [start-cnn-setup-jax]
:end-before: [end-cnn-setup-jax]

.. group-tab:: compact-style

.. literalinclude:: ../../snippets/gaussian_model.py
:language: python
:start-after: [start-cnn-compact-jax]
:end-before: [end-cnn-compact-jax]

.. tab:: RNN

.. image:: ../../_static/imgs/model_gaussian_rnn-light.svg
Expand Down
Loading
Loading