Skip to content
This repository has been archived by the owner on Sep 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #128 from facebookresearch/lep.master_to_main
Browse files Browse the repository at this point in the history
Replaced usage of 'master' branch for 'main'.
  • Loading branch information
luisenp authored Sep 15, 2021
2 parents 068d730 + 727ce2c commit 07bb5e5
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: CI

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ possible.
## Pull Requests
We actively welcome your pull requests.

1. Fork the repo and create your branch from `master`.
1. Fork the repo and create your branch from `main`.
2. If you've added code that should be tested, add tests.
3. If you've changed APIs, update the documentation.
4. Ensure the test suite passes.
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![PyPi Version](https://img.shields.io/pypi/v/mbrl)](https://pypi.org/project/mbrl/)
[![Master](https://github.com/facebookresearch/mbrl-lib/workflows/CI/badge.svg)](https://github.com/facebookresearch/mbrl-lib/actions?query=workflow%3ACI)
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/facebookresearch/mbrl-lib/tree/master/LICENSE)
[![Main](https://github.com/facebookresearch/mbrl-lib/workflows/CI/badge.svg)](https://github.com/facebookresearch/mbrl-lib/actions?query=workflow%3ACI)
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/facebookresearch/mbrl-lib/tree/main/LICENSE)
[![Python 3.7+](https://img.shields.io/badge/python-3.7+-blue.svg)](https://www.python.org/downloads/release/python-360/)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

Expand Down Expand Up @@ -39,7 +39,7 @@ And test it by running the following from the root folder of the repository


### Basic example
As a starting point, check out our [tutorial notebook](https://github.com/facebookresearch/mbrl-lib/tree/master/notebooks/pets_example.ipynb)
As a starting point, check out our [tutorial notebook](https://github.com/facebookresearch/mbrl-lib/tree/main/notebooks/pets_example.ipynb)
on how to write the PETS algorithm
([Chua et al., NeurIPS 2018](https://arxiv.org/pdf/1805.12114.pdf))
using our toolbox, and running it on a continuous version of the cartpole
Expand All @@ -48,15 +48,15 @@ environment.
## Provided algorithm implementations
MBRL-Lib provides implementations of popular MBRL algorithms
as examples of how to use this library. You can find them in the
[mbrl/algorithms](https://github.com/facebookresearch/mbrl-lib/tree/master/mbrl/algorithms) folder. Currently, we have implemented
[PETS](https://github.com/facebookresearch/mbrl-lib/tree/master/mbrl/algorithms/pets.py) and [MBPO](https://github.com/facebookresearch/mbrl-lib/tree/master/mbrl/algorithms/mbpo.py), and
[mbrl/algorithms](https://github.com/facebookresearch/mbrl-lib/tree/main/mbrl/algorithms) folder. Currently, we have implemented
[PETS](https://github.com/facebookresearch/mbrl-lib/tree/main/mbrl/algorithms/pets.py) and [MBPO](https://github.com/facebookresearch/mbrl-lib/tree/main/mbrl/algorithms/mbpo.py), and
we plan to keep increasing this list in the near future.

The implementations rely on [Hydra](https://github.com/facebookresearch/hydra)
to handle configuration. You can see the configuration files in
[this](https://github.com/facebookresearch/mbrl-lib/tree/master/mbrl/examples/conf)
[this](https://github.com/facebookresearch/mbrl-lib/tree/main/mbrl/examples/conf)
folder.
The [overrides](https://github.com/facebookresearch/mbrl-lib/tree/master/mbrl/examples/conf/overrides)
The [overrides](https://github.com/facebookresearch/mbrl-lib/tree/main/mbrl/examples/conf/overrides)
subfolder contains
environment specific configurations for each environment, overriding the
default configurations with the best hyperparameter values we have found so far
Expand All @@ -79,7 +79,7 @@ such as the type of dynamics model
(e.g., `dynamics_model=basic_ensemble`), or the number of models in the ensemble
(e.g., `dynamics_model.model.ensemble_size=some-number`). To learn more about
all the available options, take a look at the provided
[configuration files](https://github.com/facebookresearch/mbrl-lib/tree/master/mbrl/examples/conf).
[configuration files](https://github.com/facebookresearch/mbrl-lib/tree/main/mbrl/examples/conf).

### Note
Running the provided examples requires Mujoco, but
Expand All @@ -94,7 +94,7 @@ that it works correctly with our library by running

## Visualization tools
Our library also contains a set of
[visualization](https://github.com/facebookresearch/mbrl-lib/tree/master/mbrl/diagnostics) tools, meant to facilitate diagnostics and
[visualization](https://github.com/facebookresearch/mbrl-lib/tree/main/mbrl/diagnostics) tools, meant to facilitate diagnostics and
development of models and controllers. These currently require a Mujoco
installation (see previous subsection), but we are planning to add support for other environments
and extensions in the future. Currently, the following tools are provided:
Expand All @@ -112,7 +112,7 @@ assess model predictions over a rolling horizon. Specifically, it runs a
be trained independently. The following gif shows an example of 200 steps
of pre-trained MBPO policy on Inverted Pendulum environment.

![Example of Visualizer](http://raw.githubusercontent.com/facebookresearch/mbrl-lib/master/docs/resources/inv_pendulum_mbpo_vis.gif)
![Example of Visualizer](http://raw.githubusercontent.com/facebookresearch/mbrl-lib/main/docs/resources/inv_pendulum_mbpo_vis.gif)

* ``DatasetEvaluator``: Loads a pre-trained model
and a dataset (can be loaded from separate directories), and computes
Expand All @@ -121,7 +121,7 @@ and a dataset (can be loaded from separate directories), and computes
vs. the model's prediction. If the model is an ensemble, the plot shows the
mean prediction as well as the individual predictions of each ensemble member.

![Example of DatasetEvaluator](http://raw.githubusercontent.com/facebookresearch/mbrl-lib/master/docs/resources/dataset_evaluator.png)
![Example of DatasetEvaluator](http://raw.githubusercontent.com/facebookresearch/mbrl-lib/main/docs/resources/dataset_evaluator.png)

* ``FineTuner``: Can be used to train a
model on a dataset produced by a given agent/controller. The model and agent
Expand All @@ -137,7 +137,7 @@ a trajectory optimizer agent on the true environment using Python's
a video if the ``render`` argument is passed. Below is an example on
HalfCheetah-v2 using CEM for trajectory optimization.

![Control Half-Cheetah True Dynamics](http://raw.githubusercontent.com/facebookresearch/mbrl-lib/master/docs/resources/halfcheetah-break.gif)
![Control Half-Cheetah True Dynamics](http://raw.githubusercontent.com/facebookresearch/mbrl-lib/main/docs/resources/halfcheetah-break.gif)

* [``TrainingBrowser``](training_browser.py): This script launches a lightweight
training browser for plotting rewards obtained after training runs
Expand All @@ -147,7 +147,7 @@ training browser for plotting rewards obtained after training runs
can be edited in the pane at the bottom left. Requires installing `PyQt5`.
Thanks to [a3ahmad](https://github.com/a3ahmad) for the contribution.

![Training Browser Example](http://raw.githubusercontent.com/facebookresearch/mbrl-lib/master/docs/resources/training-browser-example.png)
![Training Browser Example](http://raw.githubusercontent.com/facebookresearch/mbrl-lib/main/docs/resources/training-browser-example.png)

Note that, except for the training browser, all the tools above require Mujoco
installation and are specific to models of type
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ And test it by running
Basic Example
-------------
As a starting point, check out our
`tutorial notebook <https://github.com/facebookresearch/mbrl-lib/blob/master/notebooks/pets_example.ipynb>`_
`tutorial notebook <https://github.com/facebookresearch/mbrl-lib/blob/main/notebooks/pets_example.ipynb>`_
on how to write the PETS algorithm
`(Chua et al., NeurIPS 2018) <https://arxiv.org/pdf/1805.12114.pdf>`_
using our toolbox, and running it on a continuous version of the cartpole
Expand Down
4 changes: 2 additions & 2 deletions notebooks/pets_example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"To learn about the other features of the library, please check out our [documentation](https://luisenp.github.io/mbrl-lib/). Also take a look at our provided implementations of [PETS](https://github.com/facebookresearch/mbrl-lib/blob/master/mbrl/algorithms/pets.py) and [MBPO](https://github.com/facebookresearch/mbrl-lib/blob/master/mbrl/algorithms/mbpo.py), and their configuration [files](https://github.com/facebookresearch/mbrl-lib/tree/master/mbrl/examples/conf)."
"To learn about the other features of the library, please check out our [documentation](https://facebookresearch.github.io/mbrl-lib/). Also take a look at our provided implementations of [PETS](https://github.com/facebookresearch/mbrl-lib/blob/main/mbrl/algorithms/pets.py) and [MBPO](https://github.com/facebookresearch/mbrl-lib/blob/main/mbrl/algorithms/mbpo.py), and their configuration [files](https://github.com/facebookresearch/mbrl-lib/tree/main/mbrl/examples/conf)."
]
},
{
Expand Down Expand Up @@ -481,4 +481,4 @@
},
"nbformat": 4,
"nbformat_minor": 4
}
}

0 comments on commit 07bb5e5

Please sign in to comment.