diff --git a/doc/conf.py b/doc/conf.py index 3122438..2908fc9 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -12,7 +12,6 @@ import sys from pathlib import Path - import fmralign # If extensions (or modules to document with autodoc) are in another diff --git a/fmralign/tests/test_sparse_pairwise_alignment.py b/fmralign/tests/test_sparse_pairwise_alignment.py index 2250276..5d74be7 100644 --- a/fmralign/tests/test_sparse_pairwise_alignment.py +++ b/fmralign/tests/test_sparse_pairwise_alignment.py @@ -1,4 +1,6 @@ import numpy as np +import pytest +import torch from nibabel.nifti1 import Nifti1Image from nilearn.surface import SurfaceImage @@ -7,8 +9,6 @@ random_niimg, surf_img, ) -import torch -import pytest devices = [torch.device("cpu")] if torch.cuda.is_available(): diff --git a/fmralign/tests/test_sparse_template_alignment.py b/fmralign/tests/test_sparse_template_alignment.py index f53887b..8f61542 100644 --- a/fmralign/tests/test_sparse_template_alignment.py +++ b/fmralign/tests/test_sparse_template_alignment.py @@ -1,16 +1,18 @@ -import torch +from itertools import product + import numpy as np import pytest +import torch +from nibabel.nifti1 import Nifti1Image + +from fmralign.alignment_methods import SparseUOT from fmralign.sparse_template_alignment import ( - _rescaled_euclidean_mean_torch, + SparseTemplateAlignment, _align_images_to_template, _fit_sparse_template, + _rescaled_euclidean_mean_torch, ) -from nibabel.nifti1 import Nifti1Image -from fmralign.tests.utils import sample_subjects_data, random_niimg -from itertools import product -from fmralign.alignment_methods import SparseUOT -from fmralign.sparse_template_alignment import SparseTemplateAlignment +from fmralign.tests.utils import random_niimg, sample_subjects_data devices = [torch.device("cpu")] if torch.cuda.is_available(): diff --git a/fmralign/tests/test_utils.py b/fmralign/tests/test_utils.py index 457d2ad..b07f430 100644 --- a/fmralign/tests/test_utils.py +++ b/fmralign/tests/test_utils.py @@ -2,9 +2,10 @@ import nibabel as nib import numpy as np import pytest +import torch from nilearn.maskers import NiftiMasker from numpy.testing import assert_array_almost_equal, assert_array_equal -import torch + from fmralign._utils import ( ParceledData, _make_parcellation,