Skip to content

Commit bf855d6

Browse files
authored
Merge branch 'google-deepmind:main' into musculoskeletal_dog_creation
2 parents 007c06e + ed42450 commit bf855d6

5 files changed

Lines changed: 21 additions & 9 deletions

File tree

dm_control/mjcf/schema.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,9 @@
444444
<attribute name="user" type="array" array_type="float"/>
445445
<attribute name="kp" type="float"/>
446446
<attribute name="kv" type="float"/>
447+
<attribute name="dampratio" type="float"/>
447448
<attribute name="timeconst" type="float"/>
449+
<attribute name="inheritrange" type="float"/>
448450
</attributes>
449451
</element>
450452
<element name="velocity">
@@ -473,6 +475,8 @@
473475
<attribute name="user" type="array" array_type="float"/>
474476
<attribute name="kp" type="float"/>
475477
<attribute name="kv" type="float"/>
478+
<attribute name="dampratio" type="float"/>
479+
<attribute name="inheritrange" type="float"/>
476480
</attributes>
477481
</element>
478482
<element name="damper">
@@ -751,7 +755,9 @@
751755
<attribute name="user" type="array" array_type="float"/>
752756
<attribute name="kp" type="float"/>
753757
<attribute name="kv" type="float"/>
758+
<attribute name="dampratio" type="float"/>
754759
<attribute name="timeconst" type="float"/>
760+
<attribute name="inheritrange" type="float"/>
755761
</attributes>
756762
</element>
757763
<element name="velocity">
@@ -778,6 +784,8 @@
778784
<attribute name="user" type="array" array_type="float"/>
779785
<attribute name="kp" type="float"/>
780786
<attribute name="kv" type="float"/>
787+
<attribute name="dampratio" type="float"/>
788+
<attribute name="inheritrange" type="float"/>
781789
</attributes>
782790
</element>
783791
<element name="damper">
@@ -1999,7 +2007,9 @@
19992007
<attribute name="user" type="array" array_type="float"/>
20002008
<attribute name="kp" type="float"/>
20012009
<attribute name="kv" type="float"/>
2010+
<attribute name="dampratio" type="float"/>
20022011
<attribute name="timeconst" type="float"/>
2012+
<attribute name="inheritrange" type="float"/>
20032013
</attributes>
20042014
</element>
20052015
<element name="velocity" repeated="true" namespace="actuator">
@@ -2048,6 +2058,8 @@
20482058
<attribute name="user" type="array" array_type="float"/>
20492059
<attribute name="kp" type="float"/>
20502060
<attribute name="kv" type="float"/>
2061+
<attribute name="dampratio" type="float"/>
2062+
<attribute name="inheritrange" type="float"/>
20512063
</attributes>
20522064
</element>
20532065
<element name="damper" repeated="true" namespace="actuator">

dm_control/mujoco/tutorial.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"\"\"\")\n",
9494
"\n",
9595
"print('Installing dm_control...')\n",
96-
"!pip install -q dm_control\u003e=1.0.19\n",
96+
"!pip install -q dm_control\u003e=1.0.20\n",
9797
"\n",
9898
"# Configure dm_control to use the EGL rendering backend (requires GPU)\n",
9999
"%env MUJOCO_GL=egl\n",

requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ dm-tree==0.1.8
44
glfw==1.12.0
55
h5py==3.11.0
66
labmaze==1.0.6
7-
lxml==5.2.1
7+
lxml==5.2.2
88
mock==5.1.0
9-
mujoco==3.1.5
9+
mujoco==3.1.6
1010
nose==1.3.7
1111
nose-xunitmp==0.4.1
1212
numpy==1.24.4; python_version == '3.8'
@@ -15,8 +15,8 @@ Pillow==10.3.0
1515
protobuf==3.19.4 # TensorFlow requires protobuf<3.20 (b/182876485)
1616
pyopengl==3.1.7
1717
pyparsing==3.1.2
18-
requests==2.31.0
18+
requests==2.32.3
1919
scipy==1.10.1; python_version == '3.8'
20-
scipy==1.13.0; python_version >= '3.9'
21-
setuptools==69.0.2
20+
scipy==1.13.1; python_version >= '3.9'
21+
setuptools==70.0.0
2222
tqdm==4.66.4

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def is_excluded(s):
173173

174174
setup(
175175
name='dm_control',
176-
version='1.0.19',
176+
version='1.0.20',
177177
description='Continuous control environments and MuJoCo Python bindings.',
178178
long_description="""
179179
# `dm_control`: DeepMind Infrastructure for Physics-Based Simulation.
@@ -201,7 +201,7 @@ def is_excluded(s):
201201
'glfw',
202202
'labmaze',
203203
'lxml',
204-
'mujoco >= 3.1.5',
204+
'mujoco >= 3.1.6',
205205
'numpy >= 1.9.0',
206206
'protobuf >= 3.19.4', # TensorFlow requires protobuf<3.20 (b/182876485)
207207
'pyopengl >= 3.1.4',

tutorial.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"\"\"\")\n",
9494
"\n",
9595
"print('Installing dm_control...')\n",
96-
"!pip install -q dm_control\u003e=1.0.19\n",
96+
"!pip install -q dm_control\u003e=1.0.20\n",
9797
"\n",
9898
"# Configure dm_control to use the EGL rendering backend (requires GPU)\n",
9999
"%env MUJOCO_GL=egl\n",

0 commit comments

Comments
 (0)