Merge pull request #51 from cortex-lab/numpy2_fix

numpy2 compatibility

Author: oliche

phylib/__init__.py

@@ -22,7 +22,7 @@
 
 __author__ = 'Cyrille Rossant'
 __email__ = 'cyrille.rossant at gmail.com'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 __version_git__ = __version__ + _git_version()
 
 

phylib/io/model.py

@@ -91,10 +91,10 @@ def from_sparse(data, cols, channel_ids):
     c = cols.flatten().astype(np.int32)
     # Remove columns that do not belong to the specified channels.
     c[~np.isin(c, channel_ids)] = -1
-    assert np.all(np.isin(c, np.r_[channel_ids, -1]))
+    assert np.all(np.isin(c, np.r_[channel_ids.astype(np.int32), -1]))
     # Convert column indices to relative indices given the specified
     # channel_ids.
-    cols_loc = _index_of(c, np.r_[channel_ids, -1]).reshape(cols.shape)
+    cols_loc = _index_of(c, np.r_[channel_ids.astype(np.int32), -1]).reshape(cols.shape)
     assert cols_loc.shape == (n_spikes, n_channels_loc)
     n_channels = len(channel_ids)
     # Shape of the output array.

phylib/io/traces.py

@@ -16,8 +16,7 @@
 from pathlib import Path
 
 import numpy as np
-from numpy.lib.format import (
-    _check_version, _write_array_header, dtype_to_descr)
+from numpy.lib.format import (write_array_header_1_0, dtype_to_descr)
 import mtscomp
 from tqdm import tqdm
 
@@ -554,10 +553,8 @@ def __init__(self, path, shape, dtype, axis=0):
         self.shape = shape
         self.dtype = np.dtype(dtype)
         header = _npy_header(self.shape, self.dtype)
-        version = None
-        _check_version(version)
         self.fp = open(path, 'wb')
-        _write_array_header(self.fp, header, version)
+        write_array_header_1_0(self.fp, header)
 
     def append(self, chunk):
         if chunk.ndim == len(self.shape):