junifer 0.0.5.dev145__py3-none-any.whl → 0.0.5.dev152__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- junifer/_version.py +2 -2
- junifer/external/nilearn/junifer_nifti_spheres_masker.py +7 -7
- {junifer-0.0.5.dev145.dist-info → junifer-0.0.5.dev152.dist-info}/METADATA +15 -15
- {junifer-0.0.5.dev145.dist-info → junifer-0.0.5.dev152.dist-info}/RECORD +9 -9
- {junifer-0.0.5.dev145.dist-info → junifer-0.0.5.dev152.dist-info}/AUTHORS.rst +0 -0
- {junifer-0.0.5.dev145.dist-info → junifer-0.0.5.dev152.dist-info}/LICENSE.md +0 -0
- {junifer-0.0.5.dev145.dist-info → junifer-0.0.5.dev152.dist-info}/WHEEL +0 -0
- {junifer-0.0.5.dev145.dist-info → junifer-0.0.5.dev152.dist-info}/entry_points.txt +0 -0
- {junifer-0.0.5.dev145.dist-info → junifer-0.0.5.dev152.dist-info}/top_level.txt +0 -0
junifer/_version.py
CHANGED
@@ -12,5 +12,5 @@ __version__: str
|
|
12
12
|
__version_tuple__: VERSION_TUPLE
|
13
13
|
version_tuple: VERSION_TUPLE
|
14
14
|
|
15
|
-
__version__ = version = '0.0.5.
|
16
|
-
__version_tuple__ = version_tuple = (0, 0, 5, '
|
15
|
+
__version__ = version = '0.0.5.dev152'
|
16
|
+
__version_tuple__ = version_tuple = (0, 0, 5, 'dev152')
|
@@ -10,9 +10,9 @@ from nilearn import image, masking
|
|
10
10
|
from nilearn._utils.class_inspect import get_params
|
11
11
|
from nilearn._utils.niimg import img_data_dtype
|
12
12
|
from nilearn._utils.niimg_conversions import (
|
13
|
-
_safe_get_data,
|
14
13
|
check_niimg_3d,
|
15
14
|
check_niimg_4d,
|
15
|
+
safe_get_data,
|
16
16
|
)
|
17
17
|
from nilearn.maskers import NiftiSpheresMasker
|
18
18
|
from nilearn.maskers.base_masker import _filter_and_extract
|
@@ -104,7 +104,7 @@ def _apply_mask_and_get_affinity(
|
|
104
104
|
|
105
105
|
# Compute world coordinates of all in-mask voxels.
|
106
106
|
if niimg is None:
|
107
|
-
mask, affine = masking.
|
107
|
+
mask, affine = masking.load_mask_img(mask_img)
|
108
108
|
# Get coordinate for all voxels inside of mask
|
109
109
|
mask_coords = np.asarray(np.nonzero(mask)).T.tolist()
|
110
110
|
X = None
|
@@ -118,21 +118,21 @@ def _apply_mask_and_get_affinity(
|
|
118
118
|
target_shape=niimg.shape[:3],
|
119
119
|
interpolation="nearest",
|
120
120
|
)
|
121
|
-
mask, _ = masking.
|
121
|
+
mask, _ = masking.load_mask_img(mask_img)
|
122
122
|
mask_coords = list(zip(*np.where(mask != 0)))
|
123
123
|
|
124
|
-
X = masking.
|
124
|
+
X = masking.apply_mask_fmri(niimg, mask_img)
|
125
125
|
|
126
126
|
elif niimg is not None:
|
127
127
|
affine = niimg.affine
|
128
|
-
if np.isnan(np.sum(
|
128
|
+
if np.isnan(np.sum(safe_get_data(niimg))):
|
129
129
|
warn_with_log(
|
130
130
|
"The imgs you have fed into fit_transform() contains NaN "
|
131
131
|
"values which will be converted to zeroes."
|
132
132
|
)
|
133
|
-
X =
|
133
|
+
X = safe_get_data(niimg, True).reshape([-1, niimg.shape[3]]).T
|
134
134
|
else:
|
135
|
-
X =
|
135
|
+
X = safe_get_data(niimg).reshape([-1, niimg.shape[3]]).T
|
136
136
|
|
137
137
|
mask_coords = list(np.ndindex(niimg.shape[:3]))
|
138
138
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: junifer
|
3
|
-
Version: 0.0.5.
|
3
|
+
Version: 0.0.5.dev152
|
4
4
|
Summary: JUelich NeuroImaging FEature extractoR
|
5
5
|
Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
|
6
6
|
Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
|
@@ -29,13 +29,13 @@ Description-Content-Type: text/markdown
|
|
29
29
|
License-File: LICENSE.md
|
30
30
|
License-File: AUTHORS.rst
|
31
31
|
Requires-Dist: click <8.2,>=8.1.3
|
32
|
-
Requires-Dist: numpy <
|
33
|
-
Requires-Dist: scipy <=1.
|
34
|
-
Requires-Dist: datalad <0.
|
35
|
-
Requires-Dist: pandas <2.2
|
36
|
-
Requires-Dist: nibabel <5.
|
37
|
-
Requires-Dist: nilearn <=0.10.
|
38
|
-
Requires-Dist: sqlalchemy <=2.1.0,>=
|
32
|
+
Requires-Dist: numpy <2.0.0,>=1.24.0
|
33
|
+
Requires-Dist: scipy <=1.14.0,>=1.10.0
|
34
|
+
Requires-Dist: datalad <1.2.0,>=1.0.0
|
35
|
+
Requires-Dist: pandas <2.3.0,>=2.0.0
|
36
|
+
Requires-Dist: nibabel <5.3.0,>=5.2.0
|
37
|
+
Requires-Dist: nilearn <=0.10.4,>=0.10.3
|
38
|
+
Requires-Dist: sqlalchemy <=2.1.0,>=2.0.25
|
39
39
|
Requires-Dist: ruamel.yaml <0.18,>=0.17
|
40
40
|
Requires-Dist: h5py >=3.10
|
41
41
|
Requires-Dist: httpx[http2] ==0.26.0
|
@@ -53,14 +53,14 @@ Provides-Extra: dev
|
|
53
53
|
Requires-Dist: tox ; extra == 'dev'
|
54
54
|
Requires-Dist: pre-commit ; extra == 'dev'
|
55
55
|
Provides-Extra: docs
|
56
|
-
Requires-Dist: seaborn <0.
|
57
|
-
Requires-Dist: sphinx <7.
|
58
|
-
Requires-Dist: sphinx-gallery <0.
|
59
|
-
Requires-Dist: furo <
|
60
|
-
Requires-Dist: numpydoc <1.
|
61
|
-
Requires-Dist: julearn
|
56
|
+
Requires-Dist: seaborn <0.14.0,>=0.13.0 ; extra == 'docs'
|
57
|
+
Requires-Dist: sphinx <7.4.0,>=7.3.0 ; extra == 'docs'
|
58
|
+
Requires-Dist: sphinx-gallery <0.17.0,>=0.15.0 ; extra == 'docs'
|
59
|
+
Requires-Dist: furo <2024.6.0,>=2024.4.27 ; extra == 'docs'
|
60
|
+
Requires-Dist: numpydoc <1.8.0,>=1.6.0 ; extra == 'docs'
|
61
|
+
Requires-Dist: julearn ==0.3.3 ; extra == 'docs'
|
62
62
|
Requires-Dist: sphinx-copybutton <0.5.3,>=0.5.1 ; extra == 'docs'
|
63
|
-
Requires-Dist: towncrier <23.
|
63
|
+
Requires-Dist: towncrier <23.12.0,>=23.10.0 ; extra == 'docs'
|
64
64
|
Requires-Dist: sphinxcontrib-mermaid <0.10,>=0.8.1 ; extra == 'docs'
|
65
65
|
Provides-Extra: neurokit2
|
66
66
|
Requires-Dist: neurokit2 >=0.1.7 ; extra == 'neurokit2'
|
@@ -1,5 +1,5 @@
|
|
1
1
|
junifer/__init__.py,sha256=-T9XmiCCL0j3YLx-0Pph15sPfL5FlcBDscajjJ-V4sU,604
|
2
|
-
junifer/_version.py,sha256=
|
2
|
+
junifer/_version.py,sha256=YEKUDK7au3qW4ScztaosLY-XtlLg7Y8o26fPONml4S8,428
|
3
3
|
junifer/stats.py,sha256=BjQb2lfTGDP9l4UuQYmJFcJJNRfbJDGlNvC06SJaDDE,6237
|
4
4
|
junifer/api/__init__.py,sha256=lwyIF0hPc7fICuSoddJfay0LPqlTRxHJ_xbtizgFYZA,312
|
5
5
|
junifer/api/cli.py,sha256=53pews3mXkJ7DUDSkV51PbitYnuVAdQRkWG-gjO08Uw,16142
|
@@ -133,7 +133,7 @@ junifer/external/h5io/h5io/_version.py,sha256=mFY0GwwuN-a3M8w93_mskS6GZIvv9SNdjL
|
|
133
133
|
junifer/external/h5io/h5io/chunked_array.py,sha256=K1HWf7R2Jc7gCzBqAoBjx0ZnMmUhTe3iAO6RF6PdUO4,3338
|
134
134
|
junifer/external/h5io/h5io/chunked_list.py,sha256=1Y5BbuWzurJlEFQzJNuDdC3fNZ39ENEMba99X_4VeSM,1952
|
135
135
|
junifer/external/nilearn/__init__.py,sha256=a2Umwm3_WeqIC7DqPUmnUonYfX3LUdQ0ScDGZrNP6y4,180
|
136
|
-
junifer/external/nilearn/junifer_nifti_spheres_masker.py,sha256=
|
136
|
+
junifer/external/nilearn/junifer_nifti_spheres_masker.py,sha256=D3Sf78zJx-bArO2tbUbvjDdnOv2T7HCcNtvfcEL6lCU,16267
|
137
137
|
junifer/external/nilearn/tests/test_junifer_nifti_spheres_masker.py,sha256=qlMFWjo9y8mNLrdmN2qCEK6_nplASv2OlomSfTxDcuw,10370
|
138
138
|
junifer/markers/__init__.py,sha256=u4BFgS_3GXAwFN2HfqdAhlBkyenLw4IYlMlwXwnjkVQ,1235
|
139
139
|
junifer/markers/base.py,sha256=7_TLrz8dZH_3t1zgSSW2yCnDO2DGGAxFMZLHDkvJ_NM,6985
|
@@ -263,10 +263,10 @@ junifer/utils/logging.py,sha256=b02qVTdE-WNVo6uxCYdIHVmNfM7An0NdCJNq_2Gte8o,9355
|
|
263
263
|
junifer/utils/tests/test_fs.py,sha256=WQS7cKlKEZ742CIuiOYYpueeAhY9PqlastfDVpVVtvE,923
|
264
264
|
junifer/utils/tests/test_helpers.py,sha256=k5qqfxK8dFyuewTJyR1Qn6-nFaYNuVr0ysc18bfPjyU,929
|
265
265
|
junifer/utils/tests/test_logging.py,sha256=l8oo-AiBV7H6_IzlsNcj__cLeZBUvgIGoaMszD9VaJg,7754
|
266
|
-
junifer-0.0.5.
|
267
|
-
junifer-0.0.5.
|
268
|
-
junifer-0.0.5.
|
269
|
-
junifer-0.0.5.
|
270
|
-
junifer-0.0.5.
|
271
|
-
junifer-0.0.5.
|
272
|
-
junifer-0.0.5.
|
266
|
+
junifer-0.0.5.dev152.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
|
267
|
+
junifer-0.0.5.dev152.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
|
268
|
+
junifer-0.0.5.dev152.dist-info/METADATA,sha256=saDs-CMpk_pn8L2kDcN_1KLtE3-YB8CCB87K5XgUTik,8281
|
269
|
+
junifer-0.0.5.dev152.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
|
270
|
+
junifer-0.0.5.dev152.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
|
271
|
+
junifer-0.0.5.dev152.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
|
272
|
+
junifer-0.0.5.dev152.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|