Logging fix

examples/1_Simple/logger_example.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import logging
-from simsopt import initialize_logging
+from simsopt.util.log import initialize_logging
 
 """
 Example file for transparently logging both MPI and serial jobs
@@ -20,6 +20,7 @@
     comm = MPI.COMM_WORLD
 except:
     comm = None
+    print("MPI not found")
 
 if comm is not None:
     initialize_logging(mpi=True, filename='mpi.log')

src/simsopt/_core/graph_optimizable.py

@@ -21,7 +21,6 @@
 import logging
 
 import numpy as np
-from deprecated import deprecated
 
 from ..util.types import RealArray, StrArray, BoolArray, Key
 from .util import ImmutableId, OptimizableMeta, WeakKeyDefaultDict, \

src/simsopt/mhd/boozer.py

@@ -11,7 +11,6 @@
 from typing import Union, Iterable
 
 import numpy as np
-from ..util.dev import SimsoptRequires
 
 logger = logging.getLogger(__name__)
 
@@ -36,9 +35,6 @@
 
 from .._core.graph_optimizable import Optimizable
 
-# Temporarily commenting out the decorator till __instancecheck__ method is made working
-# @SimsoptRequires(MPI is not None, "mpi4py needs to be installed for running booz-xform"
-
 
 class Boozer(Optimizable):
     """

src/simsopt/mhd/spec.py

@@ -42,14 +42,12 @@
 from .._core.graph_optimizable import Optimizable
 from .._core.util import ObjectiveFailure
 from ..geo.surfacerzfourier import SurfaceRZFourier
-from ..util.dev import SimsoptRequires
 if MPI is not None:
     from ..util.mpi import MpiPartition
 else:
     MpiPartition = None
 
 
-@SimsoptRequires(MPI is not None, "mpi4py needs to be installed for running SPEC")
 class Spec(Optimizable):
     """
     This class represents the SPEC equilibrium code.

src/simsopt/mhd/vmec.py

@@ -27,7 +27,6 @@
     vmec = None
     logger.debug(str(e))
 
-from ..util.dev import SimsoptRequires
 from .._core.graph_optimizable import Optimizable
 from .._core.util import Struct, ObjectiveFailure
 from ..geo.surfacerzfourier import SurfaceRZFourier
@@ -79,8 +78,6 @@
 #                        control its own run history
 
 
-# Temporarily commenting out the decorator till __instancecheck__ method is made working
-#@SimsoptRequires(MPI is not None, "mpi4py needs to be installed for running VMEC")
 class Vmec(Optimizable):
     r"""
     This class represents the VMEC equilibrium code.

src/simsopt/util/mpi.py

@@ -14,7 +14,7 @@
 from typing import Union
 import numpy as np
 
-from monty.dev import requires
+from .dev import SimsoptRequires
 try:
     from mpi4py import MPI
 except ImportError:
@@ -42,7 +42,7 @@ def log(level: int = logging.INFO):
 logger = logging.getLogger(__name__)
 
 
-@requires(MPI is not None, "mpi4py is not installed")
+@SimsoptRequires(MPI is not None, "mpi4py is not installed")
 class MpiPartition:
     """
     This module contains functions related to dividing up the set of

src/simsopt/util/mpi_logger.py

@@ -28,9 +28,8 @@
 import logging
 import array
 import atexit
+import sys
 
-from monty.dev import requires
-#import mpi4py
 try:
     from mpi4py import MPI
 except ImportError:
@@ -60,7 +59,6 @@ def _destroy_log_comm():
 _log_comm_list = []
 
 
-@requires(MPI is not None, "mpi4py is needed by MPILogHandler, but not installed")
 class MPILogHandler(logging.Handler):
     """A Handler which logs messages over MPI to a single process
     which then write them to a file.

tests/util/test_dev.py

@@ -0,0 +1,31 @@
+import unittest
+
+try:
+    import numpy as np
+except ImportError:
+    np = None
+
+from simsopt.util.dev import SimsoptRequires, deprecated
+from simsopt._core.graph_optimizable import Optimizable
+
+@SimsoptRequires(np is not None, "numpy is not installed.")
+class TestClass(Optimizable):
+    def __init__(self):
+        x = np.array([1.2, 0.9, -0.4])
+        fixed = np.full(3, False)
+        super().__init__(x0=x, fixed=fixed)
+
+    def J(self):
+        return np.exp(self.full_x[0] ** 2 - np.exp(self.full_x[1]) \
+                      + np.sin(self.full_x[2]))
+
+    return_fn_map = {'J': J}
+
+class SimsoptRequiresTest(unittest.TestCase):
+    def test_instance_check(self):
+        tf = TestClass()
+        self.assertIsInstance(tf, TestClass)
+
+
+if __name__ == '__main__':
+    unittest.main()