Skip to content

Commit 881544c

Browse files
thowellcopybara-github
authored andcommitted
Modify MuJoCo Warp dev version check
PiperOrigin-RevId: 869311325 Change-Id: I2f34bd932d7998d37b96b36e5d561f734567b8d5
1 parent 716ae10 commit 881544c

File tree

1 file changed

+7
-13
lines changed
  • mjx/mujoco/mjx/third_party/mujoco_warp/_src

1 file changed

+7
-13
lines changed

mjx/mujoco/mjx/third_party/mujoco_warp/_src/io.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515

1616
import dataclasses
1717
import importlib.metadata
18-
import re
1918
import warnings
2019
from typing import Any, Optional, Sequence
2120

2221
import mujoco
2322
import numpy as np
23+
import packaging.version
2424
import warp as wp
2525

2626
from mujoco.mjx.third_party.mujoco_warp._src import bvh
@@ -31,18 +31,12 @@
3131

3232

3333
def _is_mujoco_dev() -> bool:
34-
_DEV_VERSION_PATTERN = re.compile(r"^\d+\.\d+\.\d+.+") # anything after x.y.z
35-
36-
version = getattr(__import__("mujoco"), "__version__", None)
37-
if version and _DEV_VERSION_PATTERN.match(version):
38-
return True
39-
40-
# fall back to metadata
41-
dist_version = importlib.metadata.version("mujoco")
42-
if _DEV_VERSION_PATTERN.match(dist_version):
43-
return True
44-
45-
return False
34+
"""Checks if mujoco version is > 3.4.0."""
35+
version_str = getattr(mujoco, "__version__", None)
36+
if not version_str:
37+
version_str = importlib.metadata.version("mujoco")
38+
version_str = version_str.split("-")[0].split(".dev")[0]
39+
return packaging.version.parse(version_str) > packaging.version.parse("3.4.0")
4640

4741

4842
BLEEDING_EDGE_MUJOCO = _is_mujoco_dev()

0 commit comments

Comments
 (0)