Fix imports

ArthurDanjou · ArthurDanjou · commit c152b58275f3 · 2026-05-04T10:47:10.000+02:00
diff --git a/krum/aggregators/__init__.py b/krum/aggregators/__init__.py
@@ -48,7 +48,7 @@
 import pathlib
 from collections.abc import Callable
 
-import tools
+from .. import tools
 import torch
 
 # ---------------------------------------------------------------------------- #
diff --git a/krum/aggregators/brute.py b/krum/aggregators/brute.py
@@ -65,7 +65,7 @@
 import itertools
 import math
 
-import tools
+from .. import tools
 import torch
 
 from . import register
diff --git a/krum/aggregators/bulyan.py b/krum/aggregators/bulyan.py
@@ -76,7 +76,7 @@
 
 import math
 
-import tools
+from .. import tools
 import torch
 
 from . import register
diff --git a/krum/aggregators/krum.py b/krum/aggregators/krum.py
@@ -83,7 +83,7 @@
 
 import math
 
-import tools
+from .. import tools
 import torch
 
 from . import register
diff --git a/krum/aggregators/median.py b/krum/aggregators/median.py
@@ -61,7 +61,7 @@
 
 import math
 
-import tools
+from .. import tools
 import torch
 
 from . import register
diff --git a/krum/attacks/__init__.py b/krum/attacks/__init__.py
@@ -47,7 +47,7 @@
 import pathlib
 from collections.abc import Callable
 
-import tools
+from .. import tools
 import torch
 
 # ---------------------------------------------------------------------------- #
diff --git a/krum/attacks/identical.py b/krum/attacks/identical.py
@@ -82,7 +82,7 @@
 import math
 from collections.abc import Callable
 
-import tools
+from .. import tools
 import torch
 
 from . import register
diff --git a/krum/experiments/checkpoint.py b/krum/experiments/checkpoint.py
@@ -35,7 +35,7 @@
 import copy
 import pathlib
 
-import tools
+from .. import tools
 import torch
 
 from .model import Model
diff --git a/krum/experiments/configuration.py b/krum/experiments/configuration.py
@@ -35,7 +35,7 @@
 
 from collections.abc import Mapping
 
-import tools
+from .. import tools
 import torch
 
 # ---------------------------------------------------------------------------- #
diff --git a/krum/experiments/dataset.py b/krum/experiments/dataset.py
@@ -40,7 +40,7 @@
 import tempfile
 import types
 
-import tools
+from .. import tools
 import torch
 import torchvision
 
diff --git a/krum/experiments/datasets/svm.py b/krum/experiments/datasets/svm.py
@@ -34,9 +34,8 @@
 
 __all__ = ["phishing"]
 
-import experiments
 import requests
-import tools
+from .. import dataset, tools
 import torch
 
 # ---------------------------------------------------------------------------- #
@@ -48,7 +47,7 @@
 )
 
 #: Default directory where pre-processed datasets are cached.
-default_root = experiments.dataset.Dataset.get_default_root()
+default_root = dataset.Dataset.get_default_root()
 
 # ---------------------------------------------------------------------------- #
 # Dataset lazy-loaders
@@ -193,6 +192,6 @@ def phishing(train=True, batch_size=None, root=None, download=False, *args, **kw
             root or default_root,
             None if download is None else default_url_phishing,
         )
-        return experiments.batch_dataset(
+        return dataset.batch_dataset(
             inputs, labels, train, batch_size, split=8400
         )
diff --git a/krum/experiments/loss.py b/krum/experiments/loss.py
@@ -32,7 +32,7 @@
 
 __all__ = ["Criterion", "Loss"]
 
-import tools
+from .. import tools
 import torch
 
 # ---------------------------------------------------------------------------- #
diff --git a/krum/experiments/model.py b/krum/experiments/model.py
@@ -36,7 +36,7 @@
 import pathlib
 import types
 
-import tools
+from .. import tools
 import torch
 import torchvision
 
diff --git a/krum/experiments/optimizer.py b/krum/experiments/optimizer.py
@@ -30,7 +30,7 @@
 
 __all__ = ["Optimizer"]
 
-import tools
+from .. import tools
 import torch
 
 # ---------------------------------------------------------------------------- #
diff --git a/krum/tools/misc.py b/krum/tools/misc.py
@@ -84,7 +84,7 @@
 import time
 import traceback
 
-import tools
+from . import UserException, Context, trace, warning, fatal
 
 # ---------------------------------------------------------------------------- #
 # Unavailable user exception class
@@ -134,10 +134,10 @@ def fatal_unavailable(*args, **kwargs) -> None:
         Keyword arguments forwarded to
         :func:`make_unavailable_exception_text`.
     """
-    tools.fatal(make_unavailable_exception_text(*args, **kwargs))
+    fatal(make_unavailable_exception_text(*args, **kwargs))
 
 
-class UnavailableException(tools.UserException):
+class UnavailableException(UserException):
     """User-facing exception raised when a selected registry entry is missing."""
 
     def __init__(self, *args, **kwargs) -> None:
@@ -304,7 +304,7 @@ def instantiate(self, name: str, *args, **kwargs) -> object:
 
         Raises
         ------
-        tools.UserException
+        UserException
             If ``name`` is not registered.
         """
         # Assertions
@@ -320,7 +320,7 @@ def instantiate(self, name: str, *args, **kwargs) -> object:
                     + ("', '").join(self.__register.keys())
                     + "'"
                 )
-            raise tools.UserException(cause)
+            raise UserException(cause)
         # Instantiation
         return self.__register[name](*args, **kwargs)
 
@@ -389,7 +389,7 @@ def parse_keyval(
 
     Raises
     ------
-    tools.UserException
+    UserException
         If an entry is malformed, a key is provided more than once, or
         conversion to a default value's type fails.
 
@@ -409,7 +409,7 @@ def parse_keyval(
     for entry in list_keyval:
         pos = entry.find(sep)
         if pos < 0:
-            raise tools.UserException(
+            raise UserException(
                 "Expected list of "
                 + repr("<key>:<value>")
                 + ", got "
@@ -418,7 +418,7 @@ def parse_keyval(
             )
         key = entry[:pos]
         if key in parsed:
-            raise tools.UserException(
+            raise UserException(
                 "Key "
                 + repr(key)
                 + " had already been specified with value "
@@ -434,7 +434,7 @@ def parse_keyval(
                 else:
                     val = cls(val)
             except Exception:
-                raise tools.UserException(
+                raise UserException(
                     "Required key "
                     + repr(key)
                     + " expected a value of type "
@@ -574,7 +574,7 @@ def setter(*args, **kwargs):
 # Plain context augmented with simple execution time measurement
 
 
-class TimedContext(tools.Context):
+class TimedContext(Context):
     """Context manager that logs the elapsed runtime of a block."""
 
     def __init__(self, *args, **kwargs) -> None:
@@ -584,9 +584,9 @@ def __init__(self, *args, **kwargs) -> None:
         Parameters
         ----------
         *args : object
-            Positional arguments forwarded to ``tools.Context``.
+            Positional arguments forwarded to ``Context``.
         **kwargs : object
-            Keyword arguments forwarded to ``tools.Context``.
+            Keyword arguments forwarded to ``Context``.
         """
         super().__init__(*args, **kwargs)
 
@@ -597,7 +597,7 @@ def __enter__(self):
         Returns
         -------
         object
-            Value returned by ``tools.Context.__enter__``.
+            Value returned by ``Context.__enter__``.
         """
         self._chrono = time.time()
         return super().__enter__()
@@ -609,9 +609,9 @@ def __exit__(self, *args, **kwargs) -> None:
         Parameters
         ----------
         *args : object
-            Positional arguments forwarded to ``tools.Context.__exit__``.
+            Positional arguments forwarded to ``Context.__exit__``.
         **kwargs : object
-            Keyword arguments forwarded to ``tools.Context.__exit__``.
+            Keyword arguments forwarded to ``Context.__exit__``.
         """
         # Measure elapsed runtime (in ns)
         runtime = (time.time() - self._chrono) * 1000000000.0
@@ -623,7 +623,7 @@ def __exit__(self, *args, **kwargs) -> None:
         else:
             unit = "s"
         # Format and print string
-        tools.trace(f"Execution time: {runtime:.3g} {unit}")
+        trace(f"Execution time: {runtime:.3g} {unit}")
         # Forward call
         super().__exit__(*args, **kwargs)
 
@@ -662,7 +662,7 @@ def interactive(
     except Exception:
         caller = None
         if glbs is None:
-            tools.warning(
+            warning(
                 "Unable to recover caller's frame, locals and globals",
                 context="interactive",
             )
@@ -716,7 +716,7 @@ def interactive(
                 else:  # Multi-line statement is complete
                     exec(command, glbs, lcls)
         except Exception:
-            with tools.Context("uncaught", "error"):
+            with Context("uncaught", "error"):
                 traceback.print_exc()
         command = ""
         statement = False
