Skip to content

Commit

Permalink
Update ReadTheDocs (#1844)
Browse files Browse the repository at this point in the history
  • Loading branch information
Adaickalavan authored Feb 8, 2023
1 parent d95f079 commit 7ff08fc
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 18 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Copy and pasting the git commit messages is __NOT__ enough.
### Added
- Added map source uri as `map_source` inside of `hiway-v1` reset info to indicate what the current map is on reset.
### Changed
- Made changes in the docs to reflect `master` branch as the main development branch.
### Deprecated
### Fixed
- Fixed an exit error that occurs when envision attempts to close down.
Expand Down
24 changes: 12 additions & 12 deletions docs/benchmarks/benchmark.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.. _benchmark:

Driving SMARTS Competition Benchmark
====================================
Driving SMARTS 2022
===================

The Driving SMARTS competition benchmark is a benchmark derived from the
The Driving SMARTS 2022 is a benchmark derived from the
NeurIPS 2022 Driving SMARTS Competition.

This benchmark is intended to address the following requirements:
Expand All @@ -30,7 +30,7 @@ available.

.. code:: bash
> scl benchmark list
$ scl benchmark list
BENCHMARK_NAME BENCHMARK_ID VERSIONS
- Driving SMARTS: driving_smarts 0.0 0.1
Expand Down Expand Up @@ -133,7 +133,7 @@ file.

.. code:: bash
> scl benchmark run driving_smarts "./baselines/driving_smarts/v0/agent_config.yaml" --auto-install # --auto-install only needs to be used to get dependencies.
$ scl benchmark run driving_smarts "./baselines/driving_smarts/v0/agent_config.yaml" --auto-install # --auto-install only needs to be used to get dependencies.
Starting `Driving SMARTS V1` benchmark.
This is a cleaned up version of the Driving SMARTS benchmark.
Expand All @@ -151,17 +151,17 @@ file.
`Driving SMARTS V0` result:
- completion: 1
- humanness: 0.2
- rules: 0.8
- time: 0.3
- overall: 1.7
- humanness: 0.7
- rules: 0.9
- time: 0.2
- overall: 0.504
A particular version of a benchmark can be targeted using a modified
syntax ``benchmark_name==version``:

.. code:: bash
> scl benchmark run driving_smarts==0.0 ...
$ scl benchmark run driving_smarts==0.0 "./baselines/driving_smarts/v0/agent_config.yaml"
Advanced Configuration
----------------------
Expand All @@ -178,7 +178,7 @@ what benchmarks are currently available. This can be passed using

.. code:: bash
> scl benchmark run --benchmark-listing benchmark_listing.yaml driving_smarts "./baselines/driving_smarts/v0/agent_config.yaml"
$ scl benchmark run --benchmark-listing benchmark_listing.yaml driving_smarts "./baselines/driving_smarts/v0/agent_config.yaml"
WARNING! Since with ``scl benchmark run`` this listing directs to a code
``entrypoint`` do not use this with a listing file from an unknown
Expand All @@ -192,7 +192,7 @@ file.

.. code:: bash
> scl benchmark list --benchmark-listing benchmark_listing.yaml
$ scl benchmark list --benchmark-listing benchmark_listing.yaml
Listing File
^^^^^^^^^^^^
Expand Down
5 changes: 3 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@

extlinks = {
"examples": (
"https://github.com/huawei-noah/SMARTS/blob/develop/examples/%s",
"https://github.com/huawei-noah/SMARTS/blob/master/examples/%s",
"%s",
),
"scenarios": (
"https://github.com/huawei-noah/SMARTS/blob/develop/scenarios/%s",
"https://github.com/huawei-noah/SMARTS/blob/master/scenarios/%s",
"%s",
),
}
Expand All @@ -77,6 +77,7 @@
autodoc_mock_imports = [
"cpuinfo",
"cv2",
"gymnasium",
"lxml",
"mdutils",
"moviepy",
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Pre-Push Checklist
------------------

1. Do your best to see that your code compiles locally.
2. Do not push to ``master``. Instead make a branch and a pull request to the ``develop`` branch.
2. Do not push directly to ``master``. Instead make a branch and a pull request to the ``master`` branch.

Submission of a Pull Request
----------------------------
Expand Down
7 changes: 4 additions & 3 deletions docs/setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Setup
Prerequisites
-------------

+ python3 (3.7 and 3.8)
+ python3 (3.7 or 3.8)
+ ubuntu (>=16.04)

Installation
Expand All @@ -20,15 +20,16 @@ Run the following commands to setup the SMARTS simulator.
$ cd <path/to/SMARTS>
# For latest stable release
$ git checkout master
$ git checkout tags/<tag_name>
# e.g., git checkout tags/v1.0.3
.. note::

Alternatively, to use the current development (i.e., bleeding edge) version:

.. code-block:: bash
$ git checkout develop
$ git checkout master
.. code-block:: bash
Expand Down

0 comments on commit 7ff08fc

Please sign in to comment.