Skip to content

Commit

Permalink
Merge pull request #2305 from evmckinney9/evmckinney9-issue2300
Browse files Browse the repository at this point in the history
fix: import array from numpy instead of scipy
  • Loading branch information
Ericgig committed Jan 24, 2024
2 parents f514961 + ef4e440 commit 1692198
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions doc/changes/2305.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove use of scipy.<numpy-func> in parallel.py, incompatible with scipy==1.12
2 changes: 1 addition & 1 deletion qutip/parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""
__all__ = ['parfor', 'parallel_map', 'serial_map']

from scipy import array
from numpy import array
import multiprocessing
from functools import partial
import os
Expand Down

0 comments on commit 1692198

Please sign in to comment.