Skip to content

Conversation

@psadil
Copy link
Contributor

@psadil psadil commented Oct 8, 2024

Changes proposed in this pull request

Closes #3373

Documentation that should be reviewed

@psadil
Copy link
Contributor Author

psadil commented Oct 8, 2024

FWIW, those failures look like scipy/scipy#21623 (comment)

@effigies
Copy link
Member

effigies commented Oct 8, 2024

Can you look up the latest FSL release and see if the other pins we have are up to date? I'd rather move them as a group, as I expect they are tested together.

@psadil psadil changed the title update fsl-topup for reported bug fixes ENH: update fsl packages for reported bug fixes Oct 8, 2024
@psadil
Copy link
Contributor Author

psadil commented Oct 8, 2024

$ mapfile -t pinned < <(grep fsl- env.yml)
version_pattern="[0-9]+\.[0-9]*"
for fsl_version in 6.0.7.8 6.0.7.9 6.0.7.10 6.0.7.11 6.0.7.12 6.0.7.13; do
    echo "checking FSL ${fsl_version}"
    manifest=$(curl https://git.fmrib.ox.ac.uk/fsl/conda/manifest/-/raw/"${fsl_version}"/fsl-release.yml\?ref_type\=tags 2>/dev/null)    
    for pin in "${pinned[@]}"; do
        package_name=$(echo "${pin}" | grep -oE "fsl-[a-z0-9]+" )
        if [[ $manifest =~ $package_name ]]; then
            manifest_version=$(echo "${manifest}" | grep -oE "${package_name} ${version_pattern}" | grep -oE "${version_pattern}")
            manifest_package_w_version=$(printf "%s=%s" "${package_name}" "${manifest_version}")
            if [[ ! "${pin}" =~ ${manifest_package_w_version} ]]; then
                printf "env has %s but FSL %s has %s\n" "${pin}" "${fsl_version}" "${manifest_package_w_version}"
            fi
        fi
    done
done

checking FSL 6.0.7.8
env has   - fsl-bet2=2111.4 but FSL 6.0.7.8 has fsl-bet2=2111.7
checking FSL 6.0.7.9
env has   - fsl-bet2=2111.4 but FSL 6.0.7.9 has fsl-bet2=2111.7
checking FSL 6.0.7.10
env has   - fsl-bet2=2111.4 but FSL 6.0.7.10 has fsl-bet2=2111.7
checking FSL 6.0.7.11
env has   - fsl-bet2=2111.4 but FSL 6.0.7.11 has fsl-bet2=2111.7
checking FSL 6.0.7.12
env has   - fsl-bet2=2111.4 but FSL 6.0.7.12 has fsl-bet2=2111.8
env has   - fsl-topup=2203.2 but FSL 6.0.7.12 has fsl-topup=2203.4
checking FSL 6.0.7.13
env has   - fsl-bet2=2111.4 but FSL 6.0.7.13 has fsl-bet2=2111.8
env has   - fsl-topup=2203.2 but FSL 6.0.7.13 has fsl-topup=2203.5

@codecov
Copy link

codecov bot commented Oct 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.70%. Comparing base (3e69454) to head (69038b7).
Report is 74 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3374   +/-   ##
=======================================
  Coverage   71.70%   71.70%           
=======================================
  Files          57       57           
  Lines        4259     4259           
  Branches      640      640           
=======================================
  Hits         3054     3054           
  Misses       1090     1090           
  Partials      115      115           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@mgxd mgxd left a comment

Choose a reason for hiding this comment

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

Retriggered the GHA jobs - this looks good to me

@effigies
Copy link
Member

effigies commented Oct 8, 2024

So if I understand correctly, this just means that these lines

https://github.com/nipreps/sdcflows/blob/656a51d4a734d2d8d66550e9e317386f677801a3/sdcflows/workflows/fit/pepolar.py#L144-L145

become unnecessary?

Given that we aren't patching the TOPUP interface directly, this seems fairly safe. @mgxd Were you going to test on a dataset that has an odd number of slices?

@mgxd
Copy link
Collaborator

mgxd commented Oct 8, 2024

No, I don't believe so, the fix for the odd # of slices has to do with a configuration option (--subsamp). We decided against changing the configuration based on even/odd slices (see nipreps/sdcflows#217)

From my understanding this fix will only be relevant/noticed on images with tight FOVs

@mgxd mgxd merged commit 6e6eadc into nipreps:master Oct 8, 2024
@psadil psadil deleted the enh/update-fsl-topup branch October 8, 2024 22:09
@effigies effigies added this to the 25.0.0 milestone Mar 19, 2025
effigies added a commit that referenced this pull request Mar 25, 2025
25.0.0 (March 25, 2025)

New feature release in the 25.0.x series.

This release substantially improves support for pre-computed derivatives.
Previous releases would miss some derivatives and rerun the computations.
Note that derivatives from previous versions will be accepted,
so it should not be necessary to recompute derivatives from previous versions.
The recommended command line is::

    fmriprep BIDS_DIR OUT_DIR participant --derivatives fmriprep=PRECOMP_DIR

Note that multiple derivatives can be specified, for example::

    fmriprep BIDS_DIR OUT_DIR participant \
      anat=PRECOMPUTED_ANATOMICAL_DIR \
      func=PRECOMPUTED_FUNCTIONAL_DIR

When the same file is found in multiple derivatives, the last one found takes precedence.

Additionally, `--force-*` flags have been consolidated into a single
`--force` flag that can take multiple, space-separated arguments.

Structural processing changes
-----------------------------
We now output white, pial and midthickness fsLR meshes on the subject surface.
Look for `sub-<subject>_hemi-<L|R>_space-fsLR_*_<surf>.surf.gii` files.

Brain extraction has been modified slightly to more closely match the
`antsBrainExtraction.sh` workflow distributed by ANTs.
The impact should be minimal, but in rare cases this fixes a crash.

Fieldmap processing changes
---------------------------
SyN-SDC fieldmap filtering is now single-level, following the improvements
for gradient-echo fieldmaps in 24.1.

Jacobian-weighting during fieldmap unwarping is now on by default *only*
for PEPolar fieldmaps.
To enable for other fieldmap types, use `--force fieldmap-jacobian`.

All merged pull requests
------------------------

* FIX: Detect and apply precomputed fieldmaps (#3439)
* FIX: Calculate bold mask and dummy scans in transform-only runs (#3428)
* FIX: Use consistent skull-stripping pre- and post- SDC (#3415)
* FIX: Use removeprefix instead of lstrip or ternary operator (#3409)
* FIX: Listify sessions when generating reports (#3408)
* FIX: Ensure fieldmap is resampled correctly in report (#3387)
* FIX: Stop excluding FS minc_modify_header used during fallback registration (#3372)
* FIX: Repair and test query for precalculated baseline/boldref files (#3370)
* FIX: Repair search for precomputed transforms (#3369)
* ENH: Enable Jacobians only for PEPOLAR by default, allow forcing (#3443)
* ENH: Create `--force` flag that accepts a list, replacing individual `--force-*` flags (#3442)
* ENH: Output fsLR meshes on subject surfaces (#3411)
* ENH: Flexibilize "sophisticated" pepolar to allow monomodal execution (#3393)
* ENH: Update FSL packages for reported bug fixes (#3374)
* RF: Calculate RMSD from motion transforms (#3427)
* RF: Reconstruct motion confounds from minimal derivatives (#3424)
* RF: Replace deprecated pkgutil.find_loader (#3384)
* RF: Upgrade nitransforms and remove workarounds (#3378)
* DOC: Fix xfm extension in the outputs docs (#3435)
* DOC: Mention fMRIPost-AROMA in parser documentation (#3356)
* MNT: Remove CLI flags with expired deprecation periods (#3445)
* MNT: Update pinned environment (#3440)
* MNT: Bump pins, update RTD config (#3425)
* MNT: Declare linux/amd64 platform during Docker build (#3422)
* MNT: Bump astral-sh/setup-uv from 4 to 5 (#3417)
* MNT: Test support for Python 3.13 (#3416)
* MNT: Install Workbench CLI via conda (#3410)
* MNT: Update minimum dependencies, test with tox-uv (#3412)
* MNT: Install c3d through conda (#3382)
* CI: Fetch tags and 200 commits to support describe (#3381)
* CI: Build docker images in GHA, store cache inline and push to GHCR (#3380)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update fsl-topup from 2203.2 -> 2203.5?

3 participants