Changeset 1001

Show
Ignore:
Timestamp:
10/30/11 16:07:01 (7 months ago)
Author:
apdavison
Message:

Trying to fix import error seen when running tests in Jenkins/Hudson? but not when running locally

Location:
trunk/src
Files:
10 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/brian/__init__.py

    r1000 r1001  
    8888 
    8989get_current_time, get_time_step, get_min_delay, get_max_delay, \ 
    90             num_processes, rank = common.control.build_state_queries(simulator) 
     90            num_processes, rank = common.build_state_queries(simulator) 
    9191 
    9292# ============================================================================== 

  • trunk/src/common/__init__.py

    r1000 r1001  
    5151from projections import Projection, check_weight, DEFAULT_WEIGHT 
    5252from procedural_api import build_create, build_connect, set, build_record, initialize 
    53 from control import setup 
     53from control import setup, build_reset, build_state_queries 

  • trunk/src/common/populations.py

    r1000 r1001  
    1515from pyNN import random, recording, errors, standardmodels, core, space, descriptions 
    1616from pyNN.recording import files 
    17 import control 
    1817from itertools import chain 
    1918 

  • trunk/src/moose/__init__.py

    r1000 r1001  
    5656    return get_current_time() 
    5757 
    58 reset = common.control.build_reset(simulator) 
     58reset = common.build_reset(simulator) 
    5959 
    6060initialize = common.initialize 
    … …  
    6565 
    6666get_current_time, get_time_step, get_min_delay, get_max_delay, \ 
    67             num_processes, rank = common.control.build_state_queries(simulator) 
     67            num_processes, rank = common.build_state_queries(simulator) 
    6868 
    6969# ============================================================================== 

  • trunk/src/nemo/__init__.py

    r1000 r1001  
    7676 
    7777get_current_time, get_time_step, get_min_delay, get_max_delay, \ 
    78             num_processes, rank = common.control.build_state_queries(simulator) 
     78            num_processes, rank = common.build_state_queries(simulator) 
    7979 
    8080# ============================================================================== 

  • trunk/src/nest/__init__.py

    r1000 r1001  
    152152    return get_current_time() 
    153153 
    154 reset = common.control.build_reset(simulator) 
     154reset = common.build_reset(simulator) 
    155155 
    156156initialize = common.initialize 
    … …  
    161161 
    162162get_current_time, get_time_step, get_min_delay, get_max_delay, \ 
    163             num_processes, rank = common.control.build_state_queries(simulator) 
     163            num_processes, rank = common.build_state_queries(simulator) 
    164164 
    165165 

  • trunk/src/neuron/__init__.py

    r1000 r1001  
    8181    return get_current_time() 
    8282     
    83 reset = common.control.build_reset(simulator) 
     83reset = common.build_reset(simulator) 
    8484 
    8585initialize = common.initialize 
    … …  
    9090 
    9191get_current_time, get_time_step, get_min_delay, get_max_delay, \ 
    92             num_processes, rank = common.control.build_state_queries(simulator) 
     92            num_processes, rank = common.build_state_queries(simulator) 
    9393 
    9494 

  • trunk/src/neuron/nineml.py

    r999 r1001  
    3131from pyNN.neuron import simulator 
    3232from pyNN import common, recording 
    33 common.control.simulator = simulator 
    34 recording.simulator = simulator 
    3533 
    3634h = neuron.h 

  • trunk/src/nineml/__init__.py

    r999 r1001  
    8080    state = State() 
    8181simulator = DummySimulator() 
    82 common.control.simulator = simulator 
    83 recording.simulator = simulator 
    8482 
    8583 

  • trunk/src/pcsim/__init__.py

    r1000 r1001  
    204204    return simulator.state.t 
    205205 
    206 reset = common.control.build_reset(simulator) 
     206reset = common.build_reset(simulator) 
    207207 
    208208initialize = common.initialize 
    209209 
    210210get_current_time, get_time_step, get_min_delay, get_max_delay, \ 
    211             num_processes, rank = common.control.build_state_queries(simulator) 
     211            num_processes, rank = common.build_state_queries(simulator) 
    212212 
    213213