merged in master

gfe_examples/Conways/partitioned_example_a_no_vis_no_buffer/conways_basic_cell.py

@@ -70,8 +70,7 @@ def __init__(self, label, state):
         additional_arguments={"data_n_time_steps"})
     def generate_machine_data_specification(
             self, spec, placement, machine_graph, routing_info, iptags,
-            reverse_iptags, machine_time_step, time_scale_factor,
-            data_n_time_steps):
+            reverse_iptags, data_n_time_steps):
         """
         :param ~.DataSpecificationGenerator spec:
         :param ~.MachineGraph machine_graph:
@@ -80,8 +79,7 @@ def generate_machine_data_specification(
         # pylint: disable=arguments-differ
 
         # Generate the system data region for simulation .c requirements
-        generate_system_data_region(spec, DataRegions.SYSTEM,
-                                    self, machine_time_step, time_scale_factor)
+        generate_system_data_region(spec, DataRegions.SYSTEM, self)
 
         # reserve memory regions
         spec.reserve_memory_region(

gfe_examples/Conways/partitioned_example_a_no_vis_no_buffer/conways_partitioned.py

@@ -21,7 +21,6 @@
         ConwayBasicCell)
 
 runtime = 50
-# machine_time_step = 100
 MAX_X_SIZE_OF_FABRIC = 7
 MAX_Y_SIZE_OF_FABRIC = 7
 n_chips = (MAX_X_SIZE_OF_FABRIC * MAX_Y_SIZE_OF_FABRIC) // 15

gfe_examples/Conways/partitioned_example_b_no_vis_buffer/conways_basic_cell.py

@@ -78,8 +78,7 @@ def __init__(self, label, state):
         additional_arguments={"data_n_time_steps"})
     def generate_machine_data_specification(
             self, spec, placement, machine_graph, routing_info, iptags,
-            reverse_iptags, machine_time_step, time_scale_factor,
-            data_n_time_steps):
+            reverse_iptags, data_n_time_steps):
         """
         :param ~.DataSpecificationGenerator spec:
         :param ~.MachineGraph machine_graph:

gfe_examples/Conways/partitioned_example_b_no_vis_buffer/conways_partitioned.py

@@ -21,7 +21,6 @@
         ConwayBasicCell)
 
 runtime = 50
-# machine_time_step = 100
 MAX_X_SIZE_OF_FABRIC = 7
 MAX_Y_SIZE_OF_FABRIC = 7
 n_chips = (MAX_X_SIZE_OF_FABRIC * MAX_Y_SIZE_OF_FABRIC) // 15

gfe_examples/hello_world/hello_world_vertex.py

@@ -64,7 +64,7 @@ def resources_required(self):
     @overrides(MachineDataSpecableVertex.generate_machine_data_specification)
     def generate_machine_data_specification(
             self, spec, placement, machine_graph, routing_info, iptags,
-            reverse_iptags, machine_time_step, time_scale_factor):
+            reverse_iptags):
         # Generate the system data region for simulation .c requirements
         self.generate_system_region(spec)
 

gfe_examples/hello_world_untimed/hello_world_vertex.py

@@ -94,8 +94,7 @@ def generate_data_specification(self, spec, placement, data_n_steps):
 
         # Generate the system data region for simulation .c requirements
         # Note that the time step and time scale factor are unused here
-        generate_steps_system_data_region(
-            spec, DataRegions.SYSTEM, self)
+        generate_steps_system_data_region(spec, DataRegions.SYSTEM, self)
 
         # Create the data regions for hello world
         spec.reserve_memory_region(

gfe_examples/template/template_vertex.py

@@ -84,7 +84,7 @@ def resources_required(self):
     @overrides(MachineDataSpecableVertex.generate_machine_data_specification)
     def generate_machine_data_specification(
             self, spec, placement, machine_graph, routing_info, iptags,
-            reverse_iptags, machine_time_step, time_scale_factor):
+            reverse_iptags):
         """ Generate data
 
         :param placement: the placement object for the DSG

gfe_integration_tests/sdram_edge_tests/common/sdram_machine_vertex.py

@@ -78,7 +78,7 @@ def get_binary_start_type(self):
     @overrides(MachineDataSpecableVertex.generate_machine_data_specification)
     def generate_machine_data_specification(
             self, spec, placement, machine_graph, routing_info, iptags,
-            reverse_iptags, machine_time_step, time_scale_factor):
+            reverse_iptags):
 
         # reserve memory regions
         spec.reserve_memory_region(
@@ -88,8 +88,7 @@ def generate_machine_data_specification(
         # simulation .c requirements
         spec.switch_write_focus(DataRegions.SYSTEM)
         spec.write_array(simulation_utilities.get_simulation_header_array(
-            self.get_binary_file_name(), machine_time_step,
-            time_scale_factor))
+            self.get_binary_file_name()))
 
         # get counters
         outgoing_partitions = list(

gfe_integration_tests/sdram_edge_tests/test_c_sdram_with_recording/sdram_machine_recorded_vertex.py

@@ -100,8 +100,7 @@ def get_binary_start_type(self):
         additional_arguments={"data_n_time_steps"})
     def generate_machine_data_specification(
             self, spec, placement, machine_graph, routing_info, iptags,
-            reverse_iptags, machine_time_step, time_scale_factor,
-            data_n_time_steps):
+            reverse_iptags, data_n_time_steps):
 
         # reserve memory regions
         spec.reserve_memory_region(
@@ -111,8 +110,7 @@ def generate_machine_data_specification(
         # simulation .c requirements
         spec.switch_write_focus(DataRegions.SYSTEM)
         spec.write_array(simulation_utilities.get_simulation_header_array(
-            self.get_binary_file_name(), machine_time_step,
-            time_scale_factor))
+            self.get_binary_file_name()))
 
         # TODO use get_sdram_edge_partitions_starting_at_vertex
         # get counters

gfe_integration_tests/test_extra_monitor/sdram_writer.py

@@ -55,15 +55,14 @@ def get_binary_start_type(self):
 
     def generate_machine_data_specification(
             self, spec, placement, machine_graph, routing_info, iptags,
-            reverse_iptags, machine_time_step, time_scale_factor):
+            reverse_iptags):
         # Reserve SDRAM space for memory areas:
         self._reserve_memory_regions(spec)
 
         # write data for the simulation data item
         spec.switch_write_focus(DataRegions.SYSTEM)
         spec.write_array(simulation_utilities.get_simulation_header_array(
-            self.get_binary_file_name(), machine_time_step,
-            time_scale_factor))
+            self.get_binary_file_name()))
 
         spec.switch_write_focus(DataRegions.CONFIG)
         spec.write_value(self._size)

gfe_integration_tests/test_rte/run_vertex.py

@@ -41,6 +41,5 @@ def get_binary_start_type(self):
     def generate_data_specification(self, spec, placement):
         spec.reserve_memory_region(0, SIMULATION_N_BYTES)
         spec.switch_write_focus(0)
-        spec.write_array(utils.get_simulation_header_array(
-            self._aplx_file, 1000, time_scale_factor=1))
+        spec.write_array(utils.get_simulation_header_array(self._aplx_file))
         spec.end_specification()

spinnaker_graph_front_end/__init__.py

@@ -75,9 +75,8 @@
            'add_vertex', 'add_machine_vertex', 'add_machine_vertex_instance',
            'add_edge', 'add_application_edge_instance', 'add_machine_edge',
            'add_machine_edge_instance', 'add_socket_address', 'get_txrx',
-           'has_ran', 'machine_time_step',
-           'get_number_of_available_cores_on_machine', 'no_machine_time_steps',
-           'time_scale_factor', 'machine_graph', 'application_graph',
+           'has_ran', 'get_number_of_available_cores_on_machine',
+           'no_machine_time_steps', 'machine_graph', 'application_graph',
            'routing_infos', 'placements', 'transceiver',
            'buffer_manager', 'machine', 'is_allocated_machine']
 
@@ -438,14 +437,6 @@ def has_ran():
     return _sim().has_ran
 
 
-def machine_time_step():
-    """ Get the size of machine time step, in microseconds.
-
-    :rtype: int
-    """
-    return _sim().machine_time_step
-
-
 def no_machine_time_steps():
     """ Get the number of time/simulation steps executed.
 
@@ -454,14 +445,6 @@ def no_machine_time_steps():
     return _sim().no_machine_time_steps
 
 
-def time_scale_factor():
-    """ Get the time scaling factor.
-
-    :rtype: int
-    """
-    return _sim().time_scale_factor
-
-
 def machine_graph():
     """ Get the partitioned graph.
 

spinnaker_graph_front_end/config_setup.py

@@ -20,8 +20,6 @@
 
 #: The name of the configuration file
 CONFIG_FILE_NAME = "spiNNakerGraphFrontEnd.cfg"
-#: The name of the configuration validation configuration file
-VALIDATION_CONFIG_NAME = "validation_config.cfg"
 
 
 def reset_configs():

spinnaker_graph_front_end/spinnaker.py

@@ -14,9 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+from spinn_utilities.config_holder import get_config_str
 from spinn_utilities.log import FormatAdapter
-from spinn_utilities.config_holder import (
-    get_config_bool, get_config_str, set_config)
 from spinn_front_end_common.interface.abstract_spinnaker_base import (
     AbstractSpinnakerBase)
 from spinnaker_graph_front_end.config_setup import reset_configs
@@ -100,9 +99,6 @@ def __init__(
             self.set_n_boards_required(1)
 
         extra_mapping_inputs = dict()
-        extra_mapping_inputs["CreateAtomToEventIdMapping"] = get_config_bool(
-            "Database", "create_routing_info_to_atom_id_mapping")
-
         self.update_extra_mapping_inputs(extra_mapping_inputs)
         self.prepend_extra_pre_run_algorithms(extra_pre_run_algorithms)
         self.extend_extra_post_run_algorithms(extra_post_run_algorithms)
@@ -112,11 +108,12 @@ def __init__(
 
         # if not set at all, set to 1 for real time execution.
         if self.time_scale_factor is None:
-            set_config("Machine", "time_scale_factor", 1)
-        logger.info("Setting time scale factor to {}."
-                    .format(self.time_scale_factor))
-        logger.info("Setting machine time step to {} micro-seconds."
-                    .format(self.machine_time_step))
+            self.time_scale_factor = 1
+        logger.info(f'Setting time scale factor to '
+                    f'{self.time_scale_factor}.')
+        logger.info(f'Setting machine time step to '
+                    f'{self.machine_time_step} '
+                    f'micro-seconds.')
 
     @property
     def is_allocated_machine(self):

spinnaker_graph_front_end/utilities/data_utils.py

@@ -15,11 +15,10 @@
 
 from spinn_front_end_common.utilities.constants import SIMULATION_N_BYTES
 from spinn_front_end_common.interface.simulation.simulation_utilities import (
-    get_simulation_header_array)
+    get_simulation_header_array, get_simulation_header_array_no_timestep)
 
 
-def generate_system_data_region(
-        spec, region_id, machine_vertex, machine_time_step, time_scale_factor):
+def generate_system_data_region(spec, region_id, machine_vertex):
     """ Generate a system data region for time-based simulations.
 
     :param ~data_specification.DataSpecificationGenerator spec:
@@ -28,10 +27,6 @@ def generate_system_data_region(
         The region to write to
     :param ~pacman.model.graphs.machine.MachineVertex machine_vertex:
         The machine vertex to write for
-    :param int machine_time_step:
-        The time step of the simulation
-    :param int time_scale_factor:
-        The time scale of the simulation
     """
 
     # reserve memory regions
@@ -41,8 +36,7 @@ def generate_system_data_region(
     # simulation .c requirements
     spec.switch_write_focus(region_id)
     spec.write_array(get_simulation_header_array(
-        machine_vertex.get_binary_file_name(), machine_time_step,
-        time_scale_factor))
+        machine_vertex.get_binary_file_name()))
 
 
 def generate_steps_system_data_region(spec, region_id, machine_vertex):
@@ -55,6 +49,11 @@ def generate_steps_system_data_region(spec, region_id, machine_vertex):
     :param ~pacman.model.graphs.machine.MachineVertex machine_vertex:
         The machine vertex to write for
     """
-    generate_system_data_region(
-        spec, region_id, machine_vertex, machine_time_step=0,
-        time_scale_factor=0)
+    # reserve memory regions
+    spec.reserve_memory_region(
+        region=region_id, size=SIMULATION_N_BYTES, label='systemInfo')
+
+    # simulation .c requirements
+    spec.switch_write_focus(region_id)
+    spec.write_array(get_simulation_header_array_no_timestep(
+        machine_vertex.get_binary_file_name()))

spinnaker_graph_front_end/utilities/simulator_vertex.py

@@ -110,9 +110,7 @@ def generate_system_region(self, spec, region_id=0):
             Which region is the system region.
             Defaults to 0 because it is almost always the first one.
         """
-        generate_system_data_region(
-            spec, region_id, self, self.__front_end.machine_time_step(),
-            self.__front_end.time_scale_factor())
+        generate_system_data_region(spec, region_id, self)
 
     def generate_recording_region(self, spec, region_id, channel_sizes):
         """