Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
8308d64
Video link added
argunaykut Nov 9, 2020
679a081
Video link update
argunaykut Nov 9, 2020
fb317f5
Update README.md
argunaykut Nov 9, 2020
2a3d889
Video links update
argunaykut Nov 9, 2020
9eae637
Update README.md
argunaykut Nov 9, 2020
48e089a
Update README.md
argunaykut Nov 9, 2020
ccf8b52
Update README.md
argunaykut Nov 9, 2020
cb4440a
Update README.md
argunaykut Nov 9, 2020
afc0982
Update README.md
argunaykut Nov 9, 2020
d3b1a4f
Update README.md
argunaykut Nov 9, 2020
8c72576
Update README.md
argunaykut Nov 9, 2020
9f015a2
Update README.md
argunaykut Nov 9, 2020
2245cbd
Update README.md
argunaykut Nov 9, 2020
e31cc65
Update README.md
argunaykut Nov 9, 2020
ddb29ea
Video links added
argunaykut Nov 9, 2020
8fb2787
Set ndim=5
BenjaminMidtvedt Nov 20, 2020
e6eca70
Merge pull request #29 from softmatterlab/fix-video-tutorial
BenjaminMidtvedt Nov 20, 2020
3ff3f01
Create LICENSE
giovannivolpe Nov 20, 2020
2048add
Merge pull request #30 from softmatterlab/add-license-1
giovannivolpe Nov 20, 2020
c76f57e
merged changes from the apdiocyte challenge
BenjaminMidtvedt Dec 2, 2020
1e4e0f3
Rebuilt documentation
BenjaminMidtvedt Dec 2, 2020
4a5ee01
Merge pull request #32 from softmatterlab/bm-merge-apidocyte-changes
BenjaminMidtvedt Dec 2, 2020
ef10571
Update README.md
JesusPinedaC Jan 14, 2021
3cce2fd
Update README.md
JesusPinedaC Jan 14, 2021
5e22d52
Test using relative imports to ensure correct installation is used
BenjaminMidtvedt Feb 10, 2021
c91cc73
convert video to array to not crash on ndim
BenjaminMidtvedt Feb 10, 2021
6bbddb2
update test call
BenjaminMidtvedt Feb 10, 2021
43b7efc
make tests a package
BenjaminMidtvedt Feb 10, 2021
3dd01bd
reorder scatterer position
BenjaminMidtvedt Feb 10, 2021
b204616
Fix: update is correctly called with the _ prefix
BenjaminMidtvedt Feb 10, 2021
4c1e77f
Fix Layers typo
BenjaminMidtvedt Feb 10, 2021
e4c21d5
Change position order
BenjaminMidtvedt Feb 10, 2021
54dcde3
Correctly calculate the collection angle
BenjaminMidtvedt Feb 10, 2021
caea6b7
Merge properties on distributed calls
BenjaminMidtvedt Feb 10, 2021
db9d6dd
Version bump
BenjaminMidtvedt Feb 10, 2021
4895dc7
Update README.md
argunaykut Feb 16, 2021
59f75fe
Update README.md
argunaykut Feb 16, 2021
1b14af9
Update README.md
argunaykut Feb 16, 2021
1a39f77
Added CappedContinuousGenerator
BenjaminMidtvedt Feb 18, 2021
4af6ed8
Merge branch 'develop' of https://github.com/softmatterlab/DeepTrack-…
BenjaminMidtvedt Feb 18, 2021
d7e655b
Remove unused import
BenjaminMidtvedt Feb 18, 2021
89d2be1
Remove unused format
BenjaminMidtvedt Feb 18, 2021
bbc3149
Added PropertyLike type
BenjaminMidtvedt Feb 25, 2021
8b58edd
Added typings
BenjaminMidtvedt Feb 25, 2021
c1d69d6
Remove redundant code
BenjaminMidtvedt Feb 25, 2021
8b57fcb
Moce types to own module
BenjaminMidtvedt Feb 25, 2021
b9439fd
Include check for non.symetrical pupils
BenjaminMidtvedt Feb 25, 2021
79ff77e
Avoid code redundancy optimization
BenjaminMidtvedt Feb 25, 2021
12bf85b
Decrease model sizes during testing
BenjaminMidtvedt Feb 25, 2021
3463a67
Added arraylike type
BenjaminMidtvedt Feb 25, 2021
8c844b9
Added typings
BenjaminMidtvedt Feb 25, 2021
4f7c91c
Type annotations
BenjaminMidtvedt Feb 25, 2021
5432310
Type annotations
BenjaminMidtvedt Feb 25, 2021
67b2947
Fully type-hinted
BenjaminMidtvedt Feb 25, 2021
7a937a8
Swapped position index for miespheres
BenjaminMidtvedt Mar 24, 2021
ba3bca1
Call update before first resolve
BenjaminMidtvedt Mar 24, 2021
a20e1c4
Call update before first resolve
BenjaminMidtvedt Mar 24, 2021
29e760a
Call update before first resolve
BenjaminMidtvedt Mar 24, 2021
bd96a89
Merge branch 'develop' of https://github.com/softmatterlab/DeepTrack-…
BenjaminMidtvedt Mar 24, 2021
6f04fbb
Fixed incomplete documentation
BenjaminMidtvedt Apr 2, 2021
d6688eb
Added feature `Slice`
BenjaminMidtvedt Apr 2, 2021
b19daca
Removed non-functioning test
BenjaminMidtvedt Apr 2, 2021
972914d
Remove types from function calls in docs
BenjaminMidtvedt Apr 2, 2021
1fe2428
Remade documentation
BenjaminMidtvedt Apr 2, 2021
a9a14f7
Version bump
BenjaminMidtvedt Apr 2, 2021
22b4ccf
use relative imports
BenjaminMidtvedt Apr 3, 2021
680dc96
Create python-app.yml
BenjaminMidtvedt Apr 5, 2021
d0cc23b
Update requirements.txt
BenjaminMidtvedt Apr 5, 2021
5171005
Update requirements.txt
BenjaminMidtvedt Apr 5, 2021
68145a2
Update features.py
BenjaminMidtvedt Apr 5, 2021
c388567
Update requirements.txt
BenjaminMidtvedt Apr 5, 2021
215f610
Fix minor typo in README.md
magnunor Apr 23, 2021
42d09e4
Merge pull request #35 from magnunor/minor_readme_typo
BenjaminMidtvedt Apr 27, 2021
f68a6fa
CappedGenerator should not ouput count
BenjaminMidtvedt Apr 27, 2021
4e381f5
deprecate operators
BenjaminMidtvedt May 17, 2021
cfef2d7
Allow multi-indexed positions
BenjaminMidtvedt Jun 4, 2021
7c35a48
Remove uneeded files
BenjaminMidtvedt Jun 4, 2021
72da14c
Import from tensorflow
BenjaminMidtvedt Jun 4, 2021
0f2d839
Use >>
BenjaminMidtvedt Jun 4, 2021
a4882f7
Call update before plot
BenjaminMidtvedt Jun 4, 2021
ec43657
Update to remove depreated operators
BenjaminMidtvedt Jun 4, 2021
a3ac01b
Remove debug logging
BenjaminMidtvedt Jun 4, 2021
37f2027
Version bump
BenjaminMidtvedt Jun 4, 2021
a5df181
Update README.md
BenjaminMidtvedt Jun 4, 2021
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
36 changes: 36 additions & 0 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Python application

on:
push:
branches: [ develop ]
pull_request:
branches: [ develop ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with unittest
run: |
python -m unittest discover
4 changes: 0 additions & 4 deletions .vscode/settings.json

This file was deleted.

21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 Soft Matter Lab

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
44 changes: 41 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Everybody learns in different ways! Depending on your preferences, and what you

### Fundamentals

First, we have a very general walkthrough of [basic](https://softmatterlab.github.io/DeepTrack-2.0/basics.html) and [advanced](https://softmatterlab.github.io/DeepTrack-2.0/advanced.html) topics. This is a 5-10 minute read, that well get you well on your way to understand the unique interactions available in DeepTrack.
First, we have a very general walkthrough of [basic](https://softmatterlab.github.io/DeepTrack-2.0/basics.html) and [advanced](https://softmatterlab.github.io/DeepTrack-2.0/advanced.html) topics. This is a 5-10 minute read, that will get you well on your way to understand the unique interactions available in DeepTrack.

### DeepTrack 2.0 in action

Expand All @@ -47,7 +47,45 @@ Additionally, we have seven more case studies which are less documented, but giv

### Video Tutorials

[TBA]
DeepTrack 2.0 introduction tutorial video: https://youtu.be/hyfaxF8q6VE
<a href="http://www.youtube.com/watch?feature=player_embedded&v=hyfaxF8q6VE
" target="_blank"><img src="https://img.youtube.com/vi/hyfaxF8q6VE/maxresdefault.jpg"
alt="Tutorial" width="384" height="216" border="10" /></a>

DeepTrack 2.0 recognizing handwritten digits tutorial video: https://youtu.be/QD9JUXyLJpc
<a href="http://www.youtube.com/watch?feature=player_embedded&v=QD9JUXyLJpc
" target="_blank"><img src="https://img.youtube.com/vi/QD9JUXyLJpc/maxresdefault.jpg"
alt="Tutorial" width="384" height="216" border="10" /></a>

DeepTrack 2.0 single particle tracking tutorial video: https://youtu.be/6Cntik6AfBI
<a href="http://www.youtube.com/watch?feature=player_embedded&v=6Cntik6AfBI
" target="_blank"><img src="https://img.youtube.com/vi/6Cntik6AfBI/maxresdefault.jpg"
alt="Tutorial" width="384" height="216" border="10" /></a>

DeepTrack 2.0 single-particle characterization tutorial video: https://youtu.be/ia2H1QO1cHg
<a href="http://www.youtube.com/watch?feature=player_embedded&v=ia2H1QO1cHg
" target="_blank"><img src="https://img.youtube.com/vi/ia2H1QO1cHg/maxresdefault.jpg"
alt="Tutorial" width="384" height="216" border="10" /></a>

DeepTrack 2.0 multiple particle tracking tutorial video: https://youtu.be/wFV2VqzpeZs
<a href="http://www.youtube.com/watch?feature=player_embedded&v=wFV2VqzpeZs
" target="_blank"><img src="https://img.youtube.com/vi/wFV2VqzpeZs/maxresdefault.jpg"
alt="Tutorial" width="384" height="216" border="10" /></a>

DeepTrack 2.0 multiple particle tracking in 3D tutorial video: https://youtu.be/fzD1QIEIJ04
<a href="http://www.youtube.com/watch?feature=player_embedded&v=fzD1QIEIJ04
" target="_blank"><img src="https://img.youtube.com/vi/fzD1QIEIJ04/mqdefault.jpg"
alt="Tutorial" width="384" height="216" border="10" /></a>

DeepTrack 2.0 cell counting tutorial video: https://youtu.be/C6hu_IYoWtI
<a href="https://www.youtube.com/watch?feature=player_embedded&v=C6hu_IYoWtI
" target="_blank"><img src="https://img.youtube.com/vi/C6hu_IYoWtI/mqdefault.jpg"
alt="Tutorial" width="384" height="216" border="10" /></a>

DeepTrack 2.0 GAN image generation tutorial video: https://youtu.be/8g44Yks7cis
<a href="https://www.youtube.com/watch?feature=player_embedded&v=8g44Yks7cis
" target="_blank"><img src="https://img.youtube.com/vi/8g44Yks7cis/mqdefault.jpg"
alt="Tutorial" width="384" height="216" border="10" /></a>

### In-depth dives

Expand Down Expand Up @@ -83,7 +121,7 @@ The detailed documentation of DeepTrack 2.0 is available at the following link:

If you use DeepTrack 2.0 in your project, please cite us here:

Benjamin Midtvedt, Saga Helgadottir, Aykut Argun, Jesús Pineda, Daniel Midtvedt, Giovanni Volpe. "Quantitative Digital Microscopy with Deep Learning." [arXiv:2010.08260](https://arxiv.org/abs/2010.08260)
Benjamin Midtvedt, Saga Helgadottir, Aykut Argun, Jesús Pineda, Daniel Midtvedt, Giovanni Volpe. "Quantitative Digital Microscopy with Deep Learning." [https://doi.org/10.1063/5.0034891](https://aip.scitation.org/doi/10.1063/5.0034891)

See also:

Expand Down
7 changes: 7 additions & 0 deletions _src/source/augmentations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ Pad
:members:
:exclude-members: get

PadToMultiplesOf
^^^^^^^^^^^^^^^^

.. autoclass:: deeptrack.augmentations.PadToMultiplesOf
:members:
:exclude-members: get

PreLoad
^^^^^^^

Expand Down
3 changes: 2 additions & 1 deletion _src/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ["pydata_sphinx_theme", "sphinx.ext.autodoc", "numpydoc"]
extensions = ["sphinx.ext.autodoc", "numpydoc"]

# Add any paths that contain templates here, relative to this directory.
templates_path = ["_templates"]
Expand All @@ -57,3 +57,4 @@
html_static_path = ["_static"]

master_doc = "index"
autodoc_typehints = "none"
2 changes: 2 additions & 0 deletions _src/source/deeptrack.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ Documentation
properties
scatterers
sequences
test
types
utils
35 changes: 35 additions & 0 deletions _src/source/features.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,34 @@ features
Module classes
<<<<<<<<<<<<<<

AsType
^^^^^^

.. autoclass:: deeptrack.features.AsType
:members:
:exclude-members: get

Bind
^^^^

.. autoclass:: deeptrack.features.Bind
:members:
:exclude-members: get

BindResolve
^^^^^^^^^^^

.. autoclass:: deeptrack.features.BindResolve
:members:
:exclude-members: get

BindUpdate
^^^^^^^^^^

.. autoclass:: deeptrack.features.BindUpdate
:members:
:exclude-members: get

Branch
^^^^^^

Expand Down Expand Up @@ -104,6 +132,13 @@ SampleToMasks
:members:
:exclude-members: get

Slice
^^^^^

.. autoclass:: deeptrack.features.Slice
:members:
:exclude-members: get

StructuralFeature
^^^^^^^^^^^^^^^^^

Expand Down
7 changes: 7 additions & 0 deletions _src/source/generators.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ generators
Module classes
<<<<<<<<<<<<<<

CappedContinuousGenerator
^^^^^^^^^^^^^^^^^^^^^^^^^

.. autoclass:: deeptrack.generators.CappedContinuousGenerator
:members:
:exclude-members: get

ContinuousGenerator
^^^^^^^^^^^^^^^^^^^

Expand Down
5 changes: 5 additions & 0 deletions _src/source/test.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
test
====

.. automodule:: deeptrack.test

5 changes: 5 additions & 0 deletions _src/source/types.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
types
=====

.. automodule:: deeptrack.types

3 changes: 2 additions & 1 deletion deeptrack/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
from .scatterers import *
from .sequences import *

from . import image, losses, generators, models, utils, layers, backend

from . import image, losses, generators, models, utils, layers, backend, test
Loading