copy whole spynnaker.pyNN.__init__.py

Author: Christian-B

spynnaker/pyNN/__init__.py

@@ -21,7 +21,9 @@
 # pylint: disable=invalid-name
 
 # common imports
+import filecmp
 import logging
+import os
 from typing import (
     Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple, Type,
     TypedDict, Union, cast)
@@ -50,6 +52,11 @@
 from spinn_front_end_common.utilities.exceptions import (
     ConfigurationException)
 
+# Selt import to check if copied into pyNN.spiNNaker
+import spynnaker.pyNN as _sim
+
+from spynnaker.pyNN.exceptions import SpynnakerException
+
 from spynnaker.pyNN.random_distribution import RandomDistribution
 from spynnaker.pyNN.data import SpynnakerDataView
 from spynnaker.pyNN.models.abstract_pynn_model import AbstractPyNNModel
@@ -138,6 +145,8 @@
 from spynnaker.pyNN import external_devices
 from spynnaker.pyNN import extra_models
 
+from spynnaker.pyNN.setup_pynn import setup_pynn
+
 # big stuff
 from spynnaker.pyNN.spinnaker import SpiNNaker
 
@@ -745,3 +754,13 @@ def get_machine() -> Machine:
     """
     SpynnakerDataView.check_user_can_act()
     return SpynnakerDataView.get_machine()
+
+
+# Check copy in case being run from pyNN.spiNNaker
+indirect = os.path.abspath(_sim.__file__)
+direct = __file__
+if direct != indirect:
+    if not filecmp.cmp(direct, indirect):
+        setup_pynn()
+        raise SpynnakerException(
+            "pyNN.spiNNaker needed updating please restart your script")

spynnaker/pyNN/setup_pynn.py

@@ -21,9 +21,12 @@
 """
 
 import os
+import shutil
 from types import ModuleType
 from packaging.version import Version
 import pyNN
+import spynnaker.pyNN as sim
+
 
 # The version of PyNN that we really want
 _TARGET_PYNN_VERSION = "0.9"
@@ -54,11 +57,10 @@ def install_spynnaker_into(module: ModuleType) -> None:
     if not os.path.exists(spinnaker_dir):
         os.mkdir(spinnaker_dir)
 
-    spinnaker_init = os.path.join(spinnaker_dir, "__init__.py")
-    with open(spinnaker_init, "w", encoding="utf-8") as spinn_file:
-        spinn_file.write("from spynnaker.pyNN import *\n")
-
-    print(f"Created {spinnaker_init} to point to spynnaker.pyNN")
+    pynn_init = os.path.join(spinnaker_dir, "__init__.py")
+    spynnaker_init = os.path.abspath(sim.__file__)
+    shutil.copyfile(spynnaker_init, pynn_init)
+    print(f"Updated {pynn_init} to be the same as spynnaker.pyNN")
 
 
 def setup_pynn() -> None: