misc: Remove memoized_func -> functools.cache

Author: enwask

devito/arch/archinfo.py

@@ -1,6 +1,6 @@
 """Collection of utilities to detect properties of the underlying architecture."""
 
-from functools import cached_property
+from functools import cache, cached_property
 from subprocess import PIPE, Popen, DEVNULL, run
 from pathlib import Path
 import ctypes
@@ -14,7 +14,7 @@
 import psutil
 
 from devito.logger import warning
-from devito.tools import as_tuple, all_equal, memoized_func
+from devito.tools import as_tuple, all_equal
 
 __all__ = ['platform_registry', 'get_cpu_info', 'get_gpu_info', 'get_nvidia_cc',
            'get_cuda_path', 'get_hip_path', 'check_cuda_runtime', 'get_m1_llvm_path',
@@ -41,7 +41,7 @@
            'PVC', 'INTELGPUMAX', 'MAX1100', 'MAX1550']
 
 
-@memoized_func
+@cache
 def get_cpu_info():
     """Attempt CPU info autodetection."""
 
@@ -163,7 +163,7 @@ def get_cpu_brand():
     return cpu_info
 
 
-@memoized_func
+@cache
 def get_gpu_info():
     """Attempt GPU info autodetection."""
 
@@ -488,7 +488,7 @@ def parse_product_arch():
     return None
 
 
-@memoized_func
+@cache
 def get_nvidia_cc():
     libnames = ('libcuda.so', 'libcuda.dylib', 'cuda.dll')
     for libname in libnames:
@@ -511,7 +511,7 @@ def get_nvidia_cc():
         return 10*cc_major.value + cc_minor.value
 
 
-@memoized_func
+@cache
 def get_cuda_path():
     # *** First try: via commonly used environment variables
     for i in ['CUDA_HOME', 'CUDA_ROOT']:
@@ -531,7 +531,7 @@ def get_cuda_path():
     return None
 
 
-@memoized_func
+@cache
 def get_advisor_path():
     """
     Detect if Intel Advisor is installed on the machine and return
@@ -552,7 +552,7 @@ def get_advisor_path():
     return path
 
 
-@memoized_func
+@cache
 def get_hip_path():
     # *** First try: via commonly used environment variables
     for i in ['HIP_HOME']:
@@ -563,7 +563,7 @@ def get_hip_path():
     return None
 
 
-@memoized_func
+@cache
 def get_m1_llvm_path(language):
     # Check if Apple's llvm is installed (installable via Homebrew), which supports
     # OpenMP.
@@ -595,7 +595,7 @@ def get_m1_llvm_path(language):
     return None
 
 
-@memoized_func
+@cache
 def check_cuda_runtime():
     libnames = ('libcudart.so', 'libcudart.dylib', 'cudart.dll')
     for libname in libnames:
@@ -623,7 +623,7 @@ def check_cuda_runtime():
         warning("Unable to check compatibility of NVidia driver and runtime")
 
 
-@memoized_func
+@cache
 def lscpu():
     try:
         p1 = Popen(['lscpu'], stdout=PIPE, stderr=PIPE)
@@ -645,7 +645,7 @@ def lscpu():
         return {}
 
 
-@memoized_func
+@cache
 def get_platform():
     """Attempt Platform autodetection."""
 
@@ -1111,7 +1111,7 @@ def march(cls):
             return fallback
 
 
-@memoized_func
+@cache
 def node_max_mem_trans_nbytes(platform):
     """
     Return the maximum memory transaction size in bytes for the underlying

devito/arch/compiler.py

@@ -1,4 +1,4 @@
-from functools import partial
+from functools import cache, partial
 from hashlib import sha1
 from os import environ, path, makedirs
 from packaging.version import Version
@@ -19,13 +19,12 @@
 from devito.exceptions import CompilationError
 from devito.logger import debug, warning
 from devito.parameters import configuration
-from devito.tools import (as_list, change_directory, filter_ordered,
-                          memoized_func, make_tempdir)
+from devito.tools import as_list, change_directory, filter_ordered, make_tempdir
 
 __all__ = ['sniff_mpi_distro', 'compiler_registry']
 
 
-@memoized_func
+@cache
 def sniff_compiler_version(cc, allow_fail=False):
     """
     Detect the compiler version.
@@ -99,7 +98,7 @@ def sniff_compiler_version(cc, allow_fail=False):
     return ver
 
 
-@memoized_func
+@cache
 def sniff_mpi_distro(mpiexec):
     """
     Detect the MPI version.
@@ -117,7 +116,7 @@ def sniff_mpi_distro(mpiexec):
     return 'unknown'
 
 
-@memoized_func
+@cache
 def sniff_mpi_flags(mpicc='mpicc'):
     mpi_distro = sniff_mpi_distro('mpiexec')
     if mpi_distro != 'OpenMPI':
@@ -131,7 +130,7 @@ def sniff_mpi_flags(mpicc='mpicc'):
     return compile_flags.split(), link_flags.split()
 
 
-@memoized_func
+@cache
 def call_capture_output(cmd):
     """
     Memoize calls to codepy's `call_capture_output` to avoid leaking memory due

devito/tools/memoization.py

@@ -3,53 +3,14 @@
 from itertools import tee
 from typing import TypeVar
 
-__all__ = ['memoized_func', 'memoized_meth', 'memoized_generator', 'CacheInstances']
-
-
-class memoized_func:
-    """
-    Decorator. Caches a function's return value each time it is called.
-    If called later with the same arguments, the cached value is returned
-    (not reevaluated). This decorator may also be used on class methods,
-    but it will cache at the class level; to cache at the instance level,
-    use ``memoized_meth``.
-
-    Adapted from: ::
-
-        https://wiki.python.org/moin/PythonDecoratorLibrary#Memoize
-    """
-
-    def __init__(self, func):
-        self.func = func
-        self.cache = {}
-
-    def __call__(self, *args, **kw):
-        if not isinstance(args, Hashable):
-            # Uncacheable, a list, for instance.
-            # Better to not cache than blow up.
-            return self.func(*args, **kw)
-        key = (self.func, args, frozenset(kw.items()))
-        if key in self.cache:
-            return self.cache[key]
-        else:
-            value = self.func(*args, **kw)
-            self.cache[key] = value
-            return value
-
-    def __repr__(self):
-        """Return the function's docstring."""
-        return self.func.__doc__
-
-    def __get__(self, obj, objtype):
-        """Support instance methods."""
-        return partial(self.__call__, obj)
+__all__ = ['memoized_meth', 'memoized_generator', 'CacheInstances']
 
 
 class memoized_meth:
     """
     Decorator. Cache the return value of a class method.
 
-    Unlike ``memoized_func``, the return value of a given method invocation
+    Unlike ``functools.cache``, the return value of a given method invocation
     will be cached on the instance whose method was invoked. All arguments
     passed to a method decorated with memoize must be hashable.