Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
771 commits
Select commit Hold shift + click to select a range
a582afb
UPD: fix doc
vqdang Sep 24, 2021
d3b1c81
UPD: remove unused vars
vqdang Sep 24, 2021
cc0f4b9
UPD: fix doc
vqdang Sep 24, 2021
f0ec220
UPD: fix lint
vqdang Sep 24, 2021
5bc4623
UPD: conditional args
vqdang Sep 24, 2021
84d8823
UPD; fix format
vqdang Sep 24, 2021
283f984
DEV: Update Package Manifest Patterns
John-P Sep 29, 2021
07a8b5b
DEV: Organise Loading of Local & Remote Sample Files
John-P Sep 29, 2021
8b5c2bc
STY: Remove Leading Underscores From Fixtures
John-P Sep 29, 2021
958fa0d
STY: Address flake8 Style Issues
John-P Sep 30, 2021
a40591a
TST: Add conftest.py To .deepsource.toml
John-P Sep 30, 2021
212c80a
STY: Remove Unecessary elif
John-P Oct 1, 2021
cd1b804
DEV: Add skipqc for Deepsource, Ignore Unguarded next
John-P Oct 1, 2021
e8e1ddc
DEV: Move Deepsource Exception Comment
John-P Oct 1, 2021
f29c327
STY: Rename File Path And Handle
John-P Oct 1, 2021
b4dc47e
UPD: Massive Refactoring
vqdang Oct 6, 2021
eedb750
UPD: remove hanging run code
vqdang Oct 6, 2021
fd6d532
BUG: set overwrite downloading
vqdang Oct 7, 2021
03cb742
UPD: Add behavior tests for pretrained models
vqdang Oct 7, 2021
894a05c
UPD: Add doc
vqdang Oct 7, 2021
4d03592
UPD: fix doc
vqdang Oct 7, 2021
56ba7ab
DEV: Fix Typo In Deepsource Configuration File
John-P Oct 7, 2021
3842455
UPD: travis GPU flag
vqdang Oct 7, 2021
ba7e6cc
UPD: new docs format
vqdang Oct 7, 2021
98f6041
UPD: change make doc cmd
vqdang Oct 7, 2021
3c4de39
UPD: remove pdf build
vqdang Oct 7, 2021
eadc488
UPD: update sphinx version
vqdang Oct 7, 2021
f627fcb
UPD: fix sphinx version
vqdang Oct 7, 2021
60c2cee
UPD: fix make file
vqdang Oct 7, 2021
c0d6a65
UPD: re-organize coverage
vqdang Oct 7, 2021
668ddf2
UPD: gpu flag
vqdang Oct 7, 2021
7fbd9c2
UPD: more docs formatting
vqdang Oct 8, 2021
97d880c
UPD: aggregate predictions on the fly
vqdang Oct 8, 2021
b61e625
Merge branch 'test-conftest-samples' of https://github.com/TIA-Lab/ti…
vqdang Oct 8, 2021
888860b
UPD: fix after PR sync
vqdang Oct 8, 2021
f2eca34
UPD: revert to old doc
vqdang Oct 8, 2021
2285bd1
UPD: fix naming and doc
vqdang Oct 8, 2021
0c91858
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Oct 8, 2021
9450c07
UPD: fix format
vqdang Oct 8, 2021
53402ac
UPD: remove unused
vqdang Oct 8, 2021
c66de84
UPDD: fix gpu flags
vqdang Oct 8, 2021
471c94c
UPD: fix error matching
vqdang Oct 8, 2021
a9075ea
UPD: fix dep
vqdang Oct 8, 2021
5aac2be
UPD: fix message
vqdang Oct 9, 2021
c64bbc6
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Oct 13, 2021
c5bd330
UPD: add tests for getting remote data
vqdang Oct 13, 2021
0f341f7
UPD: fix typo
vqdang Oct 13, 2021
09fa748
UPD: revert readthedoc makefile version
vqdang Oct 13, 2021
a452c0e
DEV: pytest default capture to sys
shaneahmed Oct 13, 2021
28e3b1d
NEW: Add Graph Construction Functions In Tools
John-P Oct 13, 2021
20b397e
UPD: name change
vqdang Oct 13, 2021
436a3e6
Merge branch 'feature-model-semantic-segmentation' of https://github.…
vqdang Oct 13, 2021
1061231
UPD: fix grammar
vqdang Oct 13, 2021
cdb31a9
UPD: fix name
vqdang Oct 13, 2021
6893a8d
UPD: snake case
vqdang Oct 14, 2021
618f3a3
UPD: lower cases
vqdang Oct 14, 2021
d7e4a03
UPD: rename variables
vqdang Oct 14, 2021
9f57852
UPD: remove `patch_size` from abc
vqdang Oct 14, 2021
b0a02a7
UPD: add tests
vqdang Oct 14, 2021
24fb6ee
UPD: capitalize args in doc
vqdang Oct 14, 2021
dc55746
UPD: capitalize
vqdang Oct 14, 2021
e4a43eb
Merge branch 'feature-model-semantic-segmentation' of https://github.…
vqdang Oct 14, 2021
0788179
UPD: sync merge
vqdang Oct 14, 2021
e7dcfa4
UPD: fix init binding
vqdang Oct 14, 2021
cef5016
UPD: Update docs
vqdang Oct 14, 2021
6afbf83
UPD: add more tests
vqdang Oct 14, 2021
b3ff7b6
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Oct 14, 2021
ab7669a
UPD: fix formatting
vqdang Oct 14, 2021
5b6ed0f
UPD: fix formatting
vqdang Oct 14, 2021
912d1df
UPD: fix formatting
vqdang Oct 14, 2021
4138d8f
UPD: set flag for travis
vqdang Oct 14, 2021
feae706
UPD: improve doc
vqdang Oct 14, 2021
57aa665
UPD: add pygeos to requirement
vqdang Oct 14, 2021
18c0588
DOC: Add Crossrefs To Docstring For build_graph_dict
John-P Oct 14, 2021
90492e8
MAIN: Rename Graph Tools File
John-P Oct 14, 2021
f1719dd
DOC: Update Module Docstring
John-P Oct 14, 2021
a959713
STY: Rename Graph Construction Function
John-P Oct 14, 2021
0270e51
MAINT: Remove Default Threshold From connect_points
John-P Oct 14, 2021
5fe4e49
STY: Rename connect_points to delaunay_adjacency
John-P Oct 14, 2021
5dea9c8
UPD: turn on travis capture on the go
vqdang Oct 14, 2021
769e0e7
TST: Fix Import For Graph Tests
John-P Oct 14, 2021
29c729f
TST: Update Test Imports
John-P Oct 15, 2021
588e9f1
TST: Add Missing Args To Tests
John-P Oct 15, 2021
126e503
DOC: Minor Docstring Correction
John-P Oct 15, 2021
39246b6
DOC: Minor Docstring Edit
John-P Oct 15, 2021
c700154
DOC: Explain lambda_h Better In Docstring
John-P Oct 15, 2021
3b2eb13
TST: Improve Test Coverage
John-P Oct 15, 2021
85832df
MAINT: Remove Unneccesary Try Catch
John-P Oct 15, 2021
806524b
TST: Add Tests To Improve Coverage
John-P Oct 15, 2021
78b93c8
MAINT: Correct Typo
John-P Oct 18, 2021
56e8473
DOC: Add Line Breaks
John-P Oct 18, 2021
d0f6806
Update graph.py
wenqi006 Oct 18, 2021
5dcad7f
Update graph.py
wenqi006 Oct 18, 2021
f9efe83
STY: Format With Black
John-P Oct 18, 2021
127af91
DOC: Correct Example Docstring
John-P Oct 18, 2021
99352ec
DOC: Edit Docstring Description
John-P Oct 19, 2021
b36cd4a
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Oct 20, 2021
51ac545
BUG: fix copy pasting error
vqdang Oct 20, 2021
3d561c2
UPD: swap to 1k x 1k svs
vqdang Oct 20, 2021
de8aa03
UPD: fix tests
vqdang Oct 21, 2021
6ba8fe8
UPD: remove test code
vqdang Oct 21, 2021
88a12d4
UPD: fix form
vqdang Oct 21, 2021
85dc82c
UPD: doc spacing
vqdang Oct 21, 2021
f17b2c3
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Oct 22, 2021
9fa6a51
UPD: fix bcss test
vqdang Oct 22, 2021
412fb7a
Merge branch 'develop' into feature-graph-construction
John-P Oct 25, 2021
9c4b39b
MAINT: Remove Label Argument
John-P Oct 25, 2021
a784549
TST: Remove Redundant Test
John-P Oct 25, 2021
c5a52cb
DOC: Minor Docstring Edit & Refactor
John-P Oct 25, 2021
fa35daf
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Oct 26, 2021
648ea15
Squashed Merge Nucleus Instance Segmentation
vqdang Oct 26, 2021
da20881
Merge branch 'feature-graph-construction' of https://github.com/TIA-L…
vqdang Oct 26, 2021
9f7e916
DOC: Add Graph To Usage In Docs & Hide Signature Type Hints
John-P Oct 26, 2021
6a25f71
UPD: shortcut for importing
vqdang Oct 27, 2021
7749db4
UPD: protype testing
vqdang Oct 27, 2021
f1f0a9e
UPD: simplify model arch
vqdang Oct 27, 2021
b724b93
UPD: add explanation
vqdang Oct 27, 2021
6f7dad3
UPD: track
vqdang Oct 27, 2021
e02dd19
UPD: track
vqdang Oct 28, 2021
8c21ae6
UPD: add shortcut
vqdang Oct 28, 2021
5199e2b
UPD: temporary placement
vqdang Oct 28, 2021
603a68c
UPD: fix cell placements
vqdang Oct 28, 2021
d371ed4
UPD add viz graph
vqdang Oct 28, 2021
2cdc74d
UPD: add graph viz
vqdang Oct 28, 2021
33b4d2b
UPD: remove integrity test
vqdang Oct 28, 2021
7e7df6b
FIX: wrong reference variable
vqdang Oct 28, 2021
484c960
FIX: mutually exclusive test split
vqdang Oct 28, 2021
529d3c4
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Oct 28, 2021
7a8a610
UPD: reduce test time
vqdang Oct 28, 2021
f15cc38
UPD: travis OOM
vqdang Oct 28, 2021
7b69798
UPD: dummy to test first
vqdang Oct 28, 2021
090644d
UPD: travis probe
vqdang Oct 28, 2021
03eb7c2
UPD: travis probe
vqdang Oct 28, 2021
88a81c1
UPD: add metric test file
vqdang Oct 29, 2021
ab9210a
UPD: simplify tests
vqdang Oct 29, 2021
56b9403
UPD: remove hanging return
vqdang Oct 29, 2021
d02b39f
UPD: simplify and split tests
vqdang Oct 29, 2021
b6d8245
UPD: placement
vqdang Oct 29, 2021
a7e09dc
UPD: add test
vqdang Oct 29, 2021
3634289
UPD: test coverage
vqdang Oct 29, 2021
60712cf
UPD: turn off GPU
vqdang Oct 29, 2021
76a63ef
UPD: remove
vqdang Oct 29, 2021
9124759
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Oct 29, 2021
dbab555
UPD: travis probe
vqdang Oct 29, 2021
3a27a68
UPD: tests to ensure same training/infer results
vqdang Oct 29, 2021
8912d10
UPD: clean up
vqdang Oct 29, 2021
efabf3a
UPD: coverage test
vqdang Oct 29, 2021
28687f9
UPD: renaming
vqdang Oct 29, 2021
7e8f7d0
UPD: fix format
vqdang Oct 29, 2021
6e632f3
UPD: fix GPU flag
vqdang Oct 29, 2021
b9476e4
UPD: track
vqdang Oct 29, 2021
a6788ff
UPD: move file
vqdang Oct 30, 2021
11e25db
ENH: Add Option To Not Remoe Features
John-P Nov 1, 2021
e8e3831
Merge branch 'feature-graph-construction' of https://github.com/TIA-L…
vqdang Nov 2, 2021
79f889f
UPD: add composition features
vqdang Nov 2, 2021
18e5c4d
UPD: change read space to match assumption in doc
vqdang Nov 2, 2021
62436e1
UPD: rename
vqdang Nov 2, 2021
0d2f0d5
UPD: update ioconfig def and delegation
vqdang Nov 2, 2021
f381600
UPD: add tests
vqdang Nov 2, 2021
f1318b5
UPD: fix format
vqdang Nov 2, 2021
37e63b0
UPD: turn on Travis
vqdang Nov 2, 2021
463b2f7
UPD; fix enumerate
vqdang Nov 2, 2021
15db406
UPD: add flags
vqdang Nov 2, 2021
a86d530
UPD: add tests
vqdang Nov 3, 2021
9bdde5d
Merge branch 'bugfix-patch-predictor-io-config-delegation' of https:/…
vqdang Nov 3, 2021
7e2988a
Merge branch 'bugfix-filter-coordinates-read-wrong-resolutions' of ht…
vqdang Nov 3, 2021
c143b24
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Nov 3, 2021
748d3f6
UPD: migrate
vqdang Nov 3, 2021
5968b8c
UPD: US to British
vqdang Nov 3, 2021
d121dd9
UPD: fix import
vqdang Nov 3, 2021
831afed
Merge branch 'bugfix-patch-predictor-io-config-delegation' of https:/…
vqdang Nov 3, 2021
7e4d933
Merge branch 'bugfix-filter-coordinates-read-wrong-resolutions' of ht…
vqdang Nov 3, 2021
6c6eba0
UPD: add dtype test
vqdang Nov 3, 2021
9b50d83
UPD: travis flag
vqdang Nov 3, 2021
558dc6a
UPD: add doc
vqdang Nov 3, 2021
e0f7f60
UPD: name change
vqdang Nov 3, 2021
8eb4d2e
UPD: add doc
vqdang Nov 3, 2021
e86ba68
UPD: readthedoc
vqdang Nov 3, 2021
1a35590
UPD: update flags
vqdang Nov 3, 2021
d430856
Merge branch 'feature-model-segmentation' of https://github.com/TIA-L…
vqdang Nov 3, 2021
ed89b4a
UPD: add fix
vqdang Nov 3, 2021
6d17a8f
UPD: delegate to merge func
vqdang Nov 3, 2021
b6005d8
Merge branch 'bugfix-patch-predictor-io-config-delegation' of https:/…
vqdang Nov 3, 2021
67be08c
UPD: revert
vqdang Nov 3, 2021
4e8bec3
UPD: add track
vqdang Nov 3, 2021
1b525db
UPD: fix logging
vqdang Nov 3, 2021
e2734fe
UPD: track
vqdang Nov 3, 2021
7f32e23
UPD: track
vqdang Nov 3, 2021
649c422
UPD: track
vqdang Nov 3, 2021
f61601b
DOC: Proof-Reading Changes To Notebook
John-P Nov 12, 2021
9ad4958
DOC: Proof-Reading Edits
John-P Nov 12, 2021
a1304af
DOC: Proof-Reading Edits
John-P Nov 12, 2021
042988e
DOC: Add Hyperlinks
John-P Nov 12, 2021
113bb1f
DOC: Proof-Reading Edits
John-P Nov 12, 2021
8f5286c
DOC: Proof-Reading Edits
John-P Nov 12, 2021
6b803b0
DOC: Proof-Reading Edits
John-P Nov 12, 2021
da686b3
DOC: Proof-Reading Edits
John-P Nov 12, 2021
a23603b
DOC: Proof-Reading Edits
John-P Nov 12, 2021
4f6b359
DOC: Proof Reading Edits
John-P Nov 12, 2021
8585e4d
UPD: tack
vqdang Nov 16, 2021
66ab98a
Merge branch 'example-slide-graph-pipeline' of https://github.com/TIA…
vqdang Nov 16, 2021
20b7242
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Nov 16, 2021
575a7d3
[skip travis]: Add Davis Update
vqdang Nov 16, 2021
667219b
[skip travis]: Add cells for overwriting run setup
vqdang Nov 16, 2021
5f4860f
[skip travis] UPD: Add plotting node activations
vqdang Nov 17, 2021
e233552
UPD: add colab badge
vqdang Nov 17, 2021
24dadb1
UPD: add tests
vqdang Nov 17, 2021
6db2af9
UPD: remove .py
vqdang Nov 17, 2021
5f96731
UPD: change the colormap
vqdang Nov 17, 2021
d6f3bc5
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Nov 25, 2021
155c080
UPD: sync name
vqdang Nov 25, 2021
6df9925
UPD: fix text
vqdang Nov 25, 2021
7c9463f
UPD: fix heading
vqdang Nov 25, 2021
3953a54
UPD: add tests
vqdang Nov 25, 2021
eee32d5
UPD: change args
vqdang Nov 25, 2021
6ce3e3f
UPD: text
vqdang Nov 25, 2021
c6937e4
UPD: refactor
vqdang Nov 25, 2021
327dc42
UPD: fix format
vqdang Nov 25, 2021
2833ffd
[skip travis] UPD: update figures + text
vqdang Nov 25, 2021
abebd4d
UPD: coverage
vqdang Nov 25, 2021
17b12d9
[skip travis] UPD: fix name
vqdang Nov 25, 2021
de28300
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Nov 29, 2021
75f5585
UPD: Add notebook just for inference
vqdang Nov 30, 2021
3e67f0a
[skip travis] UPD: edit text in main notebook
vqdang Nov 30, 2021
da780bd
[skip travis] UPD: Fix quote block seperation
vqdang Nov 30, 2021
0bea20b
[skip travis] UPD: fix typo
vqdang Nov 30, 2021
ad29ea1
[skip travis] UPD: quote seperation
vqdang Nov 30, 2021
779002c
[skip travis] UPD: Add license
vqdang Nov 30, 2021
b33ab7c
[skip travis] UPD: chang text
vqdang Nov 30, 2021
7300563
[skip travis] UPD: fix text
vqdang Nov 30, 2021
c5b83c3
Merge remote-tracking branch 'origin/example-slide-graph-pipeline' in…
wenqi006 Dec 2, 2021
fe2f8ba
Notebook for ER status prediction using SlideGraph+
wenqi006 Dec 2, 2021
44b8c33
UPD: Fix scaler
vqdang Dec 3, 2021
b112523
[skip travis] UPD: migrate notebook
vqdang Dec 3, 2021
e5537b3
[skip travis]: Add Davis changes to inference text
vqdang Dec 3, 2021
e2d21d7
[skip travis] UPD: remove pygeos
vqdang Dec 3, 2021
faf3bac
[skip travis] UPD: to shapely
vqdang Dec 3, 2021
2623813
[skip travis] UPD: Add Davis changes
vqdang Dec 3, 2021
68ca3fd
[skip travis] UPD: change folder
vqdang Dec 3, 2021
266b1d6
[skip travis]: Add instructions for colab/kaggle
vqdang Dec 3, 2021
03d8454
[skip travis] UPD: fix format
vqdang Dec 3, 2021
fdea631
Merge remote-tracking branch 'origin/example-slide-graph-pipeline' in…
wenqi006 Dec 4, 2021
afed667
Add trained models and inference part.
wenqi006 Dec 5, 2021
1a6f301
Merge branch 'develop' into example-ER-slidegraph-pipeline
shaneahmed Dec 10, 2021
79b17ee
Merge branch 'develop' of https://github.com/TIA-Lab/tiatoolbox into …
vqdang Dec 20, 2021
f4ee4df
[skip travis] UPD: add link for pretrained ER
vqdang Dec 20, 2021
6a3d3fd
[skip travis] UPD: remove misc
vqdang Dec 20, 2021
ccad88b
[skip travis] UPD: remove linkage
vqdang Dec 20, 2021
a8a3670
[skip travis] UPD: fix text
vqdang Dec 20, 2021
909c6dc
[skip travis] UPD: fix typo
vqdang Dec 20, 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
12 changes: 11 additions & 1 deletion examples/full-pipelines/slide-graph.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,17 @@
"- Patch extraction\n",
"- Stain normalization\n",
"- Cell segmentation & classification\n",
"- Extraction of deep features"
"- Extraction of deep features\n",
"\n",
"> **Note**: Although the original paper was evaluated for HER2. The method itself\n",
"> can be applicable for other mutation prediction. We provide a pretrained model\n",
"> for predicting [ER (Estrogen receptor)](https://en.wikipedia.org/wiki/Estrogen_receptor)\n",
"> status [here (model weights)](https://tiatoolbox.dcs.warwick.ac.uk/models/slide_graph/deep-features/model.weights.pth)\n",
"> and [here (model auxiliary)](https://tiatoolbox.dcs.warwick.ac.uk/models/slide_graph/deep-features/model.aux.dat).\n",
"> You can get the pre-generated graphs [here](https://tiatoolbox.dcs.warwick.ac.uk/models/slide_graph/deep-features/graphs.zip)\n",
"> and its node preprocessing model [here](https://tiatoolbox.dcs.warwick.ac.uk/models/slide_graph/deep-features/node_scaler.dat).\n",
"> For predicting ER status, we use deep features coming from ResNet50 rather than\n",
"> the cellular composition.\n"
Comment on lines +44 to +54
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shaneahmed URLs are here, all of them are for ER

]
},
{
Expand Down
12 changes: 11 additions & 1 deletion examples/inference-pipelines/slide-graph.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,17 @@
"- Cell segmentation & classification\n",
"- Extraction of deep features\n",
"- Graph Construction\n",
"- Graph Plotting"
"- Graph Plotting\n",
"\n",
"> **Note**: Although the original paper was evaluated for HER2. The method itself\n",
"> can be applicable for other mutation prediction. We provide a pretrained model\n",
"> for predicting [ER (Estrogen receptor)](https://en.wikipedia.org/wiki/Estrogen_receptor)\n",
"> status [here (model weights)](https://tiatoolbox.dcs.warwick.ac.uk/models/slide_graph/deep-features/model.weights.pth)\n",
"> and [here (model auxiliary)](https://tiatoolbox.dcs.warwick.ac.uk/models/slide_graph/deep-features/model.aux.dat).\n",
"> You can get the pre-generated graphs [here](https://tiatoolbox.dcs.warwick.ac.uk/models/slide_graph/deep-features/graphs.zip)\n",
"> and its node preprocessing model [here](https://tiatoolbox.dcs.warwick.ac.uk/models/slide_graph/deep-features/node_scaler.dat).\n",
"> For predicting ER status, we use deep features coming from ResNet50 rather than\n",
"> the cellular composition.\n"
]
},
{
Expand Down