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

REL: Connectome Mapper Release v3.0.0 #80

Merged
merged 472 commits into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
472 commits
Select commit Hold shift + click to select a range
1dbadb7
ENH: Specify datatype="anat" in BIDSDataGrabber of segmentation and p…
sebastientourbier Nov 29, 2021
5d5b842
FIX: Return absolute path in outputs of interface that compute ROI vo…
sebastientourbier Nov 29, 2021
d7a60a2
UPD: Use cache and remove --rm in docker build command of script
sebastientourbier Nov 29, 2021
f608f24
FIX: Review datasinker substitution for custom parcellation atlas
sebastientourbier Nov 30, 2021
fc5e8a6
FIX: Changes that makes the full anatomical pipeline working with exi…
sebastientourbier Nov 30, 2021
691c7d5
ENH: Update atlas_info of AnatomicalPipeline when custom inputs used
sebastientourbier Nov 30, 2021
075a235
FIX: Change extensions to extension for BIDSLayout get() in diffusion…
sebastientourbier Nov 30, 2021
e68bc40
ENH: Add custom_atlas_name and custom_atlas_res to Diffusion and fMRI…
sebastientourbier Nov 30, 2021
a1df446
ENH: Set custom_atlas_name and custom_atlas_res to Diffusion and fMRI…
sebastientourbier Nov 30, 2021
f5bbc11
STY: Review code layout in connectomapper3.py
sebastientourbier Nov 30, 2021
ec9c163
FIX: Change stage from Segmentation to Parcellation to get config.cus…
sebastientourbier Dec 1, 2021
84a54fa
ENH: Handle custom parcellation in interfaces to map structural and f…
sebastientourbier Dec 1, 2021
390a952
ENH. Handle substitutions in DiffusionPipeline datasinker for custom …
sebastientourbier Dec 1, 2021
6d22317
STY: Reformat and protect from BLACK code for flow.connect() in fMRI …
sebastientourbier Dec 1, 2021
4e43bd1
STY: Correct space/tabs in fMRI.py
sebastientourbier Dec 1, 2021
5ee4695
FIX: Add atlas_info to inputnode of fMRI connectome stage
sebastientourbier Dec 1, 2021
23ce382
STY: Reformat and protect flow.connect() in fmri_connectome, diffusio…
sebastientourbier Dec 1, 2021
5abf3be
ENH: Handle substitutions in fMRIPipeline datasinker for custom segme…
sebastientourbier Dec 1, 2021
f60de3d
FIX: Use despiking_output for in_file of fslMeanImage() in fmri_prepr…
sebastientourbier Dec 1, 2021
3c10aa7
FIX: Handle substitutions in fMRIPipeline datasinker
sebastientourbier Dec 1, 2021
cae3613
ENH: Inspection of segmentation and parcellation stage outputs when c…
sebastientourbier Dec 1, 2021
47fa002
REF: Move and adapt get_filename_path method to CustomBIDSFile
sebastientourbier Dec 1, 2021
ed303f2
UPD: Use global toolbox derivatives names and update name to be compl…
sebastientourbier Dec 2, 2021
8c01e51
TEST: Update list of outputs with new toolbox derivatives directories
sebastientourbier Dec 2, 2021
51ef1eb
UPD: Update toolbox derivatives directories to be compliaant with BID…
sebastientourbier Dec 2, 2021
c891863
DOC: Add changes related to version 3.0.0
sebastientourbier Dec 3, 2021
12bedd1
CI: Update singularity orbs version and way to login to SylabsCLoud
sebastientourbier Dec 3, 2021
ab90757
CI: Remove run steps that displays storage
sebastientourbier Dec 3, 2021
ce3f13a
FIX: Move declaration of cmp / freesurfer / nipype derivatives dirs b…
sebastientourbier Dec 3, 2021
73e01fb
catch valueerror in order to catch BIDSValidator message and display it
jwirsich Dec 3, 2021
8d4f4e0
Check if Freesurfer license is already existing in local BIDS 'code' …
jwirsich Dec 3, 2021
61376df
fixed unused import warnings
kuba-fidel Dec 3, 2021
b67b8b4
ENH: add singularity CLI to wrap calls to the Singularity BIDS APP image
anilbey Dec 3, 2021
6cf77b1
ENH: use ast.literal_eval for literals instead of eval
anilbey Dec 3, 2021
5c63685
CI: Rename freesurfer folder to freesurfer-6.0.1
sebastientourbier Dec 4, 2021
f5131a2
Merge branch 'release/v3.0.0' into linter_warning
sebastientourbier Dec 4, 2021
30d5f50
Merge pull request #108 from kuba-fidel/linter_warning
sebastientourbier Dec 4, 2021
6ea3c24
Merge pull request #110 from anilbey/enh/release/v3.0.0/literal_eval
sebastientourbier Dec 4, 2021
24389cc
CI: Remove --debug option for singularity build in `.circleci/config.…
sebastientourbier Dec 4, 2021
6e6b803
ENH: add connectomemapper3_singularity.py to entry points #113
anilbey Dec 4, 2021
081553c
DOC: add singularity cli usage example #113
anilbey Dec 4, 2021
8e68172
ENH: rename general get call to cmp_parser.get()
anilbey Dec 4, 2021
c2c0813
UPD: updated singularity run image
anilbey Dec 4, 2021
42301e0
ENH: add singularity wrapper arg parser
anilbey Dec 4, 2021
82a6a22
ENH: add input validator to check mandatory directories exists
anilbey Dec 4, 2021
aff40f9
UPD: update .gitignore
anilbey Dec 4, 2021
3b0cd4c
UPD: create_singularity_cmd docstring update
anilbey Dec 4, 2021
8098746
UPD: singularity circleci job to call python wrapper
anilbey Dec 4, 2021
8511c9f
FIX: circleci yaml syntax fix
anilbey Dec 4, 2021
e657b96
UPD: ci config move pip install into setup miniconda environment run
anilbey Dec 4, 2021
6d1e78c
UPT: documentation connectomemapper_singularity example
anilbey Dec 4, 2021
b3e0775
Merge branch 'release/v3.0.0' into enh/release/v3.0.0/enhanced_bidsap…
jwirsich Dec 4, 2021
c12b27c
ENH: add docker CLI to wrap calls to the Docker BIDS APP image
kuba-fidel Dec 4, 2021
c5beba5
FIX: usage.rst file style fix
anilbey Dec 4, 2021
f52a334
Merge branch 'connectomicslab:master' into enh/release/v3.0.0/enhance…
jwirsich Dec 6, 2021
ade22b4
Merge branch 'release/v3.0.0' into enh/release/v3.0.0/singularity_wra…
sebastientourbier Dec 6, 2021
0c3fbb8
Merge pull request #114 from jwirsich/enh/release/v3.0.0/enhanced_bid…
sebastientourbier Dec 6, 2021
8b8d583
Merge branch 'release/v3.0.0' into enh/release/v3.0.0/singularity_wra…
sebastientourbier Dec 6, 2021
15a0d5e
Rename connectome_mapper_singularity.py to connectomemapper_singulari…
sebastientourbier Dec 6, 2021
790a8ab
Update usage.rst
sebastientourbier Dec 6, 2021
d61194a
UPD: Change to 'connectomemapper3_singularity = cmp.cli.connectomemap…
sebastientourbier Dec 6, 2021
c4758bb
Rename connectomemapper_singularity.py to connectomemapper3_singulari…
sebastientourbier Dec 6, 2021
288080f
Apply suggestions from code review
sebastientourbier Dec 6, 2021
daea156
FIX: Update call to singularity wrapper in .circleci/config.yml
sebastientourbier Dec 6, 2021
9b40481
Merge pull request #109 from anilbey/enh/release/v3.0.0/singularity_w…
sebastientourbier Dec 6, 2021
f4ca0ab
Merge branch 'release/v3.0.0' into enh/release/v3.0.0/custom_anatomical
sebastientourbier Dec 6, 2021
a54aada
DOC: Add docs/contributors.rst [skip ci]
sebastientourbier Dec 6, 2021
0e92b60
DOC: Add badge and page of contributors in docs/index.rst [skip ci]
sebastientourbier Dec 6, 2021
5d2300e
Merge branch 'release/v3.0.0' into enh/release/v3.0.0/docker_wrapper
sebastientourbier Dec 7, 2021
8e30364
FIX: Creation of commands by docker and singularity wrappers
sebastientourbier Dec 7, 2021
954e242
CI: Update the calls to python docker/singularity wrappers (tests 5 a…
sebastientourbier Dec 7, 2021
9527d50
DOC: Update usage examples of python docker/singularity wrappers
sebastientourbier Dec 7, 2021
b9e2bd7
Merge pull request #115 from kuba-fidel/enh/release/v3.0.0/docker_wra…
sebastientourbier Dec 7, 2021
09438c3
Merge branch 'release/v3.0.0' into enh/release/v3.0.0/docker_wrapper
sebastientourbier Dec 7, 2021
ca97ecf
Merge pull request #130 from connectomicslab/enh/release/v3.0.0/docke…
sebastientourbier Dec 7, 2021
f85156f
Merge branch 'release/v3.0.0' into enh/release/v3.0.0/custom_anatomical
sebastientourbier Dec 7, 2021
05cfedc
FIX: Add missing , and ] in setup.py
sebastientourbier Dec 7, 2021
ef7b590
Merge branch 'release/v3.0.0' into enh/release/v3.0.0/custom_anatomical
sebastientourbier Dec 7, 2021
105b646
Merge remote-tracking branch 'origin/enh/release/v3.0.0/custom_anatom…
sebastientourbier Dec 7, 2021
5567b41
FIX: EOF error in cmtklib.parcellation
sebastientourbier Dec 7, 2021
51598a3
FIX: Refactor __cmp_directory__, __nipype_directory__, __freesurfer_d…
sebastientourbier Dec 7, 2021
cb0fce6
REF: Move __cmp_directory__, __nipype_directory__, __freesurfer_direc…
sebastientourbier Dec 7, 2021
02dc643
MISC: Remove tag # noqa for __cmp_directory__, __nipype_directory__, …
sebastientourbier Dec 7, 2021
772043d
CI: Remove the storing of simg as artifact to reduce job overall time
sebastientourbier Dec 7, 2021
9be3070
STY: Correct code style issues detected by Codacy
sebastientourbier Dec 7, 2021
e3a5bfe
STY: Correct a few more code style issues detected by Codacy
sebastientourbier Dec 7, 2021
d13d3c2
STY: Correct a few more code style issues detected by Codacy
sebastientourbier Dec 7, 2021
0b4cb24
STY: Correct a few more code style issues detected by Codacy [skip ci]
sebastientourbier Dec 7, 2021
9fda6d7
FIX: Create the output dirs for the config files if they do not exist
sebastientourbier Dec 7, 2021
281ef45
CI: Specify resource_class: large following changes of Circleci prici…
sebastientourbier Dec 8, 2021
ac609ab
DOCKER: Use multi-stage build and BuildKit
sebastientourbier Dec 8, 2021
d93a25f
CI: Use BuildKit while building the docker image
sebastientourbier Dec 8, 2021
7355e1b
STY: Change ENV name value to ENV name=value in Dockerfile
sebastientourbier Dec 8, 2021
04ff72a
DOCKER: Take full advantage of multi-stage builds and BuildKit
sebastientourbier Dec 8, 2021
8c75507
CI: Change python to python3 in build_docker job
sebastientourbier Dec 8, 2021
2b56fdf
CI: Use caching in build_docker_image job
sebastientourbier Dec 8, 2021
c2021eb
CI: Use caching in get_data job
sebastientourbier Dec 8, 2021
2b4e374
CI: Use machine executor for build_docker_image job to see if buildki…
sebastientourbier Dec 8, 2021
b7a6fb9
CI: Remove setup_remote_docker unavailable for machine executor
sebastientourbier Dec 8, 2021
84cf65b
CI: Correct to sudo apt-get install pigz
sebastientourbier Dec 8, 2021
e341c14
CI: Correct with addition of sudo apt-get update
sebastientourbier Dec 8, 2021
125c4c7
CI: Check if data exists in case of caching in get_data job
sebastientourbier Dec 8, 2021
fdb8c5d
CI: Add "fi" to mark end of conditions in get_data job
sebastientourbier Dec 8, 2021
801c5e6
CI: Change test in get_data job to /tmp/data/ds-sample/derivatives/fr…
sebastientourbier Dec 8, 2021
3837349
CI: Specify absolute path of get_version.py
sebastientourbier Dec 8, 2021
55b64c9
CI: Review docker build
sebastientourbier Dec 8, 2021
df04b83
CI: Review docker build (fix)
sebastientourbier Dec 8, 2021
d8eaed6
CI: Remove --cache-from sebastientourbier/connectomemapper3
sebastientourbier Dec 8, 2021
8115f2f
CI: Remove loop for docker build
sebastientourbier Dec 8, 2021
48c2469
DOCKER: Review multi-stage build and ENV
sebastientourbier Dec 8, 2021
e56b2ff
FIX: Add missing \ in ENV statement of Dockerfile
sebastientourbier Dec 8, 2021
79b6f88
CI: Comment temporary cache for faster test of docker build
sebastientourbier Dec 8, 2021
173bf54
Docker: debug ls -la .
sebastientourbier Dec 8, 2021
1e1544d
Docker: Fix installation of MCR in freesurfer
sebastientourbier Dec 8, 2021
a56eaea
CI: Add --progress=plain to docker build
sebastientourbier Dec 8, 2021
c68b7f1
CI: Add --squash option to docker build
sebastientourbier Dec 8, 2021
e4afa3d
CI: Enable experimental features of docker deamon for "--squash"
sebastientourbier Dec 8, 2021
65df8df
CI: Review how to create /etc/docker/deamon.json
sebastientourbier Dec 8, 2021
af129f5
CI: Review how to create /etc/docker/deamon.json
sebastientourbier Dec 8, 2021
f473f63
TEST: Review copy of fsl files in Dockerfile
sebastientourbier Dec 8, 2021
2e824b0
FIX: Add COPY --from=neurobuntu /etc/fsl /etc/fsl in Dockerfile
sebastientourbier Dec 8, 2021
2c83ee2
CI: Re-enable caching of docker image
sebastientourbier Dec 8, 2021
d55b384
Docker: Remove build stages to ease caching
sebastientourbier Dec 8, 2021
c3a7207
CI: Re-disable caching of docker image because of timeout
sebastientourbier Dec 8, 2021
f498d6a
Docker: Back to multi-stage and review COPY --from of last stage
sebastientourbier Dec 9, 2021
f1ac20e
REF: Use list of packages installed by conda and pip separately to sp…
sebastientourbier Dec 9, 2021
566f555
Docker: Add tclsh, wish and review copy of files in /usr/share
sebastientourbier Dec 9, 2021
cd54ea3
CI: Set docker_layer_caching: true for docker build and do not prune …
sebastientourbier Dec 9, 2021
2c8d717
Docker: Change to COPY --from=neurobuntu /usr/bin /usr/bin
sebastientourbier Dec 9, 2021
c916a97
CI: Creation of commands that were duplicated over the tests and adop…
sebastientourbier Dec 9, 2021
aa838ac
Docker: Review copy from previous stages
sebastientourbier Dec 9, 2021
889c784
CI: Decrease compression level of zstd
sebastientourbier Dec 9, 2021
12edde0
Docker: Copy extra bin folders from intermediate build stage
sebastientourbier Dec 9, 2021
44b72fa
CI: Big refactoring with the creation of commands for tests and such …
sebastientourbier Dec 9, 2021
8b6e244
CI: Remove definition of name from commands in .circleci/config.yml
sebastientourbier Dec 9, 2021
8ad3296
CI: Add name to all commands
sebastientourbier Dec 9, 2021
a49b84b
CI: Remove references to name parameter
sebastientourbier Dec 9, 2021
b38397a
CI: Rename name to run_name
sebastientourbier Dec 9, 2021
7be7744
CI: Add dependency on codacy_coverage_report for send_codacy_report
sebastientourbier Dec 9, 2021
2b2bb04
CI: remove dependencies on all tests for send_codacy_report
sebastientourbier Dec 9, 2021
968ee0f
REF: Move cmp/bidsappmanager/core.py to cmtklib/process.py
sebastientourbier Dec 10, 2021
7e2e1bf
CI: Correct installation of miniconda for wrappers
sebastientourbier Dec 10, 2021
e3df45a
UPD: Skip Freesurfer recon-all if 001.mgz exists
sebastientourbier Dec 10, 2021
0ba65fb
CI: Use ${CIRCLECI_RESOURCE_CLASS} environment variable to set resour…
sebastientourbier Dec 10, 2021
cab032d
CI: Change back to resource_class: medium as it seems circleci acces…
sebastientourbier Dec 10, 2021
e712a6c
CI: Correct last resource_class: medium
sebastientourbier Dec 10, 2021
18b7bac
CI: Increase resource_class of build_singularity job to large
sebastientourbier Dec 10, 2021
b1957d6
ENH: Better handling of existing freesurfer data
sebastientourbier Dec 10, 2021
c0ddebf
CI: Do not delay tests 05 and 06
sebastientourbier Dec 10, 2021
646e19c
FIX: Set freesurfer dirs at construction of SegmentationStage
sebastientourbier Dec 11, 2021
aeae021
CI: Fix installation of conda
sebastientourbier Dec 11, 2021
c53c20a
FIX: Gives list to join() in constructor of SegmentationStage
sebastientourbier Dec 11, 2021
0cbc967
CI: Activate env with conda activate instead of source activate
sebastientourbier Dec 11, 2021
8df43ce
FIX: Readjust code related to derivatives folders
sebastientourbier Dec 11, 2021
7ac2132
CI: Add miniconda to PATH in tests of wrappers
sebastientourbier Dec 11, 2021
787bb76
FIX: Update to __freesurfer_directory__ in constructor of AnatomicalP…
sebastientourbier Dec 11, 2021
3dd1c56
CI: Set no_output_timeout: 5h in all test-* commands
sebastientourbier Dec 11, 2021
8250d16
FIX: Specify config flags in python wrappers
sebastientourbier Dec 13, 2021
9464a74
CI: Review order of tests and reuse anatomical pipeline outputs of te…
sebastientourbier Dec 13, 2021
ab42faf
CI: Clean workflow dependencies
sebastientourbier Dec 13, 2021
b09f0d6
CI: Specify docker image and version for test of python wrapper
sebastientourbier Dec 13, 2021
7e5bfd6
CI: Fix docker image and version for test of python wrapper
sebastientourbier Dec 13, 2021
a5b124b
CI: Upgrade to large resource class and specify --ants_number_of_thre…
sebastientourbier Dec 13, 2021
1338f0a
CI: Do not segment extra sub-structures for L2018 scheme in test-01
sebastientourbier Dec 13, 2021
59837fe
FIX: Use rawavg to resample and cconvert the diverse Freesurfer outputs
sebastientourbier Dec 13, 2021
c7ff916
ENH: Perform preprocessing steps only if necessary (ACT/GMWMI)
sebastientourbier Dec 13, 2021
3114f17
TEST: Use skimage to perform modal dilation of the ventricule3 instea…
sebastientourbier Dec 14, 2021
36dff7b
ENH: Perform preprocessing steps only if necessary (ACT/GMWMI) - Part 2
sebastientourbier Dec 14, 2021
3af5550
FIX: Add installation of skimage 0.16.2 as more recent version cause …
sebastientourbier Dec 15, 2021
cbcffcc
FIX: Change as_type() to astype() in cmtklib/parcellation.py
sebastientourbier Dec 15, 2021
109a75f
FIX: Call skfilters.rank.modal in cmtklib/parcellation.py
sebastientourbier Dec 15, 2021
55e6dd7
FIX: Add on_trait_change for parcellation_scheme in AnatomicalPipeline
sebastientourbier Dec 15, 2021
9567b7c
CI: Update list of outputs for test 02
sebastientourbier Dec 15, 2021
ff4c675
FIX: Correct call of skimage.filters.rank.modal in CombineParcellatio…
sebastientourbier Dec 16, 2021
51516b1
ENH: Shorten, remove duplication, improve code style of run.py and re…
sebastientourbier Dec 16, 2021
92ac9ea
Merge branch 'enh/release/v3.0.0/custom_anatomical' into doc/enh/rele…
sebastientourbier Dec 16, 2021
83ae9da
DOC: Update docs/changes.rst
sebastientourbier Dec 16, 2021
5a76947
DOC: Add documentation for changes introduced in enh/release/v3.0.0/c…
sebastientourbier Dec 16, 2021
606eba3
FIX: Print "process subject..." after construction of CMP_Project_Inf…
sebastientourbier Dec 16, 2021
eb57a90
REV: Use fslmaths modal dilation (-dilD) for ventricule3
sebastientourbier Dec 16, 2021
a67f8dc
FIX: Correct generation of output filenames in CombineParcellations i…
sebastientourbier Dec 16, 2021
003234a
FIX: Correct generation of output filenames in CombineParcellations i…
sebastientourbier Dec 17, 2021
e64d42a
FIX: Correct print of voxel volume in ComputeROIVolumetry
sebastientourbier Dec 17, 2021
138fca2
UPD: Change call to subprocess.run instead of subprocess.Popen in run…
sebastientourbier Dec 17, 2021
66e2ebe
CI: Update list of outputs of test 10
sebastientourbier Dec 17, 2021
519631d
CI: Split the creation of the list of outputs from the difference che…
sebastientourbier Dec 17, 2021
25c1e31
CI: Update dataset with new version and reset the cache
sebastientourbier Dec 17, 2021
5bcd035
CI: Review resampling of inputs of anat and dwi pipelines
sebastientourbier Dec 17, 2021
80ed63c
CI: Update list of outputs of test 05
sebastientourbier Dec 17, 2021
b6d7dde
FIX: Do not set gmwmi_seeding = False when tracking_tool == 'Dipy'
sebastientourbier Dec 17, 2021
c40724d
CI: update with new version of sample dataset for testing where resam…
sebastientourbier Dec 18, 2021
f33387f
CI: Reset cache of get_data job
sebastientourbier Dec 18, 2021
9b561f5
STY: Reformat flow.connect() blocks and protect them from BLACK in di…
sebastientourbier Dec 18, 2021
05c8c2f
CI: Update list of outputs for tests 04 and 05
sebastientourbier Dec 18, 2021
11b4560
FIX: Add new attributes in RegistrationConfig Apply transform to 5tt/…
sebastientourbier Dec 18, 2021
5855e02
CI: Add list of outputs for test 01
sebastientourbier Dec 18, 2021
f07988f
FIX: Substitution of parcellation stats files
sebastientourbier Dec 18, 2021
4364774
CI: Update list of outputs for test 02
sebastientourbier Dec 18, 2021
ba426f3
CI: Update list of outputs for tests 04 -> 10
sebastientourbier Dec 18, 2021
c8543be
CI: Remove test 03 and 11 (Lausanne2008) as too long for circleci
sebastientourbier Dec 18, 2021
acf7d6a
CI: Add test 10 coverage and add it to codacy report
sebastientourbier Dec 18, 2021
887760e
CI: Comment tests 03 and 11
sebastientourbier Dec 18, 2021
59581b9
FIX: Use entrypoint script for coverage in singularity wrapper
sebastientourbier Dec 19, 2021
9e99779
FIX: Review output substitutions in anatomical pipeline
sebastientourbier Dec 19, 2021
dcd6f09
CI: Change roi_stats appropriately in the list of test outputs 02 and…
sebastientourbier Dec 20, 2021
33bf061
CI: Add renaming of log and coverage file for python docker wrapper
sebastientourbier Dec 20, 2021
b7b3f6e
FIX: Output of _compute_and_save_volumetry wrt roi_stats pre->postfix…
sebastientourbier Dec 20, 2021
075f78c
CI: Update list of outputs for parcellation tests 01 and 02 [skip ci]
sebastientourbier Dec 20, 2021
63b764a
CI: Re-enable difference check for test 01 [skip ci]
sebastientourbier Dec 20, 2021
f0e7c28
CI: Update list of outputs for test 10
sebastientourbier Dec 20, 2021
02bba93
CI: Specify explicitly the test files that persist in the workspace
sebastientourbier Dec 20, 2021
d66936d
DEL: Remove all code related to the old Lausanne2008 parcellation scheme
sebastientourbier Dec 20, 2021
7db6f4d
CI: Provide codacy reporter with the project token
sebastientourbier Dec 20, 2021
3710978
STY: Correct a number of issues detected by codacy linters [skip ci]
sebastientourbier Dec 20, 2021
cbb5cd2
CI: Use codacy reporter orbs to send report
sebastientourbier Dec 20, 2021
37c299e
STY: Correct a few code style issues with unused variables
sebastientourbier Dec 20, 2021
d0a77c7
CI: Remove problematic line
sebastientourbier Dec 20, 2021
ec5560a
CI: Update with new circleci image
sebastientourbier Dec 21, 2021
9b488ad
DOC: Update changes and add note on the removal of Lausanne2008 [skip…
sebastientourbier Dec 21, 2021
181fc50
DOC: Edit main description of CMP3 in README and docs/index.rst [skip…
sebastientourbier Dec 21, 2021
b25e0fa
DEL: Remove all data related to CMP2/Lausanne2008 in cmtklib/data and…
sebastientourbier Dec 21, 2021
aa7095e
DOC: Edit docs/changes.rst
sebastientourbier Dec 21, 2021
9d1adb6
CI: Specify codacy reporter version
sebastientourbier Dec 21, 2021
bdb00e0
DOC: Add README for Lausanne2018 parcellation [skip ci]
sebastientourbier Dec 21, 2021
4ecfefd
CI: Copy and edit command of codacy-reporter orbs directly in .circle…
sebastientourbier Dec 21, 2021
fd60b81
CI: Move name at the beginning of run for send_codacy_report
sebastientourbier Dec 21, 2021
3df237b
CI: Set --notrack in all tests
sebastientourbier Dec 21, 2021
06a0288
CI: Optimize usage of workspaces
sebastientourbier Dec 21, 2021
fc2008b
CI: Update old codacy_coverage_report with --commit-uuid and the imag…
sebastientourbier Dec 21, 2021
54bff9c
DOC: Fix a few issue with the rendering of the new changes [skip ci]
sebastientourbier Dec 21, 2021
ef68974
DOC: Update docs/changes.rst [skip ci]
sebastientourbier Dec 21, 2021
58b0aec
CI: Remove extra / in persist_to_workspace directive of test 01
sebastientourbier Dec 21, 2021
1a43664
DOC: Fix in docs/changes[skip ci]
sebastientourbier Dec 21, 2021
7914922
DOC: Add stats files to docs/outputs.rst [skip ci]
sebastientourbier Dec 21, 2021
2ce4b7e
DOC: Improve part about stats files in docs/outputs.rst [skip ci]
sebastientourbier Dec 21, 2021
2d196f4
DOC: Improvove rendering of outputs and fix a link in changes.rst [sk…
sebastientourbier Dec 21, 2021
b11ba89
DOC: Improve rendering of outputs and fix a link in changes.rst [skip…
sebastientourbier Dec 21, 2021
9bc4109
DOC: Improve description of outputs related to parcellation [skip ci]
sebastientourbier Dec 21, 2021
570e57d
CI: Update path to singularity image
sebastientourbier Dec 21, 2021
904934f
CI: Make test1_docker_parcellation/ds-sample/derivatives/nipype-* per…
sebastientourbier Dec 21, 2021
2ddac5f
CI: Unify workspace between jobs
sebastientourbier Dec 21, 2021
cb32db1
ENH: Add capability for custom segmentation and parcellation formatte…
sebastientourbier Dec 22, 2021
33d934b
CI: Fix to export COMMIT_UUID="${CIRCLE_SHA1}"
sebastientourbier Dec 22, 2021
e519239
CI: Remove test 03, shift test IDs and use test1 as custom input for …
sebastientourbier Dec 22, 2021
11db5bc
CI: Correct tag for deployment of singularity images and reorder depl…
sebastientourbier Dec 22, 2021
b9206ef
CI: Add checkout for codecov and update output list for tests 3 to 9
sebastientourbier Dec 22, 2021
67a08c7
CI: Fix path by adding .codecov.yml
sebastientourbier Dec 22, 2021
a9470b9
CI: Remove conf from codecov/upload commands
sebastientourbier Dec 22, 2021
fd989f7
CI: Update output lists of tests 3 and 9
sebastientourbier Dec 22, 2021
b3974b6
FIX: Do not write freesurfer subjects dir and id in the anatomical pi…
sebastientourbier Dec 23, 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
1,662 changes: 974 additions & 688 deletions .circleci/config.yml

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions .circleci/tests/configuration_files/ref_anatomical_config_1.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ subject = sub-01

[segmentation_stage]
ants_templatefile =
make_isotropic = True
make_isotropic = False
freesurfer_subject_id =
isotropic_interpolation = cubic
isotropic_vox_size = 1.0
Expand All @@ -25,19 +25,19 @@ number_of_threads = 2
[parcellation_stage]
parcellation_scheme = Lausanne2018
brain_file =
segment_hippocampal_subfields = True
segment_brainstem = True
segment_hippocampal_subfields = False
segment_brainstem = False
ants_precision_type = float
thalamic_nuclei_maps = app/connectomemapper3/cmtklib/data/segmentation/thalamus2018/Thalamus_Nuclei-HCP-4DSPAMs.nii.gz
include_thalamic_nuclei_parcellation = True
include_thalamic_nuclei_parcellation = False
template_thalamus = app/connectomemapper3/cmtklib/data/segmentation/thalamus2018/mni_icbm152_t1_tal_nlin_sym_09b_hires_1.nii.gz
pipeline_mode = Diffusion
atlas_nifti_file =
parcellation_scheme_editor = ['NativeFreesurfer', 'Lausanne2008', 'Lausanne2018', 'Custom']
parcellation_scheme_editor = ['NativeFreesurfer', 'Lausanne2018', 'Custom']
number_of_regions = 0
graphml_file =
atlas_info = {}
pre_custom = Lausanne2008
pre_custom = Lausanne2018
csf_file =

[Multi-processing]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ subject = sub-01

[segmentation_stage]
ants_templatefile =
make_isotropic = True
make_isotropic = False
freesurfer_subject_id =
isotropic_interpolation = cubic
isotropic_vox_size = 1.0
Expand All @@ -33,11 +33,11 @@ include_thalamic_nuclei_parcellation = True
template_thalamus = app/connectomemapper3/cmtklib/data/segmentation/thalamus2018/mni_icbm152_t1_tal_nlin_sym_09b_hires_1.nii.gz
pipeline_mode = Diffusion
atlas_nifti_file =
parcellation_scheme_editor = ['NativeFreesurfer', 'Lausanne2008', 'Lausanne2018', 'Custom']
parcellation_scheme_editor = ['NativeFreesurfer', 'Lausanne2018', 'Custom']
number_of_regions = 0
graphml_file =
atlas_info = {}
pre_custom = Lausanne2008
pre_custom = Lausanne2018
csf_file =

[Multi-processing]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ subject = sub-01

[segmentation_stage]
ants_templatefile =
make_isotropic = True
make_isotropic = False
freesurfer_subject_id =
isotropic_interpolation = cubic
isotropic_vox_size = 1.0
Expand All @@ -23,7 +23,7 @@ use_existing_freesurfer_data = False
number_of_threads = 2

[parcellation_stage]
parcellation_scheme = Lausanne2008
parcellation_scheme = Custom
brain_file =
segment_hippocampal_subfields = True
segment_brainstem = True
Expand All @@ -33,11 +33,11 @@ include_thalamic_nuclei_parcellation = True
template_thalamus = app/connectomemapper3/cmtklib/data/segmentation/thalamus2018/mni_icbm152_t1_tal_nlin_sym_09b_hires_1.nii.gz
pipeline_mode = Diffusion
atlas_nifti_file =
parcellation_scheme_editor = ['NativeFreesurfer', 'Lausanne2008', 'Lausanne2018', 'Custom']
parcellation_scheme_editor = ['NativeFreesurfer', 'Lausanne2018', 'Custom']
number_of_regions = 0
graphml_file =
atlas_info = {}
pre_custom = Lausanne2008
pre_custom = Lausanne2018
csf_file =

[Multi-processing]
Expand Down
45 changes: 45 additions & 0 deletions .circleci/tests/configuration_files/ref_anatomical_config_3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"Global": {
"process_type": "anatomical",
"subjects": [
"sub-01"
],
"subject": "sub-01",
"subject_session": "ses-01",
"version": "v3.0.0"
},
"segmentation_stage": {
"seg_tool": "Custom segmentation",
"custom_brainmask.toolbox_derivatives_dir": "cmp-custom",
"custom_brainmask.suffix": "mask",
"custom_brainmask.extension": "nii.gz",
"custom_brainmask.desc": "brain",
"custom_wm_mask.toolbox_derivatives_dir": "cmp-custom",
"custom_wm_mask.suffix": "dseg",
"custom_wm_mask.extension": "nii.gz",
"custom_wm_mask.label": "WM",
"custom_gm_mask.toolbox_derivatives_dir": "cmp-custom",
"custom_gm_mask.suffix": "dseg",
"custom_gm_mask.extension": "nii.gz",
"custom_gm_mask.label": "GM",
"custom_csf_mask.toolbox_derivatives_dir": "cmp-custom",
"custom_csf_mask.suffix": "dseg",
"custom_csf_mask.extension": "nii.gz",
"custom_csf_mask.label": "CSF",
"custom_aparcaseg.toolbox_derivatives_dir": "cmp-custom",
"custom_aparcaseg.suffix": "dseg",
"custom_aparcaseg.extension": "nii.gz",
"custom_aparcaseg.desc": "aparcaseg"
},
"parcellation_stage": {
"parcellation_scheme": "Custom",
"custom_parcellation.toolbox_derivatives_dir": "cmp-custom",
"custom_parcellation.suffix": "dseg",
"custom_parcellation.res": "scale1",
"custom_parcellation.extension": "nii.gz",
"custom_parcellation.atlas": "L2018"
},
"Multi-processing": {
"number_of_cores": 1
}
}
12 changes: 6 additions & 6 deletions .circleci/tests/configuration_files/ref_diffusion_config_1.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tracking_processing_tool_editor = ['Dipy', 'MRtrix', 'Custom']
tracking_processing_tool = MRtrix
dilation_kernel = Box
recon_processing_tool_editor = ['Dipy', 'Custom']
custom_track_file =
custom_track_file =
dilation_radius = 1
diffusion_model = Deterministic
dilate_rois = True
Expand Down Expand Up @@ -89,7 +89,7 @@ denoising_algo = MRtrix (MP-PCA)
bias_field_algo = ANTS N4
bias_field_correction = True
fast_use_priors = True
resampling = (2, 2, 2)
resampling = (3, 3, 3)
partial_volume_estimation = True
eddy_correction_algo = FSL eddy_correct
interpolation = interpolate
Expand All @@ -100,12 +100,12 @@ output_types = ['gPickle', 'mat', 'graphml']
compute_curvature = True
log_visualization = True
connectivity_metrics = ['Fiber number', 'Fiber length', 'Fiber density', 'Fiber proportion', 'Normalized fiber density', 'ADC', 'gFA']
subject =
subject =

[registration_stage]
pipeline = Diffusion
registration_mode = FSL
diffusion_imaging_model =
registration_mode = FSL (Linear)
diffusion_imaging_model =
use_float_precision = False
ants_interpolation = BSpline
ants_bspline_interpolation_parameters = (3,)
Expand All @@ -124,7 +124,7 @@ ants_nonlinear_gradient_step = 0.1
ants_nonlinear_cost = CC
ants_nonlinear_update_field_variance = 3.0
ants_nonlinear_total_field_variance = 0.0
flirt_args =
flirt_args =
uses_qform = True
dof = 6
fsl_cost = normmi
Expand Down
10 changes: 5 additions & 5 deletions .circleci/tests/configuration_files/ref_diffusion_config_2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tracking_processing_tool_editor = ['Dipy', 'MRtrix', 'Custom']
tracking_processing_tool = MRtrix
dilation_kernel = Box
recon_processing_tool_editor = ['Dipy', 'Custom']
custom_track_file =
custom_track_file =
dilation_radius = 1
diffusion_model = Probabilistic
dilate_rois = True
Expand Down Expand Up @@ -89,7 +89,7 @@ denoising_algo = MRtrix (MP-PCA)
bias_field_algo = ANTS N4
bias_field_correction = True
fast_use_priors = True
resampling = (2, 2, 2)
resampling = (3, 3, 3)
partial_volume_estimation = True
eddy_correction_algo = FSL eddy_correct
interpolation = interpolate
Expand All @@ -100,12 +100,12 @@ output_types = ['gPickle']
compute_curvature = False
log_visualization = True
connectivity_metrics = ['Fiber number', 'Fiber length', 'Fiber density', 'Fiber proportion', 'Normalized fiber density', 'ADC', 'gFA']
subject =
subject =

[registration_stage]
ants_convergence_winsize = 10
ants_nonlinear_update_field_variance = 3.0
flirt_args =
flirt_args =
contrast_type = dti
ants_upper_quantile = 0.995
use_float_precision = False
Expand All @@ -131,7 +131,7 @@ apply_to_eroded_csf = True
ants_perform_syn = True
ants_linear_sampling_strategy = Regular
dof = 6
diffusion_imaging_model =
diffusion_imaging_model =
fsl_cost = normmi
ants_nonlinear_gradient_step = 0.1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ denoising_algo = MRtrix (MP-PCA)
bias_field_algo = ANTS N4
bias_field_correction = True
fast_use_priors = True
resampling = (2, 2, 2)
resampling = (3, 3, 3)
partial_volume_estimation = True
eddy_correction_algo = FSL eddy_correct
interpolation = interpolate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ denoising_algo = MRtrix (MP-PCA)
bias_field_algo = ANTS N4
bias_field_correction = True
fast_use_priors = True
resampling = (2, 2, 2)
resampling = (3, 3, 3)
partial_volume_estimation = True
eddy_correction_algo = FSL eddy_correct
interpolation = interpolate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ eddy_correction_algo = FSL eddy_correct
eddy_correct_motion_correction = True
partial_volume_estimation = True
fast_use_priors = True
resampling = (1, 1, 1)
resampling = (3, 3, 3)
interpolation = interpolate

[registration_stage]
Expand Down
Loading