From c9e9cd8b35fa5dd76bef3444d8e1823ca289c4f4 Mon Sep 17 00:00:00 2001 From: Saran Tunyasuvunakool Date: Thu, 15 Jun 2023 14:27:33 -0700 Subject: [PATCH] Change org name to "Google DeepMind" in various docs. PiperOrigin-RevId: 540691205 Change-Id: I9eb99eb18893e6748892334470211dbd9d5808db --- .github/workflows/build.yml | 2 +- README.md | 7 ++++--- dist/mujoco.rc | 2 +- dist/simulate.rc | 2 +- doc/conf.py | 2 +- doc/models.rst | 2 +- doc/python.rst | 6 +++--- python/README.md | 4 ++-- python/setup.py | 2 +- unity/package.json | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5394c0ae..98f7417b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ # This configuration is used to build and test on GitHub Actions only. -# It is not the same configuration that is used by DeepMind to create release binaries. +# It is not the same configuration that is used by Google DeepMind to create release binaries. # The "official" binaries are built with Clang 13 on all platforms, and are linked against libc++ # on Linux. # diff --git a/README.md b/README.md index 83447777..d973a74e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ in robotics, biomechanics, graphics and animation, machine learning, and other areas which demand fast and accurate simulation of articulated structures interacting with their environment. -This repository is maintained by [DeepMind](https://www.deepmind.com/). +This repository is maintained by [Google DeepMind](https://www.deepmind.com/). MuJoCo has a C API and is intended for researchers and developers. The runtime simulation module is tuned to maximize performance and operates on low-level @@ -138,8 +138,9 @@ These packages give users of various languages access to MuJoCo functionality: #### First-party bindings: - [Python bindings](https://mujoco.readthedocs.io/en/stable/python.html) - - [dm_control](https://github.com/deepmind/dm_control), DeepMind's related - environment stack, includes [PyMJCF](https://github.com/deepmind/dm_control/blob/main/dm_control/mjcf/README.md), + - [dm_control](https://github.com/deepmind/dm_control), Google DeepMind's + related environment stack, includes + [PyMJCF](https://github.com/deepmind/dm_control/blob/main/dm_control/mjcf/README.md), a module for procedural manipulation of MuJoCo models. - [C# bindings and Unity plug-in](https://mujoco.readthedocs.io/en/stable/unity.html) diff --git a/dist/mujoco.rc b/dist/mujoco.rc index 1d0ecb2d..215cc7e5 100644 --- a/dist/mujoco.rc +++ b/dist/mujoco.rc @@ -14,7 +14,7 @@ FILETYPE 0x1 VALUE "FileVersion", "2.3.6" VALUE "InternalName", "mujoco.dll" VALUE "OriginalFilename", "mujoco.dll" - VALUE "CompanyName", "DeepMind" + VALUE "CompanyName", "Google DeepMind" VALUE "LegalCopyright", "Copyright 2021 DeepMind Technologies Limited." } } diff --git a/dist/simulate.rc b/dist/simulate.rc index e04670e4..a02a0825 100644 --- a/dist/simulate.rc +++ b/dist/simulate.rc @@ -16,7 +16,7 @@ FILETYPE 0x1 VALUE "FileVersion", "2.3.6" VALUE "InternalName", "simulate.exe" VALUE "OriginalFilename", "simulate.exe" - VALUE "CompanyName", "DeepMind" + VALUE "CompanyName", "Google DeepMind" VALUE "LegalCopyright", "Copyright 2021 DeepMind Technologies Limited." } } diff --git a/doc/conf.py b/doc/conf.py index 6348bd0a..0f93efde 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -32,7 +32,7 @@ from sphinxcontrib import youtube # pylint: disable=g-import-not-at-top,unused- project = 'MuJoCo' copyright = 'DeepMind Technologies Limited' # pylint: disable=redefined-builtin -author = 'DeepMind' +author = 'Google DeepMind' # -- General configuration --------------------------------------------------- diff --git a/doc/models.rst b/doc/models.rst index c55c218b..4b062082 100644 --- a/doc/models.rst +++ b/doc/models.rst @@ -8,7 +8,7 @@ MuJoCo Menagerie ---------------- Menagerie is a collection of high-quality simulation models for MuJoCo, curated -by DeepMind. +by Google DeepMind. For more information, visit the `Menagerie repository `__. diff --git a/doc/python.rst b/doc/python.rst index c70764de..cfcfb219 100644 --- a/doc/python.rst +++ b/doc/python.rst @@ -12,10 +12,10 @@ low-level bindings that are meant to give as close to a direct access to the MuJ order to provide an API and semantics that developers would expect in a typical Python library, the bindings deliberately diverge from the raw MuJoCo API in a number of places, which are documented throughout this page. -DeepMind’s `dm_control `__ reinforcement learning library (which prior to +Google DeepMind’s `dm_control `__ reinforcement learning library (which prior to version 1.0.0 implemented its own MuJoCo bindings based on ``ctypes``) has been updated to depend on the ``mujoco`` -package and continues to be supported by DeepMind. Changes in dm_control should be largely transparent to users of -previous versions, however code that depended directly on its low-level API may need to be updated. Consult the +package and continues to be supported by Google DeepMind. Changes in dm_control should be largely transparent to users +of previous versions, however code that depended directly on its low-level API may need to be updated. Consult the `migration guide `__ for detail. For mujoco-py users, we include :ref:`notes ` below to aid migration. diff --git a/python/README.md b/python/README.md index aab14f5a..cb63a5ea 100644 --- a/python/README.md +++ b/python/README.md @@ -9,8 +9,8 @@ This package is the canonical Python bindings for the [MuJoCo physics engine](https://github.com/deepmind/mujoco). -These bindings are developed and maintained by DeepMind, and is kept up-to-date -with the latest developments in MuJoCo itself. +These bindings are developed and maintained by Google DeepMind, and is kept +up-to-date with the latest developments in MuJoCo itself. The `mujoco` package provides direct access to raw MuJoCo C API functions, structs, constants, and enumerations. Structs are provided as Python classes, diff --git a/python/setup.py b/python/setup.py index f9004d38..14442ea4 100644 --- a/python/setup.py +++ b/python/setup.py @@ -349,7 +349,7 @@ def find_data_files(package_dir, patterns): SETUP_KWARGS = dict( name='mujoco', version=__version__, - author='DeepMind', + author='Google DeepMind', author_email='mujoco@deepmind.com', description='MuJoCo Physics Simulator', long_description=get_long_description(), diff --git a/unity/package.json b/unity/package.json index cac2e395..300b497c 100644 --- a/unity/package.json +++ b/unity/package.json @@ -5,7 +5,7 @@ "description": "MuJoCo importer and runtime plug-in", "dependencies": {}, "author": { - "name" : "DeepMind", + "name" : "Google DeepMind", "email" : "mujoco@deepmind.com", "url" : "https://mujoco.org/" },