-
Notifications
You must be signed in to change notification settings - Fork 42
ENH: Add initial FastSurfer interface (WIP) #280
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
Draft
pcamach2
wants to merge
234
commits into
nipreps:master
Choose a base branch
from
pcamach2:pcamach2-fastsurfer-patch
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
234 commits
Select commit
Hold shift + click to select a range
f8972da
Initial recipe change to include FastSurfer (GPU) support
pcamach2 1377f4c
Added function to test for FastSurfer files in --fs-subjects-dir
pcamach2 9b6251f
Add logger for FastSurfer check
pcamach2 f301f3a
Add quick fix check for FastSurfer
pcamach2 f90738a
Removes fastsurfer_bool
pcamach2 42e6456
Add FastSurfer argument to
pcamach2 7502350
Add FastSurfer citations
pcamach2 4cf37e5
Add FastSurfer
pcamach2 c8d0493
Add FastSurfer python wrapper
pcamach2 3169bc7
Update .zenodo.json
pcamach2 d596955
Fix typo
pcamach2 8feb172
Removes fastsurfer_bool for Flake8 check
pcamach2 94f962a
Update misc.py
pcamach2 94d952a
Update fastsurfer.py
pcamach2 7f9fe47
Update anatomical.py
pcamach2 55ea6b0
Update .zenodo.json
pcamach2 4c6828a
Update run.py
pcamach2 c77ed1d
Update misc.py
pcamach2 595b001
Address PEP8
pcamach2 86edc27
Update formatting for PEP8 compliance
pcamach2 a7c4aa6
Fix formatting for PEP8 compliance
pcamach2 b5cf10a
Fix formatting for PEP8 compliance
pcamach2 a93fd77
Fix formatting for PEP8 compliance
pcamach2 41cfba6
Fix typo
pcamach2 8f821d2
Revert Convert3D install method from development use case
pcamach2 e338001
Fix Convert3D
pcamach2 16d5f09
Pin Jinja2 version to prevent CircleCI build_docs failure
pcamach2 6973ddd
Fix docstring
pcamach2 d35eb07
Update example of commandline FastSurfer usage to docstring
pcamach2 1acc95f
Fix docstring formatting
pcamach2 a0e2c71
Update fastsurfer.py
pcamach2 609d00c
Update fastsurfer.py
pcamach2 6768242
Update fastsurfer.py
pcamach2 62ffc16
Fix docstrings formatting
pcamach2 1c55f0d
Update fastsurfer.py
pcamach2 d0f0f5d
Update fastsurfer.py
pcamach2 b65c03d
Add code block
pcamach2 8fc8139
Update fastsurfer.py
pcamach2 3322cd2
Adds FastSurfer recon workflow
pcamach2 9d58df9
Add logging of hires if FastSurfer for future use of VINN
pcamach2 f93e688
Initial draft of including FastSurfer recon wf
pcamach2 2e89573
Draft FastSurferSource
pcamach2 e5dab42
Separate surface workflows for FastSurfer and FreeSurfer
pcamach2 de510df
Include fastsurfer CLI argument
pcamach2 eddfeae
Format IO specs
pcamach2 b2e5376
DRAFT: Adds more of output traits
pcamach2 db2aeec
Debug Convert3D download and install failure in CI
pcamach2 48c7193
Include DKTatlas outputs, other files
pcamach2 93e9ee5
Fix conditional for surface workflows
pcamach2 9e8e22f
Increase mem for FastSurfer recon
pcamach2 ca039f0
Change URL to debug Convert3D install
pcamach2 f417766
Fix formatting on FastSCommand docstring
pcamach2 444d476
Added FastSurfer workflow
pcamach2 327cef0
Adds FastSurfer detailed outputs to FastSCommand output_spec
pcamach2 1b67033
Merge pull request #1 from pcamach2/pcamach2-fastsurfer-patch-v2
pcamach2 2a70ac9
Fix formatting for PEP8
pcamach2 7e2d53c
Fix formatting for PEP8
pcamach2 e52fd53
Fix formatting for PEP8
pcamach2 6545c6d
Fix formatting for PEP8
pcamach2 8d608b5
Fix formatting for PEP8
pcamach2 2f2560c
Debug convert3d install
pcamach2 126b0b5
Fix typo in _get_files
pcamach2 a5f1690
Add OutputMultiPath import
pcamach2 3613a05
Add import IOBase
pcamach2 9bab131
Fix docstring for FastSCommand
pcamach2 8321407
Remove code-block to debug docstring error
pcamach2 4753d32
Switch to FastSurfer dev image for Ubuntu 20.04
pcamach2 ac52464
Change FastSurfer directory to match Dockerfile
pcamach2 9a89867
Fix formatting for PEP8
pcamach2 2a56ff1
Include FastSurfer
pcamach2 c65d4c5
Add FastSurfer
pcamach2 265eb54
Change default license directory
pcamach2 6237a00
Switch check_fastsufer to only return boolean
pcamach2 592a543
Update description of check_fastsurfer
pcamach2 5737828
Adds FastSurfer reporting
pcamach2 81742b1
Fix formatting for PEP8
pcamach2 79e3c05
Fix formatting for PEP8
pcamach2 954d3a3
Fix formatting for PEP8
pcamach2 b9d24a8
Fix formatting for PEP8
pcamach2 58d5be8
Fix formatting for PEP8
pcamach2 067e505
Fix typo
pcamach2 9455019
Fix syntax
pcamach2 a192fd3
Fix variables for FastSurfer reports
pcamach2 b00bc95
Update fastsurfer.py
pcamach2 a545a02
Fix syntax
pcamach2 705ce9e
Fix syntax for PEP8
pcamach2 ee535a0
Add fastsurfer input to init_anat_derivatives
pcamach2 f03fd64
Add FastSurfer parameter to init_anat_reports_wf
pcamach2 7a76f96
Set FastSurfer parameter default to False
pcamach2 aa49b70
Switch fs_license to use FS_LICENSE os env var
pcamach2 8eae255
Add fastsurfer argument to init_anat_reports_wf
pcamach2 d2c50a4
Add default path for freesurfer license as /opt/freesurfer/license.txt
pcamach2 7262453
Fix typo
pcamach2 7fbd489
Add omp_nthreads and hires arguments to init_surface_recon_wf
pcamach2 cb65d08
Fix conditionals for FastSurfer in init_gifti_surface_wf & init_segs_…
pcamach2 bd9c11e
Fix formatting for PEP8
pcamach2 994d352
Switch fs_license default to $FREESURFER_HOME/license.txt
pcamach2 a4fa911
Fix formatting for PEP8
pcamach2 6d43967
Remove os.environ method of setting fs_license
pcamach2 b19510f
Update method for testing fs_license paths
pcamach2 7444df5
Update anatomical.py
pcamach2 c59e917
Fix formatting for PEP8
pcamach2 5cbf0ff
Call check_fastsurfer for conditionals
pcamach2 d5b11c3
Pass fastsurfer parameter instead of check_fastsurfer
pcamach2 32a62f3
Fix formatting for PEP8
pcamach2 c2b3fa6
Fix missing parameter for FastSurfer
pcamach2 62667d4
remove duplicate nodes
pcamach2 f275c4a
Fix opts fastsurfer typo
pcamach2 56dff95
Fix conditional to check opts.fastsurfer
pcamach2 86d7aa2
Revert from FastSurfer Docker style Freesurfer install
pcamach2 6f9701c
Update Dockerfile
pcamach2 8d8381f
Default fastsurfer_status set to "Not run"
pcamach2 ff60562
Fix docstring for FastSCommand
pcamach2 9fe2cda
Update fastsurfer.py
pcamach2 6fa46e2
fix docstring for FastSCommand
pcamach2 0b5d07e
Update fastsurfer.py
pcamach2 d0d753a
Fix imports to resolve Flake8 F821 errors
pcamach2 ab65e0d
Fix typo and switch logger to LOGGER
pcamach2 049937d
Fix indentation for continuation lines Flake8 E122
pcamach2 04b5888
Fix Flake8 error E302 expected 2 blank lines, found 1
pcamach2 d6f24c5
Fix variable names in fs-subjects-dir nodes
pcamach2 280ca53
Fix conda base env for FastSurfer
pcamach2 9c5d271
Switch to newer Freesurfer 7.2.0 for FastSufer forward compatibility
pcamach2 d433f3b
Creates Dockerfile for stable FastSurfer version, FreeSurfer 6.0.1 co…
pcamach2 7a6a6e8
Remove unnecessary copy instruction
pcamach2 960fdee
Revert to python3.6 for FastSurfer 1.0.1
pcamach2 f79f21c
Remove redundancies in conda envs
pcamach2 dc2c5f7
Update Dockerfile
pcamach2 bd40cb6
Fix: remove redundant conda build instructions and venv
pcamach2 cd4730f
Merge branch 'master' into pcamach2-fastsurfer-patch
pcamach2 0784da5
Fix retrieval of FastSurfer dev branch
pcamach2 ebd3318
Fix layer order
pcamach2 c6e9741
Fix missing libs
pcamach2 532313e
Update arguments for fastsurfer
pcamach2 219a422
Fix support for fastsurfer workflow
pcamach2 97accf4
Fix workflow for FastSurfer
pcamach2 26647bb
Fix PEP8 compliance
pcamach2 0b20fdd
Fix PEP8 compliance
pcamach2 5328f39
Fix PEP8 compliance
pcamach2 83a4a8e
Fix PEP8 compliance
pcamach2 fc0d34e
Merge pull request #2 from nipreps/master
pcamach2 c093515
Add FastSurfer
pcamach2 e290f89
Update for compatibility with FastSurfer
pcamach2 5e5f56d
Update for FastSurfer compatibility
pcamach2 15cbfb9
Add compatibility with FastSurfer
pcamach2 25c2305
Add files via upload
pcamach2 239b01a
Update run.py
pcamach2 fcd66b4
PEP8 compliance
pcamach2 d6c16ce
PEP8 compliance
pcamach2 84938f4
PEP8 compliance
pcamach2 051580e
Fix Flake8 compliance
pcamach2 a95b94f
Remove print command artifact from dev testing
pcamach2 ab0fe2f
Comment out unused import
pcamach2 fbcd2e4
Update FastSurfer, Freesurfer versions
pcamach2 a32ce8b
Delete unused Dockerfile
pcamach2 dfda235
Add explicit in-tree-build argument to pip, debug conda
pcamach2 f031a40
Update fastsurfer.py
pcamach2 d17aa7b
Comment out unused import os package
pcamach2 9263ebb
Merge branch 'master' into pcamach2-fastsurfer-patch
effigies 8e1f998
Update smriprep/interfaces/fastsurfer.py
pcamach2 26409f4
Apply suggestions from code review
pcamach2 21d3eff
Update smriprep/cli/run.py
pcamach2 db59431
Fix logic in surface recon workflow selection
pcamach2 0e12ed8
Revert to previous outputnode for existing FreeSurfer compatibility
pcamach2 b89254d
Update smriprep/workflows/anatomical.py
pcamach2 25c6399
Deduplicating get_surfaces and fssource
pcamach2 0ea2473
Remove unnecessary FastSurfer report class
pcamach2 4431be2
Add FASTSURFER_HOME to PATH
pcamach2 7575402
Update default python version and remove unused default values for in…
pcamach2 415163c
Sub-class FastSurerSourceOutputSpec from FSSourceOutputSpec
pcamach2 ac9aa33
De-duplicating surface_recon_wf
pcamach2 313576e
PEP8 compliance
pcamach2 e4d7e4d
PEP8 compliance
pcamach2 5d015ed
PEP8 compliance
pcamach2 6643b93
PEP8 compliance
pcamach2 573f0b3
PEP8 compliance
pcamach2 9bdb72c
Revert to FSSurfaceReport for FastSurfer
pcamach2 4247e71
Import FreeSurferSource
pcamach2 5cacac2
Fix typo
pcamach2 dde9494
Fix typo
pcamach2 73cfea8
Attempt to fix docstring error in build_docs
pcamach2 2cbd94a
Revert from FastSurfer v FreeSurfer specific string vars to nipype co…
pcamach2 712385d
Merge pull request #3 from nipreps/master
pcamach2 3a535c9
Update python version
pcamach2 4a4f7a0
Revert miniconda version for FastSurfer compatibility, update nibabel
pcamach2 18c4117
Nibabel==4.0.1 install after fastsurfer environment update
pcamach2 0a1ec70
Switch to python 3.8
pcamach2 98c3a87
Upgrade to latest FastSurfer release v1.1.1
pcamach2 9b517ec
Update FastSurfer version
pcamach2 b18e440
Switch to Nibabel 4.0.2
pcamach2 de08d59
Install nibabel via conda
pcamach2 1a041ca
Attempt to resolve CircleCI build error
pcamach2 0c49007
De-duplicating workflow
pcamach2 73116bb
Remove unused package imports (Flake8 compliance)
pcamach2 aedf220
Update FastSurfer version
pcamach2 1094e04
Update installation.rst
pcamach2 182f47e
Merge branch 'master' into pcamach2-fastsurfer-patch
pcamach2 87940c9
Fix error for Flake8
pcamach2 1c1fc21
Fix typo in FastSurfer version
pcamach2 1bdf326
Change nibabel version after installing FastSurfer dependencies
pcamach2 6d8e32d
update authors
pcamach2 3f6b1f6
Merge branch 'nipreps-master' into pcamach2-fastsurfer-patch
pcamach2 96edd2a
Test FreeSurfer license path fix
pcamach2 dbb647b
Update Dockerfile
pcamach2 e9673a7
Update run.py
pcamach2 8bcb69c
Update run.py
pcamach2 92c2bbc
Update to FastSurfer v2.0.0
pcamach2 45d2b54
Fix typo in FastSurfer git clone
pcamach2 e026c6d
Update FastSurfer version
pcamach2 e5fbb1c
Update Dockerfile
pcamach2 2263258
Remove unnecessary SetUpFreeSurfer.sh from bashrc
pcamach2 f9b9e79
Merge branch 'master' into pcamach2-fastsurfer-patch
pcamach2 539fe07
Update FastSurfer version
pcamach2 5c4e680
Restore FS_LICENSE generation from B64
pcamach2 8f2f0ca
Remove branch tags
pcamach2 016dc5c
Merge remote-tracking branch 'origin/master' into pcamach2-fastsurfer…
pcamach2 721ab2c
Merge remote-tracking branch 'origin/master' into pcamach2-fastsurfer…
pcamach2 0c3c420
Merge branch 'master' into pcamach2-fastsurfer-patch
pcamach2 7154e1b
Add checkpoints for FastSurfer from FastSurfer Dockerfile
pcamach2 d2feae9
Switch order of conda env updates
pcamach2 d0e8a3f
Update FastSurfer to v2.0.4
pcamach2 d869a16
Reorder FastSurfer directory copy and remove unused git clone
pcamach2 018da7f
Merge branch 'master' into pcamach2-fastsurfer-patch
pcamach2 b6f083a
Debugging FastSurfer Workflow
pcamach2 5d82055
Debugging FastSurfer Workflow
pcamach2 9b891fa
Debugging FastSurfer Workflow
pcamach2 90979a7
Merge pull request #6 from nipreps/master
pcamach2 dffab67
Merge branch 'nipreps:master' into pcamach2-fastsurfer-patch
pcamach2 e810a7c
Include mri_mc for FastSurfer compatibility
pcamach2 3cee842
Remove exclusion of files needed for FastSurfer v2.0.4
pcamach2 456b03a
Remove repeated package installations
pcamach2 b5a1bb7
Debugging workflows for FastSurfer
pcamach2 ff91fea
Add files via upload
pcamach2 ef1054c
Change inputs and defaults to match FastSurfer v2.0.4 CLI
pcamach2 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"esbonio.server.enabled": false | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,4 +10,4 @@ sphinx | |
sphinx_rtd_theme | ||
sphinxcontrib-apidoc ~= 0.3.0 | ||
templateflow | ||
networkx != 2.8.1 | ||
networkx != 2.8.1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.