Replace os.path with pathlib

And add type hints to configparser.py

Author: Armavica

doc/conf.py

@@ -12,11 +12,12 @@
 # serve to show the default value.
 
 # If your extensions are in another directory, add it here. If the directory
-# is relative to the documentation root, use os.path.abspath to make it
+# is relative to the documentation root, use Path.absolute to make it
 # absolute, like shown here.
-# sys.path.append(os.path.abspath('some/directory'))
+# sys.path.append(str(Path("some/directory").absolute()))
 
 import os
+import inspect
 import sys
 import pytensor
 
@@ -236,11 +237,9 @@ def find_source():
         obj = sys.modules[info["module"]]
         for part in info["fullname"].split("."):
             obj = getattr(obj, part)
-        import inspect
-        import os
 
-        fn = inspect.getsourcefile(obj)
-        fn = os.path.relpath(fn, start=os.path.dirname(pytensor.__file__))
+        fn = Path(inspect.getsourcefile(obj))
+        fn = fn.relative_to(Path(__file__).parent)
         source, lineno = inspect.getsourcelines(obj)
         return fn, lineno, lineno + len(source) - 1
 

doc/library/d3viz/index.rst

@@ -76,10 +76,9 @@ visualize it with :py:func:`pytensor.printing.pydotprint` as follows:
 .. code:: python
 
     from pytensor.printing import pydotprint
-    import os
+    from pathlib import Path
 
-    if not os.path.exists('examples'):
-        os.makedirs('examples')
+    Path("examples").mkdir(exist_ok=True)
     pydotprint(predict, 'examples/mlp.png')
 
 

doc/troubleshooting.rst

@@ -259,7 +259,7 @@ PyTensor/BLAS speed test:
 
 .. code-block:: bash
 
-    python `python -c "import os, pytensor; print(os.path.dirname(pytensor.__file__))"`/misc/check_blas.py
+    python $(python -c "import pathlib, pytensor; print(pathlib.Path(pytensor.__file__).parent / 'misc/check_blas.py')")
 
 This will print a table with different versions of BLAS/numbers of
 threads on multiple CPUs. It will also print some PyTensor/NumPy

environment.yml

@@ -11,7 +11,7 @@ dependencies:
   - compilers
   - numpy>=1.17.0,<2
   - scipy>=0.14,<1.14.0
-  - filelock
+  - filelock>=3.15
   - etuples
   - logical-unification
   - miniKanren
@@ -27,7 +27,6 @@ dependencies:
   - coveralls
   - diff-cover
   - mypy
-  - types-filelock
   - types-setuptools
   - pytest
   - pytest-cov

pyproject.toml

@@ -49,7 +49,7 @@ dependencies = [
     "setuptools>=59.0.0",
     "scipy>=0.14,<1.14",
     "numpy>=1.17.0,<2",
-    "filelock",
+    "filelock>=3.15",
     "etuples",
     "logical-unification",
     "miniKanren",

pytensor/__init__.py

@@ -23,9 +23,9 @@
 # Set a default logger. It is important to do this before importing some other
 # pytensor code, since this code may want to log some messages.
 import logging
-import os
 import sys
 from functools import singledispatch
+from pathlib import Path
 from typing import Any, NoReturn, Optional
 
 from pytensor.version import version as __version__
@@ -52,10 +52,8 @@ def disable_log_handler(logger=pytensor_logger, handler=logging_default_handler)
 
 # Raise a meaningful warning/error if the pytensor directory is in the Python
 # path.
-rpath = os.path.realpath(__path__[0])
-for p in sys.path:
-    if os.path.realpath(p) != rpath:
-        continue
+rpath = Path(__file__).parent.resolve()
+if any(rpath == Path(p).resolve() for p in sys.path):
     raise RuntimeError("You have the pytensor directory in your Python path.")
 
 from pytensor.configdefaults import config

pytensor/compile/compiledir.py

@@ -4,7 +4,6 @@
 """
 
 import logging
-import os
 import pickle
 import shutil
 from collections import Counter
@@ -33,12 +32,11 @@ def cleanup():
     If there is no key left for a compiled module, we delete the module.
 
     """
-    compiledir = config.compiledir
-    for directory in os.listdir(compiledir):
+    for directory in config.compiledir.iterdir():
         try:
-            filename = os.path.join(compiledir, directory, "key.pkl")
+            filename = directory / "key.pkl"
             # print file
-            with open(filename, "rb") as file:
+            with filename.open("rb") as file:
                 try:
                     keydata = pickle.load(file)
 
@@ -79,7 +77,7 @@ def cleanup():
                                     "the directory containing it."
                                 )
                     if len(keydata.keys) == 0:
-                        shutil.rmtree(os.path.join(compiledir, directory))
+                        shutil.rmtree(directory)
 
                 except (EOFError, AttributeError):
                     _logger.error(
@@ -117,11 +115,11 @@ def print_compiledir_content():
     big_key_files = []
     total_key_sizes = 0
     nb_keys = Counter()
-    for dir in os.listdir(compiledir):
-        filename = os.path.join(compiledir, dir, "key.pkl")
-        if not os.path.exists(filename):
+    for dir in config.compiledir.iterdir():
+        filename = dir / "key.pkl"
+        if not filename.exists():
             continue
-        with open(filename, "rb") as file:
+        with filename.open("rb") as file:
             try:
                 keydata = pickle.load(file)
                 ops = list({x for x in flatten(keydata.keys) if isinstance(x, Op)})
@@ -134,15 +132,11 @@ def print_compiledir_content():
                         {x for x in flatten(keydata.keys) if isinstance(x, CType)}
                     )
                     compile_start = compile_end = float("nan")
-                    for fn in os.listdir(os.path.join(compiledir, dir)):
-                        if fn.startswith("mod.c"):
-                            compile_start = os.path.getmtime(
-                                os.path.join(compiledir, dir, fn)
-                            )
-                        elif fn.endswith(".so"):
-                            compile_end = os.path.getmtime(
-                                os.path.join(compiledir, dir, fn)
-                            )
+                    for fn in dir.iterdir():
+                        if fn.name == "mod.c":
+                            compile_start = fn.stat().st_mtime
+                        elif fn.suffix == ".so":
+                            compile_end = fn.stat().st_mtime
                     compile_time = compile_end - compile_start
                     if len(ops) == 1:
                         table.append((dir, ops[0], types, compile_time))
@@ -153,7 +147,7 @@ def print_compiledir_content():
                             (dir, ops_to_str, types_to_str, compile_time)
                         )
 
-                size = os.path.getsize(filename)
+                size = filename.stat().st_size
                 total_key_sizes += size
                 if size > max_key_file_size:
                     big_key_files.append((dir, size, ops))
@@ -239,8 +233,8 @@ def basecompiledir_ls():
     """
     subdirs = []
     others = []
-    for f in os.listdir(config.base_compiledir):
-        if os.path.isdir(os.path.join(config.base_compiledir, f)):
+    for f in config.base_compiledir.iterdir():
+        if f.is_dir():
             subdirs.append(f)
         else:
             others.append(f)

pytensor/compile/compilelock.py

@@ -6,6 +6,7 @@
 import os
 import threading
 from contextlib import contextmanager
+from pathlib import Path
 
 import filelock
 
@@ -35,7 +36,7 @@ def force_unlock(lock_dir: os.PathLike):
         Path to a directory that was locked with `lock_ctx`.
     """
 
-    fl = filelock.FileLock(os.path.join(lock_dir, ".lock"))
+    fl = filelock.FileLock(Path(lock_dir) / ".lock")
     fl.release(force=True)
 
     dir_key = f"{lock_dir}-{os.getpid()}"
@@ -72,7 +73,7 @@ def lock_ctx(
 
     if dir_key not in local_mem._locks:
         local_mem._locks[dir_key] = True
-        fl = filelock.FileLock(os.path.join(lock_dir, ".lock"))
+        fl = filelock.FileLock(Path(lock_dir) / ".lock")
         fl.acquire(timeout=timeout)
         try:
             yield

pytensor/compile/profiling.py

@@ -16,6 +16,7 @@
 import time
 from collections import Counter, defaultdict
 from contextlib import contextmanager
+from pathlib import Path
 from typing import Any
 
 import numpy as np
@@ -34,7 +35,7 @@ def extended_open(filename, mode="r"):
     elif filename == "<stderr>":
         yield sys.stderr
     else:
-        with open(filename, mode=mode) as f:
+        with Path(filename).open(mode=mode) as f:
             yield f