Skip to content

Fix blackrock numpy2 #1623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samuelgarcia merged 8 commits into from
Jan 17, 2025
Merged

Fix blackrock numpy2 #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
30b03f9
test python 3.13
zm711 Dec 13, 2024
cf15364
remove numpy limit
zm711 Dec 13, 2024
43a80fc
Merge branch 'master' into update-io-testing
zm711 Dec 13, 2024
a158707
Merge branch 'master' into update-io-testing
zm711 Dec 19, 2024
bda06a2
Merge branch 'master' into update-io-testing
zm711 Jan 7, 2025
fc55071
Merge branch 'master' into update-io-testing
zm711 Jan 8, 2025
a43fff6
Merge branch 'update-io-testing' of github.com:zm711/python-neo into …
samuelgarcia Jan 15, 2025
5f2573f
Fix for bloackrock with numpy2
samuelgarcia Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/io-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: true
matrix:
python-version: ['3.9', '3.12']
python-version: ['3.9', '3.12', '3.13']
defaults:
# by default run in bash mode (required for conda usage)
run:
Expand Down
3 changes: 0 additions & 3 deletions environment_testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@ channels:
dependencies:
- datalad
- pip
# temporary have this here for IO testing while we decide how to deal with
# external packages not 2.0 ready
- numpy=1.26.4
7 changes: 4 additions & 3 deletions neo/rawio/blackrockrawio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ def __match_nsx_and_nev_segment_ids(self, nsx_nb):

# Show warning if spikes do not fit any segment (+- 1 sampling 'tick')
# Spike should belong to segment before
mask_outside = (ev_ids == i) & (data["timestamp"] < int(seg["timestamp"]) - nsx_offset - nsx_period)
mask_outside = (ev_ids == i) & (data["timestamp"] < int(seg["timestamp"]) - int(nsx_offset) - int(nsx_period))

if len(data[mask_outside]) > 0:
warnings.warn(f"Spikes outside any segment. Detected on segment #{i}")
Expand Down Expand Up @@ -1987,6 +1987,7 @@ def __get_nsx_param_variant_a(self, nsx_nb):
else:
units = "uV"


nsx_parameters = {
"nb_data_points": int(
(self.__get_file_size(filename) - bytes_in_headers)
Expand All @@ -1995,8 +1996,8 @@ def __get_nsx_param_variant_a(self, nsx_nb):
),
"labels": labels,
"units": np.array([units] * self.__nsx_basic_header[nsx_nb]["channel_count"]),
"min_analog_val": -1 * np.array(dig_factor),
"max_analog_val": np.array(dig_factor),
"min_analog_val": -1 * np.array(dig_factor, dtype="float"),
"max_analog_val": np.array(dig_factor, dtype="float"),
"min_digital_val": np.array([-1000] * self.__nsx_basic_header[nsx_nb]["channel_count"]),
"max_digital_val": np.array([1000] * self.__nsx_basic_header[nsx_nb]["channel_count"]),
"timestamp_resolution": 30000,
Expand Down
Loading