Merge branch 'master' of https://github.com/neurokernel/neurokernel

neurokernel · Nov 11, 2015 · e3a3f05 · e3a3f05
2 parents f724f95 + 104e9a0
commit e3a3f05
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/neurokernel/LPU/LPU.py b/neurokernel/LPU/LPU.py
@@ -13,7 +13,6 @@
 from pycuda.compiler import SourceModule
 import pycuda.elementwise as elementwise
 
-
 import numpy as np
 import networkx as nx
 
@@ -27,7 +26,6 @@
 
 from neurokernel.mixins import LoggerMixin
 from neurokernel.core_gpu import Module, CTRL_TAG, GPOT_TAG, SPIKE_TAG
-from neurokernel.tools.zmq import get_random_port
 
 from types import *
 from collections import Counter

diff --git a/neurokernel/pattern.py b/neurokernel/pattern.py
@@ -1559,7 +1559,7 @@ def __setitem__(self, key, value):
             # data attribute:
             self.__validate_index__(new_data.index)
             self.data = new_data
-            self.data.sort(inplace=True)
+            self.data.sort_index(inplace=True)
 
         # Update the `io` attributes of the pattern's interfaces:
         self.interface[key[0], 'io'] = 'in'