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

MIAL Super-Resolution Toolkit v2.0 #2

Merged
merged 336 commits into from
Nov 6, 2020
Merged
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
336 commits
Select commit Hold shift + click to select a range
3910c26
CI: added list of output files for test
sebastientourbier Jun 13, 2020
7b9b7c5
CI: enabled comparison of lists of outputs
sebastientourbier Jun 13, 2020
f202b76
ENH: ignore _build folder by git
sebastientourbier Jun 13, 2020
c1d30a9
MAINT: update default param_file in parser
sebastientourbier Jun 13, 2020
c633e0e
FIX: added anatomical to setup.py packages
sebastientourbier Jun 13, 2020
79b0830
DOC: created sphinx doc for BIDS App to be later published on readthe…
sebastientourbier Jun 13, 2020
1afdf27
DOC: added .readthedocs.yml
sebastientourbier Jun 13, 2020
1ef3114
DOC: added pip requirements.txt for readthedocs
sebastientourbier Jun 13, 2020
3ff3ec0
DOC: add example of notebook [skip ci]
sebastientourbier Jun 13, 2020
9c535a5
DOC: added the brainhack notebook as example [skip ci]
sebastientourbier Jun 13, 2020
18e172b
DOC: fix nbsphinx version
sebastientourbier Jun 13, 2020
804f57b
FIX: missing __init__.py for pipelines.anatomical module
sebastientourbier Jun 13, 2020
aa45bd3
FIX: reviewed parser structure
sebastientourbier Jun 13, 2020
4ab297c
FIX: added parser.py
sebastientourbier Jun 13, 2020
170d9e7
FIX: parser in doc
sebastientourbier Jun 13, 2020
84bccfe
DOC: improve page on BIDS and BIDS App
sebastientourbier Jun 13, 2020
fc0e8ce
DOC: fix link to config schema
sebastientourbier Jun 13, 2020
0fc42e8
FIX: imports for parser
sebastientourbier Jun 13, 2020
812cd33
DOC: improved content
sebastientourbier Jun 13, 2020
1fa9e64
Merge pull request #14 from Medical-Image-Analysis-Laboratory/master
sebastientourbier Jun 22, 2020
58404f8
change location of network checkpoint for brain extraction to pymials…
Jun 23, 2020
064a082
remove checkpoint from wrong old location
Jun 23, 2020
01041b3
MAINT: add shebang
sebastientourbier Jun 23, 2020
f02e9cc
MAINT: created get_parser() function
sebastientourbier Jun 23, 2020
c0b0645
Merge pull request #15 from Medical-Image-Analysis-Laboratory/dev-pgd-hk
sebastientourbier Jun 23, 2020
3da12d1
Bugs correction and inclusion of PGD post-processing of binarized net…
Jun 23, 2020
ec8af9f
MAINT: updated badges in readme
sebastientourbier Jun 23, 2020
cdb8532
MAINT: fix typo in badge
sebastientourbier Jun 23, 2020
d81fad8
MAINT: updated badges in readthedocs
sebastientourbier Jun 23, 2020
268d4b5
DOC: update badge
sebastientourbier Jun 23, 2020
11337e8
DOC: update badge for readthedocs
sebastientourbier Jun 23, 2020
78c570b
DOC: create outputs.rst
sebastientourbier Jun 23, 2020
69c920d
DOC: update toc in index page with outputs page
sebastientourbier Jun 23, 2020
168a5cb
MAINT: do not ignore content of docker folder by dockerfile
sebastientourbier Jun 29, 2020
b1df0a5
DOCKER: update to miniconda3
sebastientourbier Jun 29, 2020
31fb4dd
MAINT: moved code
sebastientourbier Jun 29, 2020
8b7b27a
ENH: add coverage in docker
sebastientourbier Jun 29, 2020
451a152
CONDA: reviewed list of packages to be installed (add packages for br…
sebastientourbier Jun 29, 2020
24e509f
Update notebook
sebastientourbier Jun 29, 2020
cfe5284
Add channel anaconda to environment of jupyter image
sebastientourbier Jun 29, 2020
1e4a897
ENH: add code for brain extraction
sebastientourbier Jun 29, 2020
45d9f98
ENH: add new parser input flag '--manual'
sebastientourbier Jun 29, 2020
d7b2ef2
FIX: update dockerfile and add missing untracked files
sebastientourbier Jul 10, 2020
7b86221
Add missing untracked file
sebastientourbier Jul 10, 2020
258f212
Remove duplicated run.py bidsapp code
sebastientourbier Jul 10, 2020
0de2a0c
CI: update docker run command with flag --manual
sebastientourbier Jul 10, 2020
044a025
FIX: make run possible if tensorflow failed but manual mask are used
sebastientourbier Jul 20, 2020
2942caa
Replace current one shot segmentation with two-steps (localization + …
Aug 19, 2020
edd2281
Merge branch 'dev-hk' of https://github.com/Medical-Image-Analysis-La…
Aug 19, 2020
0018f02
Adapt other scripts (preprocess.py mainly) to be compatible with brai…
Aug 24, 2020
ff8f056
Update preprocess.py
hamzake Aug 24, 2020
57cc0b5
FIX: remove capture_output from run and print interface exception dur…
sebastientourbier Aug 26, 2020
b4945a1
MAINT: upgrade Nipype to 1.5.1
sebastientourbier Aug 26, 2020
d394ad3
Corrected bug where masks were not saved in the right location and he…
Aug 26, 2020
199fd2d
Updated BrainExtractionTwoSteps.py to be conform to brain extraction …
Aug 26, 2020
659a6fc
ENH: add code coverage
sebastientourbier Sep 1, 2020
3ca0638
CI: store artifacts for code coverage on circleci
sebastientourbier Sep 1, 2020
e53e248
CI: updated test job for code coverage and send coverage report to co…
sebastientourbier Sep 1, 2020
26ab5e2
CI: fix missing - run:
sebastientourbier Sep 1, 2020
dff8864
MAINT: remove unwanted crash files [skip ci]
sebastientourbier Sep 1, 2020
dbe5c75
CI: add job that sends coverage report to codacy in workflow
sebastientourbier Sep 1, 2020
2924772
ENH: enable nipype to generate provenance report
sebastientourbier Sep 1, 2020
1fd19d8
CI: add missing orb for codacy reporter
sebastientourbier Sep 1, 2020
376a91f
CI: add test with automatic brain extraction
sebastientourbier Sep 1, 2020
b6cce53
Merge pull request #16 from Medical-Image-Analysis-Laboratory/dev-pgd-hk
sebastientourbier Sep 2, 2020
f3bab65
MAINT: corrected code quality issues detected by linters (codacy)
sebastientourbier Sep 2, 2020
26bc8c7
MAINT: corrected code quality issues detected by linters (codacy) [sk…
sebastientourbier Sep 2, 2020
1ddee82
MAINT: add logo as markdown heading
sebastientourbier Sep 2, 2020
dc97819
MAINT: corrected a number of code style errors reported by codacy
sebastientourbier Sep 2, 2020
fb12e7f
Merge remote-tracking branch 'origin/dev-hk' into dev-hk
sebastientourbier Sep 2, 2020
36c1c4a
MAINT: corrected more code style errors in Dockerfiles README and pre…
sebastientourbier Sep 2, 2020
a60931c
MAINT: remove useless cd .. and sudo in dockerfile
sebastientourbier Sep 2, 2020
fbba4bb
MAINT: corrected extra code style issues detected by python linter (c…
sebastientourbier Sep 2, 2020
ea65487
DOC: added badges [skip ci]
sebastientourbier Sep 2, 2020
fc06344
FIX: reviewed output of enumerate() in for loop for brain extraction …
sebastientourbier Sep 2, 2020
2efa487
ENH: print error traceback
sebastientourbier Sep 22, 2020
bc3c535
FIX: pred -> pred_
sebastientourbier Sep 22, 2020
9054b11
correct brain extraction to get better masks
Oct 9, 2020
05ad4b6
correct brain extraction to get better masks
Oct 9, 2020
c456526
Merge branch 'dev-hk' of https://github.com/Medical-Image-Analysis-La…
Oct 9, 2020
6a4c779
Correct brain extraction and coding style
Oct 12, 2020
196cb10
Update preprocess.py
hamzake Oct 12, 2020
c305d8f
Update preprocess.py
hamzake Oct 13, 2020
f9b891e
Update brainExtractionTwoSteps.py
hamzake Oct 13, 2020
543bb1d
DOC: Improve way to get directory of script for doc on macosx
sebastientourbier Oct 19, 2020
e199927
DOC: Add pandoc and nbsphinx to conda environment for doc generation
sebastientourbier Oct 19, 2020
04a1666
DOC: Add new cell to brainhack.ipynb to try to integrate in the sphin…
sebastientourbier Oct 19, 2020
78ce8d5
MAINT: Delete obsolete superresolution.py
sebastientourbier Oct 19, 2020
66aa998
MAINT: renamed correctly brain masks in the datasinker
sebastientourbier Oct 19, 2020
a2530a3
CI: fix name of the list of outputs for test 2
sebastientourbier Oct 19, 2020
49cd0ee
CI: rename log file for each test
sebastientourbier Oct 19, 2020
8d9e91e
CI: update and rename test_outputs.txt to test-01_outputs.txt
sebastientourbier Oct 20, 2020
14fb728
CI: create test-02_outputs.txt
sebastientourbier Oct 20, 2020
d23c6a6
CI: check difference of list of outputs for test-01 and test-02
sebastientourbier Oct 20, 2020
0956e0d
MAINT: remove _id- from brain mask filename generated by DL method
sebastientourbier Oct 20, 2020
d94468f
CI: remove _id from ouput LR brain mask filenames of test-02
sebastientourbier Oct 20, 2020
74b735a
CI: comment difference of output lists
sebastientourbier Oct 20, 2020
f16619e
FIX: fix pyface version to 7.0.0 as pyface 7.1.0 triggered error on c…
sebastientourbier Oct 20, 2020
98cb9a4
CI: Enable again to check difference of lists of outputs
sebastientourbier Oct 20, 2020
74bb016
Merge pull request #4 from Medical-Image-Analysis-Laboratory/dev-hk
sebastientourbier Oct 20, 2020
f690c88
Update preprocess.py
hamzake Oct 29, 2020
77aa88c
Update preprocess.py
hamzake Oct 29, 2020
c3ce457
Update postprocess.py
hamzake Oct 29, 2020
b3c8c6b
CI: Resolved CI issues in pymialsrtk python files
pdedumast Oct 30, 2020
69324b9
CI: Resolved CI issues in bidsapp py file
pdedumast Oct 30, 2020
8cb4ecc
Update preprocess.py
hamzake Oct 30, 2020
2f3f15d
Update installation.rst
hamzake Oct 30, 2020
2e0a8d0
DOC: Update documentation of NLM denoising - multiple and single.
pdedumast Oct 30, 2020
113fc84
Merged conflicts dev-pgd-hk
pdedumast Oct 30, 2020
008423f
DOC: Update documentation for SliceIntensityCorrection - multiple and…
pdedumast Oct 30, 2020
0f91f7f
DOC: Update documentation for SliceBySliceN4BiasFieldCorrection - mul…
pdedumast Oct 30, 2020
6122588
Update srr.py
hamzake Oct 30, 2020
a0b4495
DOC: Update documentation for SliceBySliceCorrectBiasField - multiple…
pdedumast Oct 30, 2020
d70edd2
DOC: reviewed sphinx conf.py to browse docstrings
sebastientourbier Oct 30, 2020
0bfb7f1
DOC: add files and update TOC of index with API documentation from do…
sebastientourbier Oct 30, 2020
23563af
Merge branch 'dev-pgd-hk' of github.com:Medical-Image-Analysis-Labora…
pdedumast Oct 30, 2020
b0c16b7
Merge branch 'dev-pgd-hk' of github.com:Medical-Image-Analysis-Labora…
pdedumast Oct 30, 2020
7ad284b
DOC: Update documentation for MialsrtkIntensityStandardization, Mials…
pdedumast Oct 30, 2020
ee45cda
DOC: try to ignore missing modules to build doc from docstrings
sebastientourbier Oct 30, 2020
04f0d13
Merge branch 'dev-pgd-hk' of github.com:Medical-Image-Analysis-Labora…
pdedumast Oct 30, 2020
2567fac
DOC: add skimage module to be ignore by readthedocs
sebastientourbier Oct 30, 2020
95ac456
DOC: Update on InputSpec and OutputSpec descriptions
pdedumast Oct 30, 2020
61a7fda
CI: Resolved issue on empty dictionaries
pdedumast Oct 30, 2020
a4be1ef
Update preprocess.py
hamzake Oct 30, 2020
7001fa7
Merge branch 'dev-pgd-hk' of github.com:Medical-Image-Analysis-Labora…
pdedumast Oct 30, 2020
e6433c6
Update brainExtractionTwoSteps.py
hamzake Oct 30, 2020
0a0da2f
Merge branch 'dev-pgd-hk' of github.com:Medical-Image-Analysis-Labora…
pdedumast Oct 30, 2020
b77d22c
DOC: Update documentation of anatomical srr pipeline.
pdedumast Oct 30, 2020
7bff376
DOC: Correct Postprocess page title
pdedumast Oct 30, 2020
186e73a
DOC: add contributing page with description how to build the bidsapp …
sebastientourbier Oct 30, 2020
89a3a7f
MAINT: fix code style issue in script reported by codacy
sebastientourbier Oct 30, 2020
e6e5ee4
MAINT: fix code style issue in script reported by codacy
sebastientourbier Oct 30, 2020
343bb56
Update preprocess.py
hamzake Oct 30, 2020
b24e1be
Update preprocess.py
hamzake Oct 30, 2020
d6edf0a
FIX: remove typo in code line 199 that made tests in circleci failing
sebastientourbier Oct 30, 2020
9707aa1
Merge remote-tracking branch 'origin/dev-pgd-hk' into dev-pgd-hk
sebastientourbier Oct 30, 2020
d973fa6
Update preprocess.py
hamzake Oct 30, 2020
e1456c1
Update preprocess.py
hamzake Oct 30, 2020
08e224e
Update preprocess.py
hamzake Oct 30, 2020
3d8714a
Update srr.py
hamzake Nov 2, 2020
8df484c
Update preprocess.py
hamzake Nov 2, 2020
2a0a313
Update reconstruction.py
hamzake Nov 2, 2020
0f96db5
Update postprocess.py
hamzake Nov 2, 2020
973f0a2
DOC: add napoleon extension to sphinx config
sebastientourbier Nov 2, 2020
37816e1
DOC: Update .readthedocs.yml to V2
sebastientourbier Nov 2, 2020
1abffeb
Update .readthedocs.yml
sebastientourbier Nov 2, 2020
fbdc612
DOC: Update postprocess.py for MialsrtkRefineHRMaskByIntersection mod…
pdedumast Nov 3, 2020
7434c02
DOC: Update postprocess.py for MialsrtkN4BiasFieldCorrection modules.
pdedumast Nov 3, 2020
6b0065f
CI: Resolved white spaces issues in post-/pre- process files.
pdedumast Nov 3, 2020
4cb5528
DOC: Update reconstruction.py for MialsrtkTVSuperResolution modules.
pdedumast Nov 3, 2020
4598dea
DOC: Update reconstruction.py for ImageReconstruction module
pdedumast Nov 3, 2020
096ebf1
FIX: Update output_SRmask -> output_srmask which caused circleci test…
sebastientourbier Nov 3, 2020
3a51ebc
DOC: Add autodoc summary package to requirements.txt
sebastientourbier Nov 3, 2020
ee123a4
DOC: add summary to all autodoc directives in conf.py
sebastientourbier Nov 3, 2020
5568c6e
Update .readthedocs.yml
sebastientourbier Nov 3, 2020
77272f2
DOC: commented autodoc_default_options in conf.py
sebastientourbier Nov 3, 2020
409b710
DOC: try autosummary in preprocess module
sebastientourbier Nov 3, 2020
c85fa23
Update api_preprocess.rst
sebastientourbier Nov 3, 2020
f4306d1
Update requirements.txt
sebastientourbier Nov 3, 2020
a48c5ec
Update conf.py
sebastientourbier Nov 3, 2020
d9cbae7
DOC: correct docstring code style issues
sebastientourbier Nov 4, 2020
3ced881
DOC: reviewed docstring of anatomical pipeline
sebastientourbier Nov 4, 2020
c773500
DOC: reviewed example for anatomical pipeline
sebastientourbier Nov 4, 2020
f3136a9
DOC: update citing.rst
sebastientourbier Nov 4, 2020
8108a0f
DOC: update contributing.rst
sebastientourbier Nov 4, 2020
b523756
DOC: update ABOUT the index.rst and remove link to notebook in TOC
sebastientourbier Nov 4, 2020
e515bff
DOC: removed section title in api_pipelines.rst
sebastientourbier Nov 4, 2020
3a15e99
DOC: update docstrings
sebastientourbier Nov 4, 2020
18bf8f9
DOC: add docstrings in utils.py
sebastientourbier Nov 4, 2020
bbb8b26
DOC: updated logo PNG for mialsrtk (and added SVG) where I removed C++
sebastientourbier Nov 4, 2020
856a9de
DOC: update copyright
sebastientourbier Nov 4, 2020
0356c7e
DOC: fix default value of input argument cwd of the run() function
sebastientourbier Nov 4, 2020
9705c17
DOC: update example of run() function
sebastientourbier Nov 4, 2020
6303781
MAINT: update year in copyrights
sebastientourbier Nov 4, 2020
ca392b0
MAINT: removed unnecessary self as input of the run() function
sebastientourbier Nov 4, 2020
33fdb2f
MAINT: fix a number of codacy code style issues
sebastientourbier Nov 4, 2020
b996b57
DOC: add missing docstrings
sebastientourbier Nov 4, 2020
14c5c83
MAINT: reviewed structure of outputs for multiple reconstruction of t…
sebastientourbier Nov 4, 2020
78e2811
MAINT: fix code style issues in setup.py
sebastientourbier Nov 4, 2020
db35eb4
MAINT: fix additional code style issues reported by codacy
sebastientourbier Nov 4, 2020
677279a
CI: comment comparison with list of outputs before update
sebastientourbier Nov 4, 2020
1da789c
MAINT: Correct code style issues in dockerfile
sebastientourbier Nov 4, 2020
3674edd
MAINT: fix code style and add docstrings
sebastientourbier Nov 4, 2020
8971a3b
DOC: add docstring to get_parser()
sebastientourbier Nov 4, 2020
09cd838
MAINT: fix code style issues
sebastientourbier Nov 4, 2020
5714f97
MAINT: shorten long line in srr.py
sebastientourbier Nov 4, 2020
fd16d70
MAINT: fixed indentation
sebastientourbier Nov 4, 2020
771a1c4
MAINT: remove unnecessary comments
sebastientourbier Nov 4, 2020
9ea7143
MAINT: fix double quote issue in build_sphinx_docs.sh
sebastientourbier Nov 4, 2020
3e2eb19
MAINT: should fix issues in README
sebastientourbier Nov 4, 2020
3e33fd4
DOC: add missing label for reference of contributing page
sebastientourbier Nov 4, 2020
241af0f
DOC: add generation of PDF to .readthedocs.yml config
sebastientourbier Nov 4, 2020
ed3d75d
DOC: add link to all contributors specification in contributing.rst […
sebastientourbier Nov 4, 2020
8b6ccfa
DOC: updated README [skip ci]
sebastientourbier Nov 4, 2020
4764f7c
DOC: update list of resources in README [skip ci]
sebastientourbier Nov 4, 2020
421f0f9
DOC: update README [skip ci]
sebastientourbier Nov 4, 2020
048d215
FIX: changed log_directory in srr.py
sebastientourbier Nov 4, 2020
95ffeea
MAINT: correct code style issue in README [skip ci]
sebastientourbier Nov 4, 2020
7b9f644
MAINT: correct code style issue in README [skip ci]
sebastientourbier Nov 4, 2020
362872a
MAINT: correct code style issue in README [skip ci]
sebastientourbier Nov 4, 2020
20ba446
DOC: add page for contributors [skip ci]
sebastientourbier Nov 4, 2020
65e4701
DOC: removed versions of required python packages
sebastientourbier Nov 4, 2020
41775d4
DOC: reviewed layout in contributors as it is not properly built [ski…
sebastientourbier Nov 4, 2020
30ccd27
DOC: add extra blank line at end of contributors.rst [skip ci]
sebastientourbier Nov 4, 2020
5f101ee
DOC: renamed hamzake -> Hamza Kebiri in contributors.rst [skip ci]
sebastientourbier Nov 4, 2020
ba5f9aa
DOC: reviewed order in TOC of index.rst [skip ci]
sebastientourbier Nov 4, 2020
aef9b6b
CI: reduce number of stacks in data/code/participants_params.json [sk…
sebastientourbier Nov 4, 2020
dcfdc48
CI: updated list of outputs and uncommented difference checks
sebastientourbier Nov 4, 2020
af00c0e
DOC: update outputs with new structure and add execution workflow PNG…
sebastientourbier Nov 4, 2020
c74e31d
CI: comment check diff of test-02 outputs
sebastientourbier Nov 5, 2020
125aa92
CI: update output list of test-01
sebastientourbier Nov 5, 2020
5c73f26
DOC: update outputs.rst [skip ci]
sebastientourbier Nov 5, 2020
b15dc08
DOC: rearranged bids entities description and table in outputs.rst [s…
sebastientourbier Nov 5, 2020
06609b5
DOC: fix bids entities table in outputs.rst [skip ci]
sebastientourbier Nov 5, 2020
ccb46aa
DOC: update intro with BIDS in outputs.rst [skip ci]
sebastientourbier Nov 5, 2020
75881aa
CI: update test-02 output list and re-enable to check difference
sebastientourbier Nov 5, 2020
5de9b06
DOC: fix bids entities table in outputs.rst [skip ci]
sebastientourbier Nov 5, 2020
95d0191
DOC: fix bids entities table in outputs.rst [skip ci]
sebastientourbier Nov 5, 2020
ac55522
DOC: reviewed labels for generalization in outputs.rst [skip ci]
sebastientourbier Nov 5, 2020
4304257
DOC: resized logo in index.rst [skip ci]
sebastientourbier Nov 5, 2020
e774e3e
DOC: resized logo in index.rst [skip ci]
sebastientourbier Nov 5, 2020
72e50d0
DOC: resized images in outputs.rst [skip ci]
sebastientourbier Nov 5, 2020
367fe54
DOC: make the line below headers bigger in table of outputs.rst [skip…
sebastientourbier Nov 5, 2020
87eef77
DOC: reviewed level of markers for section/subsection title in index.…
sebastientourbier Nov 5, 2020
25a4352
DOC: reviewed latex settings for PDF generation in conf.py [skip ci]
sebastientourbier Nov 5, 2020
66465dc
DOC: reviewed level of markers for section/subsection title in index.…
sebastientourbier Nov 5, 2020
1e55459
DOC: add info to add contributor to the list in the README [skip ci]
sebastientourbier Nov 5, 2020
99372f7
DEL: Remove empty scripts/superresolution script and folder [skip ci]
sebastientourbier Nov 5, 2020
aafe470
DOC: update info to add contributor to the list [skip ci]
sebastientourbier Nov 5, 2020
32e46bd
DOC: update info to add contributor to the list [skip ci]
sebastientourbier Nov 5, 2020
a0b7514
DOC: update info to add contributor to the list [skip ci]
sebastientourbier Nov 5, 2020
1a8b6b2
DOC: shorten title to Contributing in contributing.rst [skip ci]
sebastientourbier Nov 5, 2020
86085eb
DOC: Add missing contribution type section title in contributing.rst …
sebastientourbier Nov 5, 2020
32e934f
DOC: renamed title to Pipelines module in api_pipelines.rst [skip ci]
sebastientourbier Nov 5, 2020
e73bcab
DOC: move one level up section "not list as contributor?" in contribu…
sebastientourbier Nov 5, 2020
72d80ba
DOC: fix typo in contributing.rst [skip ci]
sebastientourbier Nov 5, 2020
dedb53e
DOC: reviewed about in README and index.rst and modified text highlig…
sebastientourbier Nov 5, 2020
d0b7de2
DOC: reviewed more text highlights [skip ci]
sebastientourbier Nov 5, 2020
874d856
DOC: update readthedocs conf.py for better PDF generation [skip ci]
sebastientourbier Nov 6, 2020
5e22e1b
DOC: comment latex_engine definition in conf.py [skip ci]
sebastientourbier Nov 6, 2020
798b6d4
DOC: update customization latex and removed to show version in conf.p…
sebastientourbier Nov 6, 2020
588ca2f
DOC: adjust code size and improve comments for latex in conf.py [skip…
sebastientourbier Nov 6, 2020
ef1c7e1
DOC: fix latex_elements in conf.py [skip ci]
sebastientourbier Nov 6, 2020
d6ab04f
DOC: install fontspec for latex in conf.py [skip ci]
sebastientourbier Nov 6, 2020
c0577a4
DOC: install fontspec for latex in conf.py [skip ci]
sebastientourbier Nov 6, 2020
6d5cc09
DOC: try to fix customization of font family for latex in conf.py [s…
sebastientourbier Nov 6, 2020
3e3ef25
DOC: install dejavu font for PDF in conf.py [skip ci]
sebastientourbier Nov 6, 2020
8727491
DOC: an other try to fix column of index for pdf in conf.py [skip ci]
sebastientourbier Nov 6, 2020
f2d2333
DOC: reuse fvset to adjust code but seems to still not working [skip ci]
sebastientourbier Nov 6, 2020
31ef25a
DOC: disable custom fvset and makeindex as they do not work properly …
sebastientourbier Nov 6, 2020
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
33 changes: 33 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
*.pklz
*.pyc
*.npz
*.xdebug_tkmedit
*.mp4
atom-config.txt

.DS_Store?
.DS_Store
ehthumbs.db
Icon?
Thumbs.db

docs
docs/*

docker
docker/*

debian
debian/*

dist
dist/*

build
build/*

_build
_static
_templates

*.ipynb_checkpoints
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
*.*~
*.save

# python #
#################################
*.ipynb_checkpoints
*__pycache__

# Generated testing images #
############################
superresolution.nii.gz
Expand Down Expand Up @@ -71,3 +76,7 @@ bin
bin-dbg
Bin
RECON

# Data derivatives #
#####################
data/derivatives/mialsrtk*
File renamed without changes.
79 changes: 0 additions & 79 deletions .travis.yml.old

This file was deleted.

8 changes: 5 additions & 3 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
"keywords": [
"fetal",
"neuroimaging",
"workflow",
"pipeline",
"super-resolution",
"registration",
"MRI",
"BIDS",
"BIDS-App"
"BIDS"
],
"publication_date": "2019-03-19",
"creators": [
Expand All @@ -18,6 +16,10 @@
"affiliation": "Department of Radiology, Lausanne University Hospital (CHUV), Switzerland",
"orcid": "0000-0002-4441-899X"
},
{
"name": "Bresson, Xavier",
"affiliation": "Data Science and AI Center (DSAIR), Nanyang Technological University (NTU), Singapore"
},
{
"name": "Bach Cuadra, Meritxell",
"affiliation": "Department of Radiology, Lausanne University Hospital (CHUV), Switzerland",
Expand Down
86 changes: 86 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
FROM ubuntu:14.04

RUN apt-get update && \
apt-get install software-properties-common -y && \
apt-add-repository ppa:saiarcot895/myppa -y && \
apt-get update && \
apt-get -y install apt-fast \
&& apt-fast install -y \
build-essential \
exfat-fuse \
exfat-utils \
npm \
curl \
bzip2 \
xvfb \
x11-apps \
git \
gcc-4.8 \
g++-4.8 \
cmake \
libtclap-dev \
libinsighttoolkit4.5 \
libinsighttoolkit4-dev \
libvtk5-dev \
libvtk5-qt4-dev \
libvtk5.8 \
libvtk5.8-qt4 \
tcl-vtk \
libvtk-java \
python-vtk \
python-vtkgdcm \
libncurses5 \
libncurses5-dev \
libann-dev \
python-qt4 \
python-nibabel \
python-numpy \
python-scipy \
python-matplotlib && \
curl -sSL https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -o /tmp/miniconda.sh && \
bash /tmp/miniconda.sh -bfp /opt/conda && \
rm -rf /tmp/miniconda.sh && \
apt-get clean


ENV PATH /opt/conda/bin:$PATH

RUN conda update conda && \
conda clean --all --yes

RUN groupadd -r -g 1000 mialsrtk && \
useradd -r -M -u 1000 -g mialsrtk mialsrtk

WORKDIR /opt/mialsuperresolutiontoolkit
ADD . /opt/mialsuperresolutiontoolkit
RUN mkdir build
WORKDIR /opt/mialsuperresolutiontoolkit/build

RUN cd /opt/mialsuperresolutiontoolkit/build \
&& cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=/usr/local -D USE_OMP:BOOL=ON ../src \
&& make -j2 && sudo make install && cd ..

# Make MIALSRTK happy
ENV BIN_DIR "/usr/local/bin"
ENV PATH ${BIN_DIR}:$PATH

ENV BIN_DIR "/usr/local/bin"
ENV DISPLAY :0

ARG BUILD_DATE
ARG VCS_REF
ARG VERSION

#Metadata
LABEL org.label-schema.build-date=$BUILD_DATE
LABEL org.label-schema.name="MIAL Super-Resolution ToolKit Ubuntu 14.04"
LABEL org.label-schema.description="Computing environment of the MIAL Super-Resolution BIDS App based on Ubuntu 14.04."
LABEL org.label-schema.url="https://mialsuperresolutiontoolkit.readthedocs.io"
LABEL org.label-schema.vcs-ref=$VCS_REF
LABEL org.label-schema.vcs-url="https://github.com/sebastientourbier/mialsuperresolutiontoolkit"
LABEL org.label-schema.version=$VERSION
LABEL org.label-schema.maintainer="Sebastien Tourbier <sebastien.tourbier@alumni.epfl.ch>"
LABEL org.label-schema.vendor="Centre Hospitalier Universitaire Vaudois (CHUV), Lausanne, Switzerland"
LABEL org.label-schema.schema-version="1.0"
LABEL org.label-schema.docker.cmd="docker run --rm -v ~/data/bids_dataset:/tmp -t sebastientourbier/mialsuperresolutiontoolkit-ubuntu16.04:${VERSION}"

24 changes: 24 additions & 0 deletions build_bidsapp.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#! /bin/sh
CMP_BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
echo $CMP_BUILD_DATE

VERSION=v$(python get_version.py)
echo $VERSION

VCS_REF=$(git rev-parse --verify HEAD)
echo $VCS_REF

MAIN_DOCKER="sebastientourbier/mialsuperresolutiontoolkit-ubuntu14.04:${VERSION}"
echo $MAIN_DOCKER

docker build --rm --build-arg BUILD_DATE=$CMP_BUILD_DATE \
--build-arg VCS_REF=$VCS_REF \
--build-arg VERSION=$VERSION \
-t "${MAIN_DOCKER}" . \


docker build --no-cache --rm --build-arg BUILD_DATE=$CMP_BUILD_DATE \
--build-arg VERSION=$VERSION \
--build-arg VCS_REF=$VCS_REF \
--build-arg MAIN_DOCKER=$MAIN_DOCKER \
-t sebastientourbier/mialsuperresolutiontoolkit-bidsapp:${VERSION} ./docker/bidsapp
25 changes: 25 additions & 0 deletions build_jupyter.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#! /bin/sh
CMP_BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
echo $CMP_BUILD_DATE

VERSION=v$(python get_version.py)
echo $VERSION

VCS_REF=$(git rev-parse --verify HEAD)
echo $VCS_REF

MAIN_DOCKER="sebastientourbier/mialsuperresolutiontoolkit-ubuntu14.04:${VERSION}"
echo $MAIN_DOCKER

docker build --rm --build-arg BUILD_DATE=$CMP_BUILD_DATE \
--build-arg VCS_REF=$VCS_REF \
--build-arg VERSION=$VERSION \
-t "${MAIN_DOCKER}" . \

JUPYTER_DOCKER="sebastientourbier/mialsuperresolutiontoolkit-jupyter:${VERSION}"

docker build --rm --build-arg BUILD_DATE=$CMP_BUILD_DATE \
--build-arg VERSION=$VERSION \
--build-arg VCS_REF=$VCS_REF \
--build-arg MAIN_DOCKER=$MAIN_DOCKER \
-t "${JUPYTER_DOCKER}" ./docker/jupyter
3 changes: 3 additions & 0 deletions data/.bidsignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignoredFiles": ["*/tmp/**"]
}
3 changes: 3 additions & 0 deletions data/CHANGES
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
1.0.0 2019-05-10

- initial release
10 changes: 10 additions & 0 deletions data/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
This sample BIDS dataset contains a set of three orthogonal MRI
with anisotropic resolution (1x1x2mm^3) of the fetal brain of subject "sub-01"
acquired with a fast multi-slice sequence.

Manually drawn brain masks can be found in derivatives/manual_masks/sub-01/anat folder

The text file listing the scans used by the supperresolution_pipeline.sh script
can be found in code/ as sub-01_ses-01_scans.txt

- Sebastien Tourbier (May 10, 2019)
Binary file removed data/T30template/axial1_lr.nii.gz
Binary file not shown.
Binary file removed data/T30template/axial1_lr_brain_mask.nii.gz
Binary file not shown.
Binary file removed data/T30template/coronal1_lr.nii.gz
Binary file not shown.
Binary file removed data/T30template/coronal1_lr_brain_mask.nii.gz
Binary file not shown.
Binary file removed data/T30template/sagittal1_lr.nii.gz
Binary file not shown.
Binary file removed data/T30template/sagittal1_lr_brain_mask.nii.gz
Binary file not shown.
1 change: 1 addition & 0 deletions data/code/batch_list.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sub-01 ses-01 0.75 0.01
23 changes: 23 additions & 0 deletions data/code/create_dataset_description_json.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/sh
#
# Usage:
# sh create_dataset_description_json output.json v1.1.0
#
# Author: Sebastien Tourbier
#
###################################################################

OUTPUT_JSON=$1

(
cat <<EOF
{
"PipelineDescription": {
"Name": "MIAL Super-Resolution ToolKit",
"Version": "$2",
"CodeURL": "https://github.com/sebastientourbier/mialsuperresolutiontoolkit"
}
}

EOF
) > $OUTPUT_JSON
25 changes: 25 additions & 0 deletions data/code/create_scan_preproc_json.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/sh
#
# Usage:
# sh create_scan_preproc_json output.json source.nii.gz
#
# Author: Sebastien Tourbier
#
###################################################################

OUTPUT_JSON=$1

(
cat <<EOF
{
"Description": "Preprocessed image used as input to the Super-Resolution algorithm",
"Sources": "$2",
"CustomMetaData": {
"Reorient": true,
"Intensity standardization": true,
"Bias Field Correction": true
}
}

EOF
) > $OUTPUT_JSON
9 changes: 9 additions & 0 deletions data/code/participants_params.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"01": [
{ "srID":1,
"stacksOrder": [1, 3, 5, 5, 4, 6],
"paramTV": {
"lambdaTV": 0.75,
"deltatTV": 0.01 }
}]
}
6 changes: 6 additions & 0 deletions data/code/sub-01_ses-01_scans.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
run-1 axial
run-3 coronal
run-5 sagittal
run-2 axial
run-4 coronal
run-6 sagittal
6 changes: 6 additions & 0 deletions data/code/sub-01_ses-02_scans.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
run-1 axial
run-2 coronal
run-3 sagittal
run-4 coronal
run-5 sagittal
run-6 sagittal
Loading