Skip to content

MAINT: Restore OMP_NUM_THREADS=2 on Windows#12520

Merged
larsoner merged 10 commits intomne-tools:mainfrom
larsoner:pre
Mar 29, 2024
Merged

MAINT: Restore OMP_NUM_THREADS=2 on Windows#12520
larsoner merged 10 commits intomne-tools:mainfrom
larsoner:pre

Conversation

@larsoner
Copy link
Copy Markdown
Member

@larsoner larsoner commented Mar 27, 2024

In theory this should work now that scikit-learn/scikit-learn#28692 has landed and new wheels presumably uploaded

Closes #12521

@larsoner larsoner requested a review from drammock as a code owner March 27, 2024 16:22
@larsoner larsoner enabled auto-merge (squash) March 27, 2024 16:22
@larsoner
Copy link
Copy Markdown
Member Author

This PR now also attempts to bump a few CIs to 3.12 from 3.11. I think in theory it should work

* upstream/main:
  Improve consistency of sensor types in code and documentation (mne-tools#12509)
@larsoner larsoner removed request for cbrnr and sappelhoff March 29, 2024 14:36
@larsoner larsoner changed the title MAINT: Restore 2 jobs on Windows MAINT: Restore OMP_NUM_THREADS=2 on Windows Mar 29, 2024
@larsoner larsoner merged commit 58a02c2 into mne-tools:main Mar 29, 2024
@larsoner larsoner deleted the pre branch March 29, 2024 19:12
larsoner added a commit to larsoner/mne-python that referenced this pull request Apr 15, 2024
* upstream/main: (50 commits)
  ENH: Improve OPM auditory dataset and example (mne-tools#12539)
  MAINT: Bump to latest pydata-sphinx-theme (mne-tools#12228)
  MRG: Simplify manual installation instructions a little by dropping explicit mention of (lib)mamba (mne-tools#12362)
  fix PSD weights handling when bad annotations present (mne-tools#12538)
  Fix phase loading (mne-tools#12537)
  align FFT windows to good data spans in psd_array_welch (mne-tools#12536)
  explicitly disallow multitaper in presence of bad annotations (mne-tools#12535)
  MAINT: Clean up PyVista contexts (mne-tools#12533)
  MAINT: Complete API change of ordered (mne-tools#12534)
  MAINT: Reinstall statsmodels and improve logging (mne-tools#12532)
  MAINT: Remove scipy.signal.morlet2 (mne-tools#12531)
  Update README badge links (mne-tools#12529)
  BUG: Fix bug with reading his_id from snirf (mne-tools#12526)
  [pre-commit.ci] pre-commit autoupdate (mne-tools#12524)
  Fix file format check in _check_eeglab_fname function (mne-tools#12523)
  MAINT: Reenable picard in pre testing (mne-tools#12525)
  MAINT: Bump to large resource class (mne-tools#12522)
  MAINT: Restore 2 jobs on Windows (mne-tools#12520)
  Add exclude_after_unique option to mne.io.read_raw_edf/read_raw_edf to search for exclude channels after making channel names unique (mne-tools#12518)
  Improve consistency of sensor types in code and documentation (mne-tools#12509)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

BUG: EDF export failing on latest edfio

1 participant