Skip to content
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.

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

Deepinterpolation revived: training, transfer, and inference with more flexibility #1804

Merged
merged 32 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f7225ee
Simplify generators and add tests
alejoe91 Jul 10, 2023
1083c27
TF version and test multi-processing
alejoe91 Jul 10, 2023
422b4e4
Add test dependencies
alejoe91 Jul 10, 2023
f7949d9
Fix tests
alejoe91 Jul 10, 2023
7813ea0
Fix tests 1
alejoe91 Jul 10, 2023
4e46803
Merge branch 'main' into deepinterp
alejoe91 Jul 10, 2023
4e247f2
merge
alejoe91 Jul 11, 2023
8f51b9e
Expose predict_workesrs argument
alejoe91 Jul 14, 2023
6e423ae
merge
alejoe91 Jul 17, 2023
2f9ebb3
Merge branch 'main' into deepinterp
alejoe91 Jul 18, 2023
4281b26
Merge branch 'main' into deepinterp
alejoe91 Jul 20, 2023
1ed6123
Fix transfer training and expose caching validation
alejoe91 Jul 20, 2023
2e6e58c
Fix TF logging verbosity
alejoe91 Jul 20, 2023
e6515b8
Set logging correctly
alejoe91 Jul 20, 2023
392be28
Set nb_workers to max if -1
alejoe91 Jul 20, 2023
c5e6f4b
ProcessPollExecutor with max_workers
alejoe91 Jul 20, 2023
beb7f33
Make generateor pickleable
alejoe91 Jul 20, 2023
1b46ae6
Simplify generator definition
alejoe91 Jul 20, 2023
e136048
Correct use of total_samples and expose training/test duration
alejoe91 Sep 5, 2023
6a36156
Merge branch 'main' into deepinterp
alejoe91 Sep 5, 2023
aa30c6f
Fix tests
alejoe91 Sep 5, 2023
9c312e9
Merge branch 'deepinterp' of github.com:alejoe91/spikeinterface into …
alejoe91 Sep 5, 2023
5e3ae74
Add option to use recording lists, test_recording, and multi-segment …
alejoe91 Sep 6, 2023
d03097d
Merge branch 'main' into deepinterp
alejoe91 Sep 11, 2023
d5880fd
Merge branch 'main' into deepinterp
alejoe91 Sep 13, 2023
6a68907
Merge branch 'main' into deepinterp
alejoe91 Sep 13, 2023
9eb4e3b
Check if DI is installed for tests and CI
alejoe91 Sep 15, 2023
038e4cb
Merge branch 'main' into deepinterp
alejoe91 Sep 15, 2023
64b6944
Add 'done'
alejoe91 Sep 15, 2023
9d239ca
Fix tests
alejoe91 Sep 15, 2023
d4e0824
Merge branch 'main' into deepinterp
alejoe91 Oct 17, 2023
3fe5d07
Merge branch 'main' into deepinterp
alejoe91 Oct 19, 2023
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
37 changes: 37 additions & 0 deletions .github/workflows/deepinterpolation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Testing deepinterpolation

on:
pull_request:
types: [synchronize, opened, reopened]
branches:
- main

concurrency: # Cancel previous workflows on the same pull request
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build-and-test:
name: Test on ${{ matrix.os }} OS
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.9'
- name: Install dependencies
alejoe91 marked this conversation as resolved.
Show resolved Hide resolved
run: |
python -m pip install -U pip # Official recommended way
# install deepinteprolation
pip install tensorflow==2.7.0
pip install deepinterpolation@git+https://github.com/AllenInstitute/deepinterpolation.git
pip install protobuf==3.20.*
pip install -e .[full,test_core]
- name: Test core with pytest
run: |
pytest -v src/spikeinterface/preprocessing/deepinterpolation
shell: bash # Necessary for pipeline to work on windows
2 changes: 1 addition & 1 deletion .github/workflows/full-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
run: ./.github/run_tests.sh "extractors and not streaming_extractors"
- name: Test preprocessing
if: ${{ steps.modules-changed.outputs.PREPROCESSING_CHANGED == 'true' || steps.modules-changed.outputs.CORE_CHANGED == 'true' }}
run: ./.github/run_tests.sh preprocessing
run: ./.github/run_tests.sh "preprocessing and not deepinterpolation"
- name: Test postprocessing
if: ${{ steps.modules-changed.outputs.POSTPROCESSING_CHANGED == 'true' || steps.modules-changed.outputs.CORE_CHANGED == 'true' }}
run: ./.github/run_tests.sh postprocessing
Expand Down
2 changes: 1 addition & 1 deletion conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
mark_names = ["core", "extractors", "preprocessing", "postprocessing",
"sorters_external", "sorters_internal", "sorters",
"qualitymetrics", "comparison", "curation",
"widgets", "exporters", "sortingcomponents"]
"widgets", "exporters", "sortingcomponents", "deepinterpolation"]


# define global test folder
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ markers = [
"exporters",
"widgets",
"sortingcomponents",
"deepinterpolation",
"streaming_extractors: extractors that require streaming such as ross and fsspec",
]
filterwarnings =[
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
from .deepinterpolation import DeepInterpolatedRecording, deepinterpolate
from .train import train_deepinterpolation
Loading