FIX: Simplify

Author: larsoner

mne_bids/path.py

@@ -2544,6 +2544,7 @@ def _return_root_paths(root, datatype=None, ignore_json=True, ignore_nosub=False
 
     if datatype is None and not ignore_nosub:
         search_str = "*.*"
+        paths = root.rglob(search_str)
     else:
         if datatype is not None:
             datatype = _ensure_tuple(datatype)
@@ -2555,8 +2556,11 @@ def _return_root_paths(root, datatype=None, ignore_json=True, ignore_nosub=False
         # such that we truely only look in 'sub'-folders:
         if ignore_nosub:
             search_str = f"sub-*/{search_str}"
-
-    paths = root.rglob(search_str)
+        # TODO: Why is this not equivalent to list(root.rglob(search_str)) ?
+        paths = [
+            Path(root, fn)
+            for fn in glob.iglob(search_str, root_dir=root, recursive=True)
+        ]
 
     # Only keep files (not directories), ...
     # and omit the JSON sidecars if `ignore_json` is True.

mne_bids/tests/test_path.py

@@ -12,7 +12,6 @@
 from pathlib import Path
 
 import mne
-import numpy as np
 import pytest
 from mne.datasets import testing
 from mne.io import anonymize_info
@@ -221,50 +220,36 @@ def test_path_benchmark(tmp_path_factory):
 
     # apply nosub on find_matching_matchs with root level bids directory should
     # yield a performance boost of order of length from bids_subdirectories.
-    timed_all, timed_ignored_nosub = (
-        timeit.timeit(
-            "mne_bids.find_matching_paths(tmp_bids_root)",
-            setup="import mne_bids\ntmp_bids_root=r'" + str(tmp_bids_root) + "'",
-            number=1,
-        ),
-        timeit.timeit(
-            "mne_bids.find_matching_paths(tmp_bids_root, ignore_nosub=True)",
-            setup="import mne_bids\ntmp_bids_root=r'" + str(tmp_bids_root) + "'",
-            number=10,
-        )
-        / 10,
+    setup = "import mne_bids\ntmp_bids_root=r'" + str(tmp_bids_root) + "'"
+    timed_all = timeit.timeit(
+        "mne_bids.find_matching_paths(tmp_bids_root)", setup=setup, number=1
     )
-
-    assert (
-        timed_all / (10 * np.maximum(1, np.floor(len(bids_subdirectories) / 10)))
-        # while this should be of same order, lets give it some space by a factor of 2
-        > 0.5 * timed_ignored_nosub
+    timed_ignored_nosub = timeit.timeit(
+        "mne_bids.find_matching_paths(tmp_bids_root, ignore_nosub=True)",
+        setup=setup,
+        number=1,
     )
 
+    # while this should be of same order, lets give it some space by a factor of 2
+    target = 2 * timed_all / len(bids_subdirectories)
+    assert timed_ignored_nosub < target
+
     # apply include_match on get_entity_vals with root level bids directory should
     # yield a performance boost of order of length from bids_subdirectories.
-    timed_entity, timed_entity_match = (
-        timeit.timeit(
-            "mne_bids.get_entity_vals(tmp_bids_root, 'session')",
-            setup="import mne_bids\ntmp_bids_root=r'" + str(tmp_bids_root) + "'",
-            number=1,
-        ),
-        timeit.timeit(
-            "mne_bids.get_entity_vals(tmp_bids_root, 'session', include_match='sub-*/')",  # noqa: E501
-            setup="import mne_bids\ntmp_bids_root=r'" + str(tmp_bids_root) + "'",
-            number=10,
-        )
-        / 10,
+    timed_entity = timeit.timeit(
+        "mne_bids.get_entity_vals(tmp_bids_root, 'session')",
+        setup=setup,
+        number=1,
     )
-
-    assert (
-        timed_entity / (10 * np.maximum(1, np.floor(len(bids_subdirectories) / 10)))
-        # while this should be of same order, lets give it some space by a factor of 2
-        > 0.5 * timed_entity_match
+    timed_entity_match = timeit.timeit(
+        "mne_bids.get_entity_vals(tmp_bids_root, 'session', include_match='sub-*/')",  # noqa: E501
+        setup=setup,
+        number=1,
     )
 
-    # Clean up
-    shutil.rmtree(tmp_bids_root)
+    # while this should be of same order, lets give it some space by a factor of 2
+    target = 2 * timed_entity / len(bids_subdirectories)
+    assert timed_entity_match < target
 
 
 def test_search_folder_for_text(capsys):