Skip to content

Commit 7e5a7b7

Browse files
saran-tcopybara-github
authored andcommitted
Change GitHub org name to google-deepmind.
PiperOrigin-RevId: 563512242 Change-Id: Ife98501e95bb3459d96c7c73e5fb53be5513dd4b
1 parent 1a3215e commit 7e5a7b7

26 files changed

+213
-208
lines changed

.github/ISSUE_TEMPLATE/ask_for_help.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ assignees: ''
1010
**How to ask for help**
1111

1212
First, read our quick guide to
13-
[asking good questions](https://github.com/deepmind/mujoco#asking-questions).
13+
[asking good questions](https://github.com/google-deepmind/mujoco#asking-questions).
1414
Below is a template for you to use:
1515

1616
Hi,

CONTRIBUTING.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ accepting your contributions!
77

88
### Documentation, forums
99

10-
Please read MuJoCo's [documentation](https://mujoco.readthedocs.io) and look
10+
Please read MuJoCo's [documentation](https://mujoco.readthedocs.io/) and look
1111
through current topics on our GitHub
12-
[issues](https://github.com/deepmind/mujoco/issues) and
13-
[discussions](https://github.com/deepmind/mujoco/discussions) pages.
12+
[issues](https://github.com/google-deepmind/mujoco/issues) and
13+
[discussions](https://github.com/google-deepmind/mujoco/discussions) pages.
1414

1515
### Contributor License Agreement
1616

@@ -35,7 +35,7 @@ How to submit a good bug report:
3535

3636
- Make it easy to reproduce the problem. If this requires a model, attach it as
3737
a zip file to the bug report. The model and steps required to reproduce the
38-
proplem should be *minimal*, in the sense that irrelevant parts are
38+
problem should be *minimal*, in the sense that irrelevant parts are
3939
removed.
4040

4141
- Clearly state what is the expected behavior.
@@ -54,13 +54,13 @@ What's the most recent version in which the problem doesn't happen?
5454
Before submitting an enhancement suggestion:
5555

5656
- Check if you're using the [latest
57-
version](https://github.com/deepmind/mujoco/releases/latest) of MuJoCo.
57+
version](https://github.com/google-deepmind/mujoco/releases/latest) of MuJoCo.
5858

59-
- Perform a quick [search](https://github.com/deepmind/mujoco/issues) to see if
60-
the enhancement has already been suggested. If it has, add a comment to the
61-
existing issue instead of opening a new one.
59+
- Perform a quick [search](https://github.com/google-deepmind/mujoco/issues) to
60+
see if the enhancement has already been suggested. If it has, add a comment to
61+
the existing issue instead of opening a new one.
6262

63-
How to submit a good enhacement suggestion:
63+
How to submit a good enhancement suggestion:
6464

6565
- Use a clear and descriptive title.
6666

README.md

+17-16
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
</h1>
44

55
<p>
6-
<a href="https://github.com/deepmind/mujoco/actions/workflows/build.yml?query=branch%3Amain" alt="GitHub Actions">
7-
<img src="https://img.shields.io/github/actions/workflow/status/deepmind/mujoco/build.yml?branch=main">
6+
<a href="https://github.com/google-deepmind/mujoco/actions/workflows/build.yml?query=branch%3Amain" alt="GitHub Actions">
7+
<img src="https://img.shields.io/github/actions/workflow/status/google-deepmind/mujoco/build.yml?branch=main">
88
</a>
99
<a href="https://mujoco.readthedocs.io/" alt="Documentation">
1010
<img src="https://readthedocs.org/projects/mujoco/badge/?version=latest">
1111
</a>
12-
<a href="https://github.com/deepmind/mujoco/blob/main/LICENSE" alt="License">
13-
<img src="https://img.shields.io/github/license/deepmind/mujoco">
12+
<a href="https://github.com/google-deepmind/mujoco/blob/main/LICENSE" alt="License">
13+
<img src="https://img.shields.io/github/license/google-deepmind/mujoco">
1414
</a>
1515
</p>
1616

@@ -50,10 +50,11 @@ your machine.
5050
If you are a Python user, you might want to start with our tutorial notebooks
5151
running on Google Colab:
5252

53-
- The first tutorial focuses on the basics of MuJoCo: [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/deepmind/mujoco/blob/main/python/tutorial.ipynb)
53+
- The first tutorial focuses on the basics of MuJoCo:
54+
[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/google-deepmind/mujoco/blob/main/python/tutorial.ipynb)
5455
- For a more advanced example, see the LQR tutorial which creates an LQR
5556
controller to balance a humanoid on one leg using MuJoCo's dynamics
56-
derivatives: [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/deepmind/mujoco/blob/main/python/LQR.ipynb)
57+
derivatives: [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/google-deepmind/mujoco/blob/main/python/LQR.ipynb)
5758

5859
## Installation
5960

@@ -93,10 +94,10 @@ and [style guide](STYLEGUIDE.md).
9394
## Asking Questions
9495

9596
Questions and requests for help are welcome on the GitHub
96-
[Issues](https://github.com/deepmind/mujoco/issues) page and should focus on a specific problem
97-
or question.
97+
[Issues](https://github.com/google-deepmind/mujoco/issues) page and should focus
98+
on a specific problem or question.
9899

99-
[Discussions](https://github.com/deepmind/mujoco/discussions) should
100+
[Discussions](https://github.com/google-deepmind/mujoco/discussions) should
100101
address wider concerns that might require input from multiple participants.
101102

102103
Here are some guidelines for asking good questions:
@@ -142,10 +143,10 @@ These packages give users of various languages access to MuJoCo functionality:
142143
#### First-party bindings:
143144

144145
- [Python bindings](https://mujoco.readthedocs.io/en/stable/python.html)
145-
- [dm_control](https://github.com/deepmind/dm_control), Google DeepMind's
146-
related environment stack, includes
147-
[PyMJCF](https://github.com/deepmind/dm_control/blob/main/dm_control/mjcf/README.md),
148-
a module for procedural manipulation of MuJoCo models.
146+
- [dm_control](https://github.com/google-deepmind/dm_control), Google
147+
DeepMind's related environment stack, includes
148+
[PyMJCF](https://github.com/google-deepmind/dm_control/blob/main/dm_control/mjcf/README.md),
149+
a module for procedural manipulation of MuJoCo models.
149150
- [C# bindings and Unity plug-in](https://mujoco.readthedocs.io/en/stable/unity.html)
150151

151152
#### Third-party bindings:
@@ -191,7 +192,7 @@ If you use MuJoCo for published research, please cite:
191192

192193
Copyright 2021 DeepMind Technologies Limited.
193194

194-
Box collision code ([`engine_collision_box.c`](https://github.com/deepmind/mujoco/blob/main/src/engine/engine_collision_box.c))
195+
Box collision code ([`engine_collision_box.c`](https://github.com/google-deepmind/mujoco/blob/main/src/engine/engine_collision_box.c))
195196
is Copyright 2016 Svetoslav Kolev.
196197

197198
ReStructuredText documents, images, and videos in the `doc` directory are made
@@ -207,8 +208,8 @@ This is not an officially supported Google product.
207208
[build from source]: https://mujoco.readthedocs.io/en/latest/programming#building-mujoco-from-source
208209
[Getting Started]: https://mujoco.readthedocs.io/en/latest/programming#getting-started
209210
[Unity]: https://unity.com/
210-
[releases page]: https://github.com/deepmind/mujoco/releases
211-
[GitHub Issues]: https://github.com/deepmind/mujoco/issues
211+
[releases page]: https://github.com/google-deepmind/mujoco/releases
212+
[GitHub Issues]: https://github.com/google-deepmind/mujoco/issues
212213
[mujoco.readthedocs.io]: https://mujoco.readthedocs.io
213214
[changelog]: https://mujoco.readthedocs.io/en/latest/changelog.html
214215
[Python bindings]: https://mujoco.readthedocs.io/en/stable/python.html#python-bindings

STYLEGUIDE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spot such a pattern, feel free to send a PR to update the guide.
5858

5959
Line length is 100 characters. In rare situations, like the collision table at
6060
the top of
61-
[engine_collision_driver.c](https://github.com/deepmind/mujoco/blob/c8ff7b3d341560e8cc33fbdcaffbcdbc4c32327c/src/engine/engine_collision_driver.c#L36),
61+
[engine_collision_driver.c](https://github.com/google-deepmind/mujoco/blob/c8ff7b3d341560e8cc33fbdcaffbcdbc4c32327c/src/engine/engine_collision_driver.c#L36),
6262
longer lines are allowed for readability.
6363

6464
#### Comments
@@ -99,7 +99,7 @@ including for one-line blocks:
9999
- Brace-less single line statements are allowed outside of `engine/` code, for
100100
similar, repeated blocks, that do not contain flow control statements (`return`,
101101
`continue`, etc.). For an example of this exception, inspect the [`mjCModel`
102-
destructor](https://github.com/deepmind/mujoco/search?q=repo%3Adeepmind%2Fmujoco+filename%3Auser_model.cc).
102+
destructor](https://github.com/google-deepmind/mujoco/search?q=repo%3Adeepmind%2Fmujoco+filename%3Auser_model.cc).
103103
104104
- Unattached braces are allowed in `if/else` blocks, when inserting a comment
105105
before the `else`:

doc/APIreference/APIfunctions.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
Functions
55
=========
66

7-
The main header `mujoco.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mujoco.h>`_ exposes a large
8-
number of functions. However the functions that most users are likely to need are a small fraction.
7+
The main header `mujoco.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mujoco.h>`_ exposes a
8+
large number of functions. However the functions that most users are likely to need are a small fraction.
99

1010
API function can be classified as:
1111

doc/APIreference/APIglobals.rst

+18-18
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,9 @@ Numeric constants
368368

369369
Many integer constants were already documented in the primitive types above. In addition, the header files define
370370
several other constants documented here. Unless indicated otherwise, each entry in the table below is defined in
371-
`mjmodel.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjmodel.h>`_. Note that some extended key codes
372-
are defined in `mjui.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_ which are not shown in the
373-
table below. Their names are in the format ``mjKEY_XXX``. They correspond to GLFW key codes.
371+
`mjmodel.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjmodel.h>`_. Note that some extended key
372+
codes are defined in `mjui.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_ which are not
373+
shown in the table below. Their names are in the format ``mjKEY_XXX``. They correspond to GLFW key codes.
374374

375375
.. list-table::
376376
:widths: 2 1 8
@@ -457,60 +457,60 @@ table below. Their names are in the format ``mjKEY_XXX``. They correspond to GLF
457457
- 6
458458
- The number of geom, site, joint, tendon and actuator groups whose rendering can be enabled and disabled via
459459
:ref:`mjvOption`.
460-
Defined in `mjvisualize.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
460+
Defined in `mjvisualize.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
461461
* - ``mjMAXOVERLAY``
462462
- 500
463463
- The maximal number of characters in overlay text for rendering.
464-
Defined in `mjvisualize.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
464+
Defined in `mjvisualize.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
465465
* - ``mjMAXLINE``
466466
- 100
467467
- The maximal number of lines per 2D figure (:ref:`mjvFigure`).
468-
Defined in `mjvisualize.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
468+
Defined in `mjvisualize.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
469469
* - ``mjMAXLINEPNT``
470470
- 1000
471471
- The maximal number of points in each line in a 2D figure. Note that the buffer ``mjvFigure.linepnt`` has length
472472
``2*mjMAXLINEPNT`` because each point has X and Y coordinates.
473-
Defined in `mjvisualize.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
473+
Defined in `mjvisualize.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
474474
* - ``mjMAXPLANEGRID``
475475
- 200
476476
- The maximal number of grid lines in each dimension for rendering planes.
477-
Defined in `mjvisualize.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
477+
Defined in `mjvisualize.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
478478
* - ``mjNAUX``
479479
- 10
480480
- Number of auxiliary buffers that can be allocated in mjrContext.
481-
Defined in `mjrender.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjrender.h>`_.
481+
Defined in `mjrender.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjrender.h>`_.
482482
* - ``mjMAXTEXTURE``
483483
- 1000
484484
- Maximum number of textures allowed.
485-
Defined in `mjrender.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjrender.h>`_.
485+
Defined in `mjrender.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjrender.h>`_.
486486
* - ``mjMAXUISECT``
487487
- 10
488488
- Maximum number of UI sections.
489-
Defined in `mjui.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
489+
Defined in `mjui.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
490490
* - ``mjMAXUIITEM``
491491
- 80
492492
- Maximum number of items per UI section.
493-
Defined in `mjui.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
493+
Defined in `mjui.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
494494
* - ``mjMAXUITEXT``
495495
- 500
496496
- Maximum number of characters in UI fields 'edittext' and 'other'.
497-
Defined in `mjui.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
497+
Defined in `mjui.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
498498
* - ``mjMAXUINAME``
499499
- 40
500500
- Maximum number of characters in any UI name.
501-
Defined in `mjui.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
501+
Defined in `mjui.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
502502
* - ``mjMAXUIMULTI``
503503
- 20
504504
- Maximum number of radio and select items in UI group.
505-
Defined in `mjui.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
505+
Defined in `mjui.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
506506
* - ``mjMAXUIEDIT``
507507
- 5
508508
- Maximum number of elements in UI edit list.
509-
Defined in `mjui.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
509+
Defined in `mjui.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
510510
* - ``mjMAXUIRECT``
511511
- 15
512512
- Maximum number of UI rectangles.
513-
Defined in `mjui.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
513+
Defined in `mjui.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
514514
* - ``mjVERSION_HEADER``
515515
- 238
516516
- The version of the MuJoCo headers; changes with every release. This is an integer equal to 100x the software
@@ -525,6 +525,6 @@ X Macros
525525

526526
The X Macros are not needed in most user projects. They are used internally to allocate the model, and are also
527527
available for users who know how to use this programming technique. See the header file `mjxmacro.h
528-
<https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjxmacro.h>`_ for the actual definitions. They are
528+
<https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjxmacro.h>`_ for the actual definitions. They are
529529
particularly useful in writing MuJoCo wrappers for scripting languages, where dynamic structures matching the MuJoCo
530530
data structures need to be constructed programmatically.

doc/APIreference/APItypes.rst

+9-9
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ MuJoCo defines a large number of types:
4141
Primitive types
4242
---------------
4343

44-
The two types below are defined in `mjtnum.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjtnum.h>`_.
44+
The two types below are defined in `mjtnum.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjtnum.h>`_.
4545

4646

4747
.. _mjtNum:
@@ -93,7 +93,7 @@ Enum types
9393
Model
9494
^^^^^
9595

96-
The enums below are defined in `mjmodel.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjmodel.h>`_.
96+
The enums below are defined in `mjmodel.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjmodel.h>`_.
9797

9898

9999
.. _mjtDisableBit:
@@ -343,7 +343,7 @@ These are the possible sensor data types, used in ``mjData.sensor_datatype``.
343343
Data
344344
^^^^
345345

346-
The enums below are defined in `mjdata.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjdata.h>`_.
346+
The enums below are defined in `mjdata.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjdata.h>`_.
347347

348348

349349

@@ -386,7 +386,7 @@ Timer types. The number of timer types is given by ``mjNTIMER`` which is also th
386386
Visualization
387387
^^^^^^^^^^^^^
388388

389-
The enums below are defined in `mjvisualize.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
389+
The enums below are defined in `mjvisualize.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjvisualize.h>`_.
390390

391391

392392
.. _mjtCatBit:
@@ -490,7 +490,7 @@ These are the possible stereo rendering types. They are used in ``mjvScene.stere
490490
Rendering
491491
^^^^^^^^^
492492

493-
The enums below are defined in `mjrender.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjrender.h>`_.
493+
The enums below are defined in `mjrender.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjrender.h>`_.
494494

495495

496496
.. _mjtGridPos:
@@ -540,7 +540,7 @@ These are the possible font types.
540540
User Interface
541541
^^^^^^^^^^^^^^
542542

543-
The enums below are defined in `mjui.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
543+
The enums below are defined in `mjui.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
544544

545545

546546
.. _mjtButton:
@@ -578,7 +578,7 @@ Item types used in the UI framework.
578578
Plugins
579579
^^^^^^^
580580

581-
The enums below are defined in `mjplugin.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjplugin.h>`_.
581+
The enums below are defined in `mjplugin.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjplugin.h>`_.
582582
See :ref:`exPlugin` for details.
583583

584584

@@ -1016,8 +1016,8 @@ Function types
10161016
--------------
10171017

10181018
MuJoCo callbacks have corresponding function types. They are defined in `mjdata.h
1019-
<https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjdata.h>`_ and in `mjui.h
1020-
<https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_. The actual callback functions are documented
1019+
<https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjdata.h>`_ and in `mjui.h
1020+
<https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_. The actual callback functions are documented
10211021
in the :doc:`globals<APIglobals>` page.
10221022

10231023

0 commit comments

Comments
 (0)