Skip to content

Backport PR #13082 on branch maint/1.9 (BUG: Fix bug with Mesa 3D detection) #13084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larsoner merged 1 commit into from
Jan 24, 2025
Merged

Backport PR #13082 on branch maint/1.9 (BUG: Fix bug with Mesa 3D detection) #13084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/changes/devel/13082.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bug with automated Mesa 3D detection for proper 3D option setting on systems with software rendering, by `Eric Larson`_.
1 change: 1 addition & 0 deletions examples/preprocessing/movement_detection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
##############################################################################
# After checking the annotated movement artifacts, calculate the new transform
# and plot it:

new_dev_head_t = compute_average_dev_head_t(raw, head_pos)
raw.info["dev_head_t"] = new_dev_head_t
fig = mne.viz.plot_alignment(
Expand Down
1 change: 1 addition & 0 deletions mne/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ def pytest_configure(config):
# pandas
ignore:\n*Pyarrow will become a required dependency of pandas.*:DeprecationWarning
ignore:np\.find_common_type is deprecated.*:DeprecationWarning
ignore:Python binding for RankQuantileOptions.*:
# pyvista <-> NumPy 2.0
ignore:__array_wrap__ must accept context and return_scalar arguments.*:DeprecationWarning
# nibabel <-> NumPy 2.0
Expand Down
3 changes: 0 additions & 3 deletions mne/viz/_brain/tests/test_brain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,9 +773,6 @@ def test_single_hemi(hemi, renderer_interactive_pyvistaqt, brain_gc):
def test_brain_save_movie(tmp_path, renderer, brain_gc, interactive_state):
"""Test saving a movie of a Brain instance."""
imageio_ffmpeg = pytest.importorskip("imageio_ffmpeg")
# TODO: Figure out why this fails -- some imageio_ffmpeg error
if os.getenv("MNE_CI_KIND", "") == "conda" and platform.system() == "Linux":
pytest.skip("Test broken for unknown reason on conda linux")

brain = _create_testing_brain(
hemi="lh", time_viewer=False, cortex=["r", "b"]
Expand Down
2 changes: 1 addition & 1 deletion mne/viz/backends/_pyvista.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,7 +1346,7 @@ def _is_osmesa(plotter):
"surface rendering, consider upgrading to 18.3.6 or "
"later."
)
is_osmesa = "via llvmpipe" in gpu_info
is_osmesa = "llvmpipe" in gpu_info
return is_osmesa


Expand Down
Loading