Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/pydata/numexpr
Browse files Browse the repository at this point in the history
  • Loading branch information
robbmcleod committed Aug 18, 2023
2 parents 9b380ae + c1b55e5 commit 7d377e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions numexpr/cpuinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def _getNCPUs(self):

def __get_nbits(self):
abits = platform.architecture()[0]
nbits = re.compile('(\d+)bit').search(abits).group(1)
nbits = re.compile(r'(\d+)bit').search(abits).group(1)
return nbits

def _is_32bit(self):
Expand Down Expand Up @@ -658,7 +658,7 @@ def __init__(self):
#XXX: Bad style to use so long `try:...except:...`. Fix it!

prgx = re.compile(r"family\s+(?P<FML>\d+)\s+model\s+(?P<MDL>\d+)"
"\s+stepping\s+(?P<STP>\d+)", re.IGNORECASE)
r"\s+stepping\s+(?P<STP>\d+)", re.IGNORECASE)
chnd = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, self.pkey)
pnum = 0
while 1:
Expand Down
4 changes: 2 additions & 2 deletions numexpr/necompiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ def validate(ex: str,
_frame_depth: int = 2,
sanitize: bool = True,
**kwargs) -> Optional[Exception]:
"""
r"""
Validate a NumExpr expression with the given `local_dict` or `locals()`.
Returns `None` on success and the Exception object if one occurs. Note that
you can proceed directly to call `re_evaluate()` if you use `validate()`
Expand Down Expand Up @@ -887,7 +887,7 @@ def evaluate(ex: str,
sanitize: bool = True,
_frame_depth: int = 3,
**kwargs) -> numpy.ndarray:
"""
r"""
Evaluate a simple array expression element-wise using the virtual machine.
Parameters
Expand Down

0 comments on commit 7d377e3

Please sign in to comment.