Skip to content

Check for all different packages of opencv #2901

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
patrickvonplaten merged 3 commits into from
Mar 31, 2023
Merged

Check for all different packages of opencv #2901

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a08098
Check for all different packages of opencv
wfng92 Mar 30, 2023
b26b5d0
Merge pull request #1 from wfng92/wfng92-opencv-import
wfng92 Mar 30, 2023
978755c
Merge branch 'main' into main
patrickvonplaten Mar 31, 2023
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
19 changes: 16 additions & 3 deletions src/diffusers/utils/import_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,22 @@
# (sayakpaul): importlib.util.find_spec("opencv-python") returns None even when it's installed.
# _opencv_available = importlib.util.find_spec("opencv-python") is not None
try:
_opencv_version = importlib_metadata.version("opencv-python")
_opencv_available = True
logger.debug(f"Successfully imported cv2 version {_opencv_version}")
candidates = (
"opencv-python",
"opencv-contrib-python",
"opencv-python-headless",
"opencv-contrib-python-headless",
)
_opencv_version = None
for pkg in candidates:
try:
_opencv_version = importlib_metadata.version(pkg)
break
except importlib_metadata.PackageNotFoundError:
pass
_opencv_available = _opencv_version is not None
if _opencv_available:
logger.debug(f"Successfully imported cv2 version {_opencv_version}")
except importlib_metadata.PackageNotFoundError:
_opencv_available = False

Expand Down