Skip to content

Commit

Permalink
Fix merge conflicts in models.backends
Browse files Browse the repository at this point in the history
  • Loading branch information
@rgerkin
rgerkin authored Apr 22, 2021
1 parent 15ab9e5 commit 835235e
Showing 1 changed file with 7 additions and 42 deletions.
49 changes: 7 additions & 42 deletions neuronunit/models/backends/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,20 @@
import io
import importlib
import inspect
<<<<<<< HEAD
=======
import pathlib
import re
import warnings
>>>>>>> 9fb0c2e613a1bf059f38eeeae80582d0cfb11f2f

import sciunit.models.backends as su_backends
from sciunit.utils import PLATFORM, PYTHON_MAJOR_VERSION
from .base import Backend
available_backends = su_backends.available_backends


<<<<<<< HEAD
try:
from .static import StaticBackend
except ImportError:
StaticBackend = None
print('Could not load StaticBackend')

try:
from .geppetto import GeppettoBackend
except ImportError:
GeppettoBackend = None
print('Could not load GeppettoBackend')

try:
from .jNeuroML import jNeuroMLBackend
except ImportError:
jNeuroMLBackend = None
print('Could not load jNeuroMLBackend')

##
# Neuron support depreciated
##
#try:
# from .neuron import NEURONBackend
#except ImportError:
# NEURONBackend = None
# print('Could not load NEURONBackend')

=======

backend_paths = ['adexp.JIT_ADEXPBackend',
backend_paths = ['static.StaticBackend',
'geppetto.GeppettoBackend',
'jNeuroML.jNeuroMLBackend',
#'neuron.NeuronBackend',
'adexp.JIT_ADEXPBackend',
'izhikevich.JIT_IZHIBackend']
def check_backend(partial_path):
full_path = 'jithub.models.backends.%s' % partial_path
Expand Down Expand Up @@ -78,14 +49,8 @@ def register_backends(backend_paths):
su_backends.register_backends(provided_backends)


try:
register_backends(backend_paths)
>>>>>>> 9fb0c2e613a1bf059f38eeeae80582d0cfb11f2f
register_backends(backend_paths)

except:
register_backends(backend_paths)

available_backends = su_backends.available_backends
#from .adexp import ADEXPBackend
#from .glif import GLIFBackend
#from .l5pcSciUnit import L5PCBackend

1 comment on commit 835235e

@russelljjarvis
Copy link
Contributor

@russelljjarvis russelljjarvis commented on 835235e Apr 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry yes, these changes where only supposed to be in the optimization branch. That branch doesn't use the old style of backend. Perhaps the broken file was picked up by the unittest import_all, but there were so many failures that its hard to locate any one particular error. I believe the unmerged code happened not in russelljarvis/optimization -> scidash/optimization but scidash/optimization -> scidash/dev. It looks okay here: https://github.com/russelljjarvis/neuronunit/blob/optimization/neuronunit/models/backends/__init__.py

Please sign in to comment.