NiMARE icon indicating copy to clipboard operation
NiMARE copied to clipboard

[wip, enh] add cbmr

Open yifan0330 opened this issue 3 years ago • 4 comments

Closes #700 .

Changes proposed in this pull request:

yifan0330 avatar Jun 16 '22 16:06 yifan0330

Thanks for opening this pull request! We have detected this is the first time you have contributed to NiMARE. Please check out our contributing guidelines. We invite you to list yourself as a NiMARE contributor, so if your name is not already mentioned, please modify the .zenodo.json file with your data right above Angie's entry. Example:

{
  "name": "Contributor, New",
  "affiliation": "Department of Psychology, Some University",
  "orcid": "<your id>"
},
{
  "name": "Laird, Angela R.",
  "affiliation": "Florida International University",
  "orcid": "0000-0003-3379-8744"
},

Of course, if you want to opt out this time there is no problem at all with adding your name later. You will be always welcome to add it in the future whenever you feel it should be listed.

welcome[bot] avatar Jun 16 '22 16:06 welcome[bot]

Codecov Report

Patch coverage: 82.87% and project coverage change: -0.89 :warning:

Comparison is base (77f9eee) 88.65% compared to head (4bbe51e) 87.77%.

:exclamation: Current head 4bbe51e differs from pull request most recent head 8e34a5c. Consider uploading reports for the commit 8e34a5c to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #721      +/-   ##
==========================================
- Coverage   88.65%   87.77%   -0.89%     
==========================================
  Files          41       43       +2     
  Lines        4752     5620     +868     
==========================================
+ Hits         4213     4933     +720     
- Misses        539      687     +148     
Impacted Files Coverage Δ
nimare/meta/cbmr.py 76.45% <76.45%> (ø)
nimare/meta/models.py 85.28% <85.28%> (ø)
nimare/transforms.py 76.66% <91.66%> (+1.30%) :arrow_up:
nimare/utils.py 94.19% <94.64%> (+0.05%) :arrow_up:
nimare/correct.py 94.95% <95.45%> (+0.36%) :arrow_up:
nimare/results.py 88.15% <100.00%> (+0.15%) :arrow_up:

... and 2 files with indirect coverage changes

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Do you have feedback about the report comment? Let us know in this issue.

codecov[bot] avatar Jun 16 '22 17:06 codecov[bot]

@yifan0330 do you want to refactor CBMR here or in your CBMR repo? I have a few ideas about dependencies and documentation.

tsalo avatar Jun 17 '22 15:06 tsalo

@yifan0330 do you want to refactor CBMR here or in your CBMR repo? I have a few ideas about dependencies and documentation.

I guess it would be easier and more compatible if I refactor CBMR here while trying to understand the infrastructure of nimare at the same time. The implementation in my CBMR repo hasn't been formalised as it's written for running the experiments.

yifan0330 avatar Jun 18 '22 12:06 yifan0330

It's going to be a pain to get this to work with python 3.6 (maybe not possible without a refactor of what libraries we are using), I could see the following options:

  • drop 3.6 support with this pull request
  • raise an error if someone tries to import a class/function from a file that calls functorch/torch (making cbmr non-functional for python 3.6
  • try to hack together some solution that allows functorch and torch to work together in python 3.6

jdkent avatar Mar 28 '23 14:03 jdkent

readthedocs build error is unrelated to this pull request, and is related to readthedocs build process #798, will see if a fix gets merged in later today to rebuild the documentation here.

jdkent avatar May 03 '23 16:05 jdkent

LGTM, thanks for all your hard work on this @yifan0330! this is an excellent contribution!

jdkent avatar May 08 '23 14:05 jdkent

Also thanks to @tsalo and @adelavega for testing and offering reviews and having heated (but friendly) conversations about code structure.

jdkent avatar May 08 '23 14:05 jdkent

LGTM, thanks for all your hard work on this @yifan0330! this is an excellent contribution!

Thanks for all your help and supervision @jdkent !! It has been a great learning experience for me :)

yifan0330 avatar May 08 '23 15:05 yifan0330

Also thanks to @tsalo and @adelavega for testing and offering reviews and having heated (but friendly) conversations about code structure.

Thanks to @tsalo and @adelavega for useful suggestions and feedbacks!!

yifan0330 avatar May 08 '23 15:05 yifan0330