Skip to content

Updated submodules to the release 4.5.4 and added python loader support#563

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
asenyaev merged 3 commits into from
Oct 20, 2021
Merged

Updated submodules to the release 4.5.4 and added python loader support #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a1f61b
Updated submodules to the release 4.5.4, added python loader support,…
asenyaev Oct 15, 2021
545fe24
Added comments for new changes
asenyaev Oct 15, 2021
851182f
Removed useless lines and added replacing lines into init file
asenyaev Oct 18, 2021
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
31 changes: 0 additions & 31 deletions cv2/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
import importlib
import os
import sys

from .cv2 import *
from .data import *

# wildcard import above does not import "private" variables like __version__
# this makes them available
globals().update(importlib.import_module("cv2.cv2").__dict__)

ci_and_not_headless = False

try:
from .version import ci_build, headless

ci_and_not_headless = ci_build and not headless
except:
pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
)

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
os.environ["QT_QPA_FONTDIR"] = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
)
2 changes: 1 addition & 1 deletion opencv
Open in desktop
Submodule opencv updated 449 files
2 changes: 1 addition & 1 deletion opencv_contrib
Open in desktop
Submodule opencv_contrib updated 123 files
2 changes: 1 addition & 1 deletion opencv_extra
Open in desktop
Submodule opencv_extra updated 232 files
19 changes: 13 additions & 6 deletions patches/patchQtPlugins
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,16 +3,23 @@ index 4c0b3880fc..dffa0a4caa 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -1187,6 +1187,13 @@ if(WITH_QT OR HAVE_QT)
if(HAVE_QT5)
status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
if(HAVE_QT)
status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
+ if(APPLE)
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
+ endif()
+ if(UNIX AND NOT APPLE)
+ install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
+ endif()
elseif(HAVE_QT)
status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
if(HAVE_QT_OPENGL)
if(Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES)
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES} ${Qt${QT_VERSION_MAJOR}OpenGL_VERSION_STRING})" ELSE NO)
else()
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
endif()
else()
status(" QT OpenGL support:" "NO")
endif()
else()
status(" QT:" "NO")
24 changes: 24 additions & 0 deletions scripts/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
PYTHON_EXTENSIONS_PATHS = [
LOADER_DIR
] + PYTHON_EXTENSIONS_PATHS
Comment on lines +1 to +3

@cclausscclaussNov 26, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are undefined names in Python code.
$ flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics

./scripts/__init__.py:2:5: F821 undefined name 'LOADER_DIR'
LOADER_DIR
^
./scripts/__init__.py:3:5: F821 undefined name 'PYTHON_EXTENSIONS_PATHS'
] + PYTHON_EXTENSIONS_PATHS
^


ci_and_not_headless = False

try:
from .version import ci_build, headless

ci_and_not_headless = ci_build and not headless

@alalekalalekOct 15, 2021•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How I can verify that case that locally?

Update: Tried CI_BUILD=1, but it fails on missing files. So it is not easy.

@asenyaevasenyaevOct 18, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to build with CI_BUILD=1 and also define ENABLE_HEADLESS=0, ENABLE_CONTRIB=0 and SDIST=0.

After the build you can reproduce these lines in the python interpreter. What I've done:

from cv2.version import ci_build, headless
ci_and_not_headless = ci_build and not headless
print (ci_and_not_headless)

In addition, to understand ci_and_not_headless working or not you can print QT_QPA_FONTDIR environment variable. Example:

import cv2, os
print(os.environ["QT_QPA_FONTDIR"])

except:
pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
)

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
os.environ["QT_QPA_FONTDIR"] = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
)
33 changes: 29 additions & 4 deletions setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,12 +108,32 @@ def main():
# Naming conventions vary so widely between versions and OSes
# had to give up on checking them.
[
"python/cv2[^/]*%(ext)s"
% {"ext": re.escape(sysconfig.get_config_var("EXT_SUFFIX"))}
"python/cv2/python-%s.%s/cv2[^/]*%s"
% (sys.version_info[0], sys.version_info[1], re.escape(sysconfig.get_config_var("EXT_SUFFIX")))
]
+
[
r"python/cv2/__init__.py"
]
+
[
r"python/cv2/.*config.*.py"
],
"cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
],
"cv2.gapi": [
"python/cv2" + r"/gapi/.*\.py"
],
"cv2.mat_wrapper": [
"python/cv2" + r"/mat_wrapper/.*\.py"
],
"cv2.misc": [
"python/cv2" + r"/misc/.*\.py"
],
"cv2.utils": [
"python/cv2" + r"/utils/.*\.py"
],
Comment on lines +125 to +136

@alalekalalekOct 15, 2021•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we copy all artifacts of "cmake install" automatically "as is"?

@alalekalalekOct 16, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is packages = ["cv2", "cv2.data"] line in this file. Perhaps it should be updated somehow (can we remove cv2.data?)

@asenyaevasenyaevOct 18, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we copy all artifacts of "cmake install" as is, then there will be several folders and files which we do not want to have in a package. We control what should be in a package using rearrange_cmake_output_data in setup.py.

@asenyaevasenyaevOct 18, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about cv2.data we have to keep it if we want to use haarcascades, because there are no __init__.py file in "cmake install" and we defining it here. However, we can write into a file after building. What do you think about anything of it?

@sergregorysergregoryOct 20, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we could specify haarcascades as package data, not a separate package. But it requires checking the code and import and so on, I'd delay it to the future.

}

# Files in sourcetree outside package dir that should be copied to package.
Expand All@@ -137,8 +157,6 @@ def main():
"-DBUILD_opencv_python2=OFF",
# Disable the Java build by default as it is not needed
"-DBUILD_opencv_java=%s" % build_java,
# When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
"-DOPENCV_SKIP_PYTHON_LOADER=ON",
# Relative dir to install the built module to in the build tree.
# The default is generated from sysconfig, we'd rather have a constant for simplicity
"-DOPENCV_PYTHON3_INSTALL_PATH=python",
Expand DownExpand Up@@ -358,6 +376,13 @@ def _classify_installed_files_override(

print("Copying files from CMake output")

# add lines from the old __init__.py file to the config file
with open('scripts/__init__.py', 'r') as custom_init:
custom_init_data = custom_init.read()
with open('%spython/cv2/config-%s.%s.py'
% (cmake_install_dir, sys.version_info[0], sys.version_info[1]), 'w') as opencv_init_config:
opencv_init_config.write(custom_init_data)

for package_name, relpaths_re in cls.package_paths_re.items():
package_dest_reldir = package_name.replace(".", os.path.sep)
for relpath_re in relpaths_re:
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Updated submodules to the release 4.5.4 and added python loader support by asenyaev · Pull Request #563 · opencv/opencv-python · GitHub
Skip to content
Updated submodules to the release 4.5.4 and added python loader support#563

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

asenyaev
merged 3 commits into

from

Oct 20, 2021
 Merged


Updated submodules to the release 4.5.4 and added python loader support
#563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6a1f61b

Updated submodules to the release 4.5.4, added python loader support,…


asenyaev Oct 15, 2021
545fe24

Added comments for new changes


asenyaev Oct 15, 2021
851182f

Removed useless lines and added replacing lines into init file


asenyaev Oct 18, 2021

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


31 changes: 0 additions & 31 deletions
cv2/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
import importlib
import os
import sys

from .cv2 import *
from .data import *

# wildcard import above does not import "private" variables like __version__
# this makes them available
globals().update(importlib.import_module("cv2.cv2").__dict__)

ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

2 changes: 1 addition & 1 deletion
opencv

Open in desktop


Submodule opencv
updated

449 files


2 changes: 1 addition & 1 deletion
opencv_contrib

Open in desktop


Submodule opencv_contrib
updated

123 files


2 changes: 1 addition & 1 deletion
opencv_extra

Open in desktop


Submodule opencv_extra
updated

232 files


19 changes: 13 additions & 6 deletions
patches/patchQtPlugins

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,16 +3,23 @@ index 4c0b3880fc..dffa0a4caa 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -1187,6 +1187,13 @@ if(WITH_QT OR HAVE_QT)
 if(HAVE_QT5)
 status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
 if(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
+ if(APPLE)
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
+ endif()
+ if(UNIX AND NOT APPLE)
+ install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
+ endif()
 elseif(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 if(HAVE_QT_OPENGL)
 if(Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES)
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES} ${Qt${QT_VERSION_MAJOR}OpenGL_VERSION_STRING})" ELSE NO)
 else()
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 endif()
 else()
 status(" QT OpenGL support:" "NO")
 endif()
 else()
 status(" QT:" "NO")

24 changes: 24 additions & 0 deletions
scripts/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
PYTHON_EXTENSIONS_PATHS = [
 LOADER_DIR
] + PYTHON_EXTENSIONS_PATHS

Comment on lines

+1
 to 
+3

@cclausscclaussNov 26, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are undefined names in Python code.

$ flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
./scripts/__init__.py:2:5: F821 undefined name 'LOADER_DIR'
LOADER_DIR
^
./scripts/__init__.py:3:5: F821 undefined name 'PYTHON_EXTENSIONS_PATHS'
] + PYTHON_EXTENSIONS_PATHS
^


ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How I can verify that case that locally?
Update: Tried CI_BUILD=1, but it fails on missing files. So it is not easy.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to build with CI_BUILD=1 and also define ENABLE_HEADLESS=0, ENABLE_CONTRIB=0 and SDIST=0.
After the build you can reproduce these lines in the python interpreter. What I've done:
from cv2.version import ci_build, headless
ci_and_not_headless = ci_build and not headless
print (ci_and_not_headless)

In addition, to understand ci_and_not_headless working or not you can print QT_QPA_FONTDIR environment variable. Example:
import cv2, os
print(os.environ["QT_QPA_FONTDIR"])

except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

33 changes: 29 additions & 4 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,12 +108,32 @@ def main():
 # Naming conventions vary so widely between versions and OSes
 # had to give up on checking them.
 [
 "python/cv2[^/]*%(ext)s"
 % {"ext": re.escape(sysconfig.get_config_var("EXT_SUFFIX"))}
 "python/cv2/python-%s.%s/cv2[^/]*%s"
 % (sys.version_info[0], sys.version_info[1], re.escape(sysconfig.get_config_var("EXT_SUFFIX")))
 ]
 +
 [
 r"python/cv2/__init__.py"
 ]
 +
 [
 r"python/cv2/.*config.*.py"
 ],
 "cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
 ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
 ],
 "cv2.gapi": [
 "python/cv2" + r"/gapi/.*\.py"
 ],
 "cv2.mat_wrapper": [
 "python/cv2" + r"/mat_wrapper/.*\.py"
 ],
 "cv2.misc": [
 "python/cv2" + r"/misc/.*\.py"
 ],
 "cv2.utils": [
 "python/cv2" + r"/utils/.*\.py"
 ],

Comment on lines

+125
 to 
+136

@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we copy all artifacts of "cmake install" automatically "as is"?
@alalekalalekOct 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is packages = ["cv2", "cv2.data"] line in this file. Perhaps it should be updated somehow (can we remove cv2.data?)
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we copy all artifacts of "cmake install" as is, then there will be several folders and files which we do not want to have in a package. We control what should be in a package using rearrange_cmake_output_data in setup.py.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about cv2.data we have to keep it if we want to use haarcascades, because there are no __init__.py file in "cmake install" and we defining it here. However, we can write into a file after building. What do you think about anything of it?
@sergregorysergregoryOct 20, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we could specify haarcascades as package data, not a separate package. But it requires checking the code and import and so on, I'd delay it to the future.
 }

 # Files in sourcetree outside package dir that should be copied to package.
Expand All@@ -137,8 +157,6 @@ def main():
 "-DBUILD_opencv_python2=OFF",
 # Disable the Java build by default as it is not needed
 "-DBUILD_opencv_java=%s" % build_java,
 # When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
 "-DOPENCV_SKIP_PYTHON_LOADER=ON",
 # Relative dir to install the built module to in the build tree.
 # The default is generated from sysconfig, we'd rather have a constant for simplicity
 "-DOPENCV_PYTHON3_INSTALL_PATH=python",
Expand DownExpand Up@@ -358,6 +376,13 @@ def _classify_installed_files_override(

 print("Copying files from CMake output")

 # add lines from the old __init__.py file to the config file
 with open('scripts/__init__.py', 'r') as custom_init:
 custom_init_data = custom_init.read()
 with open('%spython/cv2/config-%s.%s.py'
 % (cmake_install_dir, sys.version_info[0], sys.version_info[1]), 'w') as opencv_init_config:
 opencv_init_config.write(custom_init_data)

 for package_name, relpaths_re in cls.package_paths_re.items():
 package_dest_reldir = package_name.replace(".", os.path.sep)
 for relpath_re in relpaths_re:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Updated submodules to the release 4.5.4 and added python loader support by asenyaev · Pull Request #563 · opencv/opencv-python · GitHub
Skip to content
Updated submodules to the release 4.5.4 and added python loader support#563

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

asenyaev
merged 3 commits into

from

Oct 20, 2021
 Merged


Updated submodules to the release 4.5.4 and added python loader support
#563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6a1f61b

Updated submodules to the release 4.5.4, added python loader support,…


asenyaev Oct 15, 2021
545fe24

Added comments for new changes


asenyaev Oct 15, 2021
851182f

Removed useless lines and added replacing lines into init file


asenyaev Oct 18, 2021

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


31 changes: 0 additions & 31 deletions
cv2/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
import importlib
import os
import sys

from .cv2 import *
from .data import *

# wildcard import above does not import "private" variables like __version__
# this makes them available
globals().update(importlib.import_module("cv2.cv2").__dict__)

ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

2 changes: 1 addition & 1 deletion
opencv

Open in desktop


Submodule opencv
updated

449 files


2 changes: 1 addition & 1 deletion
opencv_contrib

Open in desktop


Submodule opencv_contrib
updated

123 files


2 changes: 1 addition & 1 deletion
opencv_extra

Open in desktop


Submodule opencv_extra
updated

232 files


19 changes: 13 additions & 6 deletions
patches/patchQtPlugins

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,16 +3,23 @@ index 4c0b3880fc..dffa0a4caa 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -1187,6 +1187,13 @@ if(WITH_QT OR HAVE_QT)
 if(HAVE_QT5)
 status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
 if(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
+ if(APPLE)
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
+ endif()
+ if(UNIX AND NOT APPLE)
+ install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
+ endif()
 elseif(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 if(HAVE_QT_OPENGL)
 if(Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES)
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES} ${Qt${QT_VERSION_MAJOR}OpenGL_VERSION_STRING})" ELSE NO)
 else()
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 endif()
 else()
 status(" QT OpenGL support:" "NO")
 endif()
 else()
 status(" QT:" "NO")

24 changes: 24 additions & 0 deletions
scripts/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
PYTHON_EXTENSIONS_PATHS = [
 LOADER_DIR
] + PYTHON_EXTENSIONS_PATHS

Comment on lines

+1
 to 
+3

@cclausscclaussNov 26, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are undefined names in Python code.

$ flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
./scripts/__init__.py:2:5: F821 undefined name 'LOADER_DIR'
LOADER_DIR
^
./scripts/__init__.py:3:5: F821 undefined name 'PYTHON_EXTENSIONS_PATHS'
] + PYTHON_EXTENSIONS_PATHS
^


ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How I can verify that case that locally?
Update: Tried CI_BUILD=1, but it fails on missing files. So it is not easy.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to build with CI_BUILD=1 and also define ENABLE_HEADLESS=0, ENABLE_CONTRIB=0 and SDIST=0.
After the build you can reproduce these lines in the python interpreter. What I've done:
from cv2.version import ci_build, headless
ci_and_not_headless = ci_build and not headless
print (ci_and_not_headless)

In addition, to understand ci_and_not_headless working or not you can print QT_QPA_FONTDIR environment variable. Example:
import cv2, os
print(os.environ["QT_QPA_FONTDIR"])

except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

33 changes: 29 additions & 4 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,12 +108,32 @@ def main():
 # Naming conventions vary so widely between versions and OSes
 # had to give up on checking them.
 [
 "python/cv2[^/]*%(ext)s"
 % {"ext": re.escape(sysconfig.get_config_var("EXT_SUFFIX"))}
 "python/cv2/python-%s.%s/cv2[^/]*%s"
 % (sys.version_info[0], sys.version_info[1], re.escape(sysconfig.get_config_var("EXT_SUFFIX")))
 ]
 +
 [
 r"python/cv2/__init__.py"
 ]
 +
 [
 r"python/cv2/.*config.*.py"
 ],
 "cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
 ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
 ],
 "cv2.gapi": [
 "python/cv2" + r"/gapi/.*\.py"
 ],
 "cv2.mat_wrapper": [
 "python/cv2" + r"/mat_wrapper/.*\.py"
 ],
 "cv2.misc": [
 "python/cv2" + r"/misc/.*\.py"
 ],
 "cv2.utils": [
 "python/cv2" + r"/utils/.*\.py"
 ],

Comment on lines

+125
 to 
+136

@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we copy all artifacts of "cmake install" automatically "as is"?
@alalekalalekOct 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is packages = ["cv2", "cv2.data"] line in this file. Perhaps it should be updated somehow (can we remove cv2.data?)
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we copy all artifacts of "cmake install" as is, then there will be several folders and files which we do not want to have in a package. We control what should be in a package using rearrange_cmake_output_data in setup.py.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about cv2.data we have to keep it if we want to use haarcascades, because there are no __init__.py file in "cmake install" and we defining it here. However, we can write into a file after building. What do you think about anything of it?
@sergregorysergregoryOct 20, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we could specify haarcascades as package data, not a separate package. But it requires checking the code and import and so on, I'd delay it to the future.
 }

 # Files in sourcetree outside package dir that should be copied to package.
Expand All@@ -137,8 +157,6 @@ def main():
 "-DBUILD_opencv_python2=OFF",
 # Disable the Java build by default as it is not needed
 "-DBUILD_opencv_java=%s" % build_java,
 # When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
 "-DOPENCV_SKIP_PYTHON_LOADER=ON",
 # Relative dir to install the built module to in the build tree.
 # The default is generated from sysconfig, we'd rather have a constant for simplicity
 "-DOPENCV_PYTHON3_INSTALL_PATH=python",
Expand DownExpand Up@@ -358,6 +376,13 @@ def _classify_installed_files_override(

 print("Copying files from CMake output")

 # add lines from the old __init__.py file to the config file
 with open('scripts/__init__.py', 'r') as custom_init:
 custom_init_data = custom_init.read()
 with open('%spython/cv2/config-%s.%s.py'
 % (cmake_install_dir, sys.version_info[0], sys.version_info[1]), 'w') as opencv_init_config:
 opencv_init_config.write(custom_init_data)

 for package_name, relpaths_re in cls.package_paths_re.items():
 package_dest_reldir = package_name.replace(".", os.path.sep)
 for relpath_re in relpaths_re:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Updated submodules to the release 4.5.4 and added python loader support by asenyaev · Pull Request #563 · opencv/opencv-python · GitHub
Skip to content
Updated submodules to the release 4.5.4 and added python loader support#563

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

asenyaev
merged 3 commits into

from

Oct 20, 2021
 Merged


Updated submodules to the release 4.5.4 and added python loader support
#563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6a1f61b

Updated submodules to the release 4.5.4, added python loader support,…


asenyaev Oct 15, 2021
545fe24

Added comments for new changes


asenyaev Oct 15, 2021
851182f

Removed useless lines and added replacing lines into init file


asenyaev Oct 18, 2021

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


31 changes: 0 additions & 31 deletions
cv2/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
import importlib
import os
import sys

from .cv2 import *
from .data import *

# wildcard import above does not import "private" variables like __version__
# this makes them available
globals().update(importlib.import_module("cv2.cv2").__dict__)

ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

2 changes: 1 addition & 1 deletion
opencv

Open in desktop


Submodule opencv
updated

449 files


2 changes: 1 addition & 1 deletion
opencv_contrib

Open in desktop


Submodule opencv_contrib
updated

123 files


2 changes: 1 addition & 1 deletion
opencv_extra

Open in desktop


Submodule opencv_extra
updated

232 files


19 changes: 13 additions & 6 deletions
patches/patchQtPlugins

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,16 +3,23 @@ index 4c0b3880fc..dffa0a4caa 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -1187,6 +1187,13 @@ if(WITH_QT OR HAVE_QT)
 if(HAVE_QT5)
 status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
 if(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
+ if(APPLE)
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
+ endif()
+ if(UNIX AND NOT APPLE)
+ install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
+ endif()
 elseif(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 if(HAVE_QT_OPENGL)
 if(Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES)
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES} ${Qt${QT_VERSION_MAJOR}OpenGL_VERSION_STRING})" ELSE NO)
 else()
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 endif()
 else()
 status(" QT OpenGL support:" "NO")
 endif()
 else()
 status(" QT:" "NO")

24 changes: 24 additions & 0 deletions
scripts/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
PYTHON_EXTENSIONS_PATHS = [
 LOADER_DIR
] + PYTHON_EXTENSIONS_PATHS

Comment on lines

+1
 to 
+3

@cclausscclaussNov 26, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are undefined names in Python code.

$ flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
./scripts/__init__.py:2:5: F821 undefined name 'LOADER_DIR'
LOADER_DIR
^
./scripts/__init__.py:3:5: F821 undefined name 'PYTHON_EXTENSIONS_PATHS'
] + PYTHON_EXTENSIONS_PATHS
^


ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How I can verify that case that locally?
Update: Tried CI_BUILD=1, but it fails on missing files. So it is not easy.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to build with CI_BUILD=1 and also define ENABLE_HEADLESS=0, ENABLE_CONTRIB=0 and SDIST=0.
After the build you can reproduce these lines in the python interpreter. What I've done:
from cv2.version import ci_build, headless
ci_and_not_headless = ci_build and not headless
print (ci_and_not_headless)

In addition, to understand ci_and_not_headless working or not you can print QT_QPA_FONTDIR environment variable. Example:
import cv2, os
print(os.environ["QT_QPA_FONTDIR"])

except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

33 changes: 29 additions & 4 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,12 +108,32 @@ def main():
 # Naming conventions vary so widely between versions and OSes
 # had to give up on checking them.
 [
 "python/cv2[^/]*%(ext)s"
 % {"ext": re.escape(sysconfig.get_config_var("EXT_SUFFIX"))}
 "python/cv2/python-%s.%s/cv2[^/]*%s"
 % (sys.version_info[0], sys.version_info[1], re.escape(sysconfig.get_config_var("EXT_SUFFIX")))
 ]
 +
 [
 r"python/cv2/__init__.py"
 ]
 +
 [
 r"python/cv2/.*config.*.py"
 ],
 "cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
 ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
 ],
 "cv2.gapi": [
 "python/cv2" + r"/gapi/.*\.py"
 ],
 "cv2.mat_wrapper": [
 "python/cv2" + r"/mat_wrapper/.*\.py"
 ],
 "cv2.misc": [
 "python/cv2" + r"/misc/.*\.py"
 ],
 "cv2.utils": [
 "python/cv2" + r"/utils/.*\.py"
 ],

Comment on lines

+125
 to 
+136

@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we copy all artifacts of "cmake install" automatically "as is"?
@alalekalalekOct 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is packages = ["cv2", "cv2.data"] line in this file. Perhaps it should be updated somehow (can we remove cv2.data?)
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we copy all artifacts of "cmake install" as is, then there will be several folders and files which we do not want to have in a package. We control what should be in a package using rearrange_cmake_output_data in setup.py.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about cv2.data we have to keep it if we want to use haarcascades, because there are no __init__.py file in "cmake install" and we defining it here. However, we can write into a file after building. What do you think about anything of it?
@sergregorysergregoryOct 20, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we could specify haarcascades as package data, not a separate package. But it requires checking the code and import and so on, I'd delay it to the future.
 }

 # Files in sourcetree outside package dir that should be copied to package.
Expand All@@ -137,8 +157,6 @@ def main():
 "-DBUILD_opencv_python2=OFF",
 # Disable the Java build by default as it is not needed
 "-DBUILD_opencv_java=%s" % build_java,
 # When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
 "-DOPENCV_SKIP_PYTHON_LOADER=ON",
 # Relative dir to install the built module to in the build tree.
 # The default is generated from sysconfig, we'd rather have a constant for simplicity
 "-DOPENCV_PYTHON3_INSTALL_PATH=python",
Expand DownExpand Up@@ -358,6 +376,13 @@ def _classify_installed_files_override(

 print("Copying files from CMake output")

 # add lines from the old __init__.py file to the config file
 with open('scripts/__init__.py', 'r') as custom_init:
 custom_init_data = custom_init.read()
 with open('%spython/cv2/config-%s.%s.py'
 % (cmake_install_dir, sys.version_info[0], sys.version_info[1]), 'w') as opencv_init_config:
 opencv_init_config.write(custom_init_data)

 for package_name, relpaths_re in cls.package_paths_re.items():
 package_dest_reldir = package_name.replace(".", os.path.sep)
 for relpath_re in relpaths_re:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Updated submodules to the release 4.5.4 and added python loader support by asenyaev · Pull Request #563 · opencv/opencv-python · GitHub
Skip to content
Updated submodules to the release 4.5.4 and added python loader support#563

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

asenyaev
merged 3 commits into

from

Oct 20, 2021
 Merged


Updated submodules to the release 4.5.4 and added python loader support
#563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6a1f61b

Updated submodules to the release 4.5.4, added python loader support,…


asenyaev Oct 15, 2021
545fe24

Added comments for new changes


asenyaev Oct 15, 2021
851182f

Removed useless lines and added replacing lines into init file


asenyaev Oct 18, 2021

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


31 changes: 0 additions & 31 deletions
cv2/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
import importlib
import os
import sys

from .cv2 import *
from .data import *

# wildcard import above does not import "private" variables like __version__
# this makes them available
globals().update(importlib.import_module("cv2.cv2").__dict__)

ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

2 changes: 1 addition & 1 deletion
opencv

Open in desktop


Submodule opencv
updated

449 files


2 changes: 1 addition & 1 deletion
opencv_contrib

Open in desktop


Submodule opencv_contrib
updated

123 files


2 changes: 1 addition & 1 deletion
opencv_extra

Open in desktop


Submodule opencv_extra
updated

232 files


19 changes: 13 additions & 6 deletions
patches/patchQtPlugins

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,16 +3,23 @@ index 4c0b3880fc..dffa0a4caa 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -1187,6 +1187,13 @@ if(WITH_QT OR HAVE_QT)
 if(HAVE_QT5)
 status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
 if(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
+ if(APPLE)
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
+ endif()
+ if(UNIX AND NOT APPLE)
+ install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
+ endif()
 elseif(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 if(HAVE_QT_OPENGL)
 if(Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES)
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES} ${Qt${QT_VERSION_MAJOR}OpenGL_VERSION_STRING})" ELSE NO)
 else()
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 endif()
 else()
 status(" QT OpenGL support:" "NO")
 endif()
 else()
 status(" QT:" "NO")

24 changes: 24 additions & 0 deletions
scripts/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
PYTHON_EXTENSIONS_PATHS = [
 LOADER_DIR
] + PYTHON_EXTENSIONS_PATHS

Comment on lines

+1
 to 
+3

@cclausscclaussNov 26, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are undefined names in Python code.

$ flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
./scripts/__init__.py:2:5: F821 undefined name 'LOADER_DIR'
LOADER_DIR
^
./scripts/__init__.py:3:5: F821 undefined name 'PYTHON_EXTENSIONS_PATHS'
] + PYTHON_EXTENSIONS_PATHS
^


ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How I can verify that case that locally?
Update: Tried CI_BUILD=1, but it fails on missing files. So it is not easy.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to build with CI_BUILD=1 and also define ENABLE_HEADLESS=0, ENABLE_CONTRIB=0 and SDIST=0.
After the build you can reproduce these lines in the python interpreter. What I've done:
from cv2.version import ci_build, headless
ci_and_not_headless = ci_build and not headless
print (ci_and_not_headless)

In addition, to understand ci_and_not_headless working or not you can print QT_QPA_FONTDIR environment variable. Example:
import cv2, os
print(os.environ["QT_QPA_FONTDIR"])

except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

33 changes: 29 additions & 4 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,12 +108,32 @@ def main():
 # Naming conventions vary so widely between versions and OSes
 # had to give up on checking them.
 [
 "python/cv2[^/]*%(ext)s"
 % {"ext": re.escape(sysconfig.get_config_var("EXT_SUFFIX"))}
 "python/cv2/python-%s.%s/cv2[^/]*%s"
 % (sys.version_info[0], sys.version_info[1], re.escape(sysconfig.get_config_var("EXT_SUFFIX")))
 ]
 +
 [
 r"python/cv2/__init__.py"
 ]
 +
 [
 r"python/cv2/.*config.*.py"
 ],
 "cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
 ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
 ],
 "cv2.gapi": [
 "python/cv2" + r"/gapi/.*\.py"
 ],
 "cv2.mat_wrapper": [
 "python/cv2" + r"/mat_wrapper/.*\.py"
 ],
 "cv2.misc": [
 "python/cv2" + r"/misc/.*\.py"
 ],
 "cv2.utils": [
 "python/cv2" + r"/utils/.*\.py"
 ],

Comment on lines

+125
 to 
+136

@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we copy all artifacts of "cmake install" automatically "as is"?
@alalekalalekOct 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is packages = ["cv2", "cv2.data"] line in this file. Perhaps it should be updated somehow (can we remove cv2.data?)
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we copy all artifacts of "cmake install" as is, then there will be several folders and files which we do not want to have in a package. We control what should be in a package using rearrange_cmake_output_data in setup.py.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about cv2.data we have to keep it if we want to use haarcascades, because there are no __init__.py file in "cmake install" and we defining it here. However, we can write into a file after building. What do you think about anything of it?
@sergregorysergregoryOct 20, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we could specify haarcascades as package data, not a separate package. But it requires checking the code and import and so on, I'd delay it to the future.
 }

 # Files in sourcetree outside package dir that should be copied to package.
Expand All@@ -137,8 +157,6 @@ def main():
 "-DBUILD_opencv_python2=OFF",
 # Disable the Java build by default as it is not needed
 "-DBUILD_opencv_java=%s" % build_java,
 # When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
 "-DOPENCV_SKIP_PYTHON_LOADER=ON",
 # Relative dir to install the built module to in the build tree.
 # The default is generated from sysconfig, we'd rather have a constant for simplicity
 "-DOPENCV_PYTHON3_INSTALL_PATH=python",
Expand DownExpand Up@@ -358,6 +376,13 @@ def _classify_installed_files_override(

 print("Copying files from CMake output")

 # add lines from the old __init__.py file to the config file
 with open('scripts/__init__.py', 'r') as custom_init:
 custom_init_data = custom_init.read()
 with open('%spython/cv2/config-%s.%s.py'
 % (cmake_install_dir, sys.version_info[0], sys.version_info[1]), 'w') as opencv_init_config:
 opencv_init_config.write(custom_init_data)

 for package_name, relpaths_re in cls.package_paths_re.items():
 package_dest_reldir = package_name.replace(".", os.path.sep)
 for relpath_re in relpaths_re:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Updated submodules to the release 4.5.4 and added python loader support by asenyaev · Pull Request #563 · opencv/opencv-python · GitHub
Skip to content
Updated submodules to the release 4.5.4 and added python loader support#563

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

asenyaev
merged 3 commits into

from

Oct 20, 2021
 Merged


Updated submodules to the release 4.5.4 and added python loader support
#563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6a1f61b

Updated submodules to the release 4.5.4, added python loader support,…


asenyaev Oct 15, 2021
545fe24

Added comments for new changes


asenyaev Oct 15, 2021
851182f

Removed useless lines and added replacing lines into init file


asenyaev Oct 18, 2021

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


31 changes: 0 additions & 31 deletions
cv2/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
import importlib
import os
import sys

from .cv2 import *
from .data import *

# wildcard import above does not import "private" variables like __version__
# this makes them available
globals().update(importlib.import_module("cv2.cv2").__dict__)

ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

2 changes: 1 addition & 1 deletion
opencv

Open in desktop


Submodule opencv
updated

449 files


2 changes: 1 addition & 1 deletion
opencv_contrib

Open in desktop


Submodule opencv_contrib
updated

123 files


2 changes: 1 addition & 1 deletion
opencv_extra

Open in desktop


Submodule opencv_extra
updated

232 files


19 changes: 13 additions & 6 deletions
patches/patchQtPlugins

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,16 +3,23 @@ index 4c0b3880fc..dffa0a4caa 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -1187,6 +1187,13 @@ if(WITH_QT OR HAVE_QT)
 if(HAVE_QT5)
 status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
 if(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
+ if(APPLE)
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
+ endif()
+ if(UNIX AND NOT APPLE)
+ install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
+ endif()
 elseif(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 if(HAVE_QT_OPENGL)
 if(Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES)
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES} ${Qt${QT_VERSION_MAJOR}OpenGL_VERSION_STRING})" ELSE NO)
 else()
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 endif()
 else()
 status(" QT OpenGL support:" "NO")
 endif()
 else()
 status(" QT:" "NO")

24 changes: 24 additions & 0 deletions
scripts/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
PYTHON_EXTENSIONS_PATHS = [
 LOADER_DIR
] + PYTHON_EXTENSIONS_PATHS

Comment on lines

+1
 to 
+3

@cclausscclaussNov 26, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are undefined names in Python code.

$ flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
./scripts/__init__.py:2:5: F821 undefined name 'LOADER_DIR'
LOADER_DIR
^
./scripts/__init__.py:3:5: F821 undefined name 'PYTHON_EXTENSIONS_PATHS'
] + PYTHON_EXTENSIONS_PATHS
^


ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How I can verify that case that locally?
Update: Tried CI_BUILD=1, but it fails on missing files. So it is not easy.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to build with CI_BUILD=1 and also define ENABLE_HEADLESS=0, ENABLE_CONTRIB=0 and SDIST=0.
After the build you can reproduce these lines in the python interpreter. What I've done:
from cv2.version import ci_build, headless
ci_and_not_headless = ci_build and not headless
print (ci_and_not_headless)

In addition, to understand ci_and_not_headless working or not you can print QT_QPA_FONTDIR environment variable. Example:
import cv2, os
print(os.environ["QT_QPA_FONTDIR"])

except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

33 changes: 29 additions & 4 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,12 +108,32 @@ def main():
 # Naming conventions vary so widely between versions and OSes
 # had to give up on checking them.
 [
 "python/cv2[^/]*%(ext)s"
 % {"ext": re.escape(sysconfig.get_config_var("EXT_SUFFIX"))}
 "python/cv2/python-%s.%s/cv2[^/]*%s"
 % (sys.version_info[0], sys.version_info[1], re.escape(sysconfig.get_config_var("EXT_SUFFIX")))
 ]
 +
 [
 r"python/cv2/__init__.py"
 ]
 +
 [
 r"python/cv2/.*config.*.py"
 ],
 "cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
 ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
 ],
 "cv2.gapi": [
 "python/cv2" + r"/gapi/.*\.py"
 ],
 "cv2.mat_wrapper": [
 "python/cv2" + r"/mat_wrapper/.*\.py"
 ],
 "cv2.misc": [
 "python/cv2" + r"/misc/.*\.py"
 ],
 "cv2.utils": [
 "python/cv2" + r"/utils/.*\.py"
 ],

Comment on lines

+125
 to 
+136

@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we copy all artifacts of "cmake install" automatically "as is"?
@alalekalalekOct 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is packages = ["cv2", "cv2.data"] line in this file. Perhaps it should be updated somehow (can we remove cv2.data?)
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we copy all artifacts of "cmake install" as is, then there will be several folders and files which we do not want to have in a package. We control what should be in a package using rearrange_cmake_output_data in setup.py.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about cv2.data we have to keep it if we want to use haarcascades, because there are no __init__.py file in "cmake install" and we defining it here. However, we can write into a file after building. What do you think about anything of it?
@sergregorysergregoryOct 20, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we could specify haarcascades as package data, not a separate package. But it requires checking the code and import and so on, I'd delay it to the future.
 }

 # Files in sourcetree outside package dir that should be copied to package.
Expand All@@ -137,8 +157,6 @@ def main():
 "-DBUILD_opencv_python2=OFF",
 # Disable the Java build by default as it is not needed
 "-DBUILD_opencv_java=%s" % build_java,
 # When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
 "-DOPENCV_SKIP_PYTHON_LOADER=ON",
 # Relative dir to install the built module to in the build tree.
 # The default is generated from sysconfig, we'd rather have a constant for simplicity
 "-DOPENCV_PYTHON3_INSTALL_PATH=python",
Expand DownExpand Up@@ -358,6 +376,13 @@ def _classify_installed_files_override(

 print("Copying files from CMake output")

 # add lines from the old __init__.py file to the config file
 with open('scripts/__init__.py', 'r') as custom_init:
 custom_init_data = custom_init.read()
 with open('%spython/cv2/config-%s.%s.py'
 % (cmake_install_dir, sys.version_info[0], sys.version_info[1]), 'w') as opencv_init_config:
 opencv_init_config.write(custom_init_data)

 for package_name, relpaths_re in cls.package_paths_re.items():
 package_dest_reldir = package_name.replace(".", os.path.sep)
 for relpath_re in relpaths_re:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Updated submodules to the release 4.5.4 and added python loader support by asenyaev · Pull Request #563 · opencv/opencv-python · GitHub
Skip to content
Updated submodules to the release 4.5.4 and added python loader support#563

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

asenyaev
merged 3 commits into

from

Oct 20, 2021
 Merged


Updated submodules to the release 4.5.4 and added python loader support
#563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6a1f61b

Updated submodules to the release 4.5.4, added python loader support,…


asenyaev Oct 15, 2021
545fe24

Added comments for new changes


asenyaev Oct 15, 2021
851182f

Removed useless lines and added replacing lines into init file


asenyaev Oct 18, 2021

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


31 changes: 0 additions & 31 deletions
cv2/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
import importlib
import os
import sys

from .cv2 import *
from .data import *

# wildcard import above does not import "private" variables like __version__
# this makes them available
globals().update(importlib.import_module("cv2.cv2").__dict__)

ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

2 changes: 1 addition & 1 deletion
opencv

Open in desktop


Submodule opencv
updated

449 files


2 changes: 1 addition & 1 deletion
opencv_contrib

Open in desktop


Submodule opencv_contrib
updated

123 files


2 changes: 1 addition & 1 deletion
opencv_extra

Open in desktop


Submodule opencv_extra
updated

232 files


19 changes: 13 additions & 6 deletions
patches/patchQtPlugins

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,16 +3,23 @@ index 4c0b3880fc..dffa0a4caa 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -1187,6 +1187,13 @@ if(WITH_QT OR HAVE_QT)
 if(HAVE_QT5)
 status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
 if(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
+ if(APPLE)
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
+ endif()
+ if(UNIX AND NOT APPLE)
+ install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
+ endif()
 elseif(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 if(HAVE_QT_OPENGL)
 if(Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES)
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES} ${Qt${QT_VERSION_MAJOR}OpenGL_VERSION_STRING})" ELSE NO)
 else()
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 endif()
 else()
 status(" QT OpenGL support:" "NO")
 endif()
 else()
 status(" QT:" "NO")

24 changes: 24 additions & 0 deletions
scripts/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
PYTHON_EXTENSIONS_PATHS = [
 LOADER_DIR
] + PYTHON_EXTENSIONS_PATHS

Comment on lines

+1
 to 
+3

@cclausscclaussNov 26, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are undefined names in Python code.

$ flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
./scripts/__init__.py:2:5: F821 undefined name 'LOADER_DIR'
LOADER_DIR
^
./scripts/__init__.py:3:5: F821 undefined name 'PYTHON_EXTENSIONS_PATHS'
] + PYTHON_EXTENSIONS_PATHS
^


ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How I can verify that case that locally?
Update: Tried CI_BUILD=1, but it fails on missing files. So it is not easy.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to build with CI_BUILD=1 and also define ENABLE_HEADLESS=0, ENABLE_CONTRIB=0 and SDIST=0.
After the build you can reproduce these lines in the python interpreter. What I've done:
from cv2.version import ci_build, headless
ci_and_not_headless = ci_build and not headless
print (ci_and_not_headless)

In addition, to understand ci_and_not_headless working or not you can print QT_QPA_FONTDIR environment variable. Example:
import cv2, os
print(os.environ["QT_QPA_FONTDIR"])

except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

33 changes: 29 additions & 4 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,12 +108,32 @@ def main():
 # Naming conventions vary so widely between versions and OSes
 # had to give up on checking them.
 [
 "python/cv2[^/]*%(ext)s"
 % {"ext": re.escape(sysconfig.get_config_var("EXT_SUFFIX"))}
 "python/cv2/python-%s.%s/cv2[^/]*%s"
 % (sys.version_info[0], sys.version_info[1], re.escape(sysconfig.get_config_var("EXT_SUFFIX")))
 ]
 +
 [
 r"python/cv2/__init__.py"
 ]
 +
 [
 r"python/cv2/.*config.*.py"
 ],
 "cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
 ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
 ],
 "cv2.gapi": [
 "python/cv2" + r"/gapi/.*\.py"
 ],
 "cv2.mat_wrapper": [
 "python/cv2" + r"/mat_wrapper/.*\.py"
 ],
 "cv2.misc": [
 "python/cv2" + r"/misc/.*\.py"
 ],
 "cv2.utils": [
 "python/cv2" + r"/utils/.*\.py"
 ],

Comment on lines

+125
 to 
+136

@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we copy all artifacts of "cmake install" automatically "as is"?
@alalekalalekOct 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is packages = ["cv2", "cv2.data"] line in this file. Perhaps it should be updated somehow (can we remove cv2.data?)
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we copy all artifacts of "cmake install" as is, then there will be several folders and files which we do not want to have in a package. We control what should be in a package using rearrange_cmake_output_data in setup.py.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about cv2.data we have to keep it if we want to use haarcascades, because there are no __init__.py file in "cmake install" and we defining it here. However, we can write into a file after building. What do you think about anything of it?
@sergregorysergregoryOct 20, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we could specify haarcascades as package data, not a separate package. But it requires checking the code and import and so on, I'd delay it to the future.
 }

 # Files in sourcetree outside package dir that should be copied to package.
Expand All@@ -137,8 +157,6 @@ def main():
 "-DBUILD_opencv_python2=OFF",
 # Disable the Java build by default as it is not needed
 "-DBUILD_opencv_java=%s" % build_java,
 # When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
 "-DOPENCV_SKIP_PYTHON_LOADER=ON",
 # Relative dir to install the built module to in the build tree.
 # The default is generated from sysconfig, we'd rather have a constant for simplicity
 "-DOPENCV_PYTHON3_INSTALL_PATH=python",
Expand DownExpand Up@@ -358,6 +376,13 @@ def _classify_installed_files_override(

 print("Copying files from CMake output")

 # add lines from the old __init__.py file to the config file
 with open('scripts/__init__.py', 'r') as custom_init:
 custom_init_data = custom_init.read()
 with open('%spython/cv2/config-%s.%s.py'
 % (cmake_install_dir, sys.version_info[0], sys.version_info[1]), 'w') as opencv_init_config:
 opencv_init_config.write(custom_init_data)

 for package_name, relpaths_re in cls.package_paths_re.items():
 package_dest_reldir = package_name.replace(".", os.path.sep)
 for relpath_re in relpaths_re:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Updated submodules to the release 4.5.4 and added python loader support by asenyaev · Pull Request #563 · opencv/opencv-python · GitHub
Skip to content
Updated submodules to the release 4.5.4 and added python loader support#563

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

asenyaev
merged 3 commits into

from

Oct 20, 2021
 Merged


Updated submodules to the release 4.5.4 and added python loader support
#563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6a1f61b

Updated submodules to the release 4.5.4, added python loader support,…


asenyaev Oct 15, 2021
545fe24

Added comments for new changes


asenyaev Oct 15, 2021
851182f

Removed useless lines and added replacing lines into init file


asenyaev Oct 18, 2021

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


31 changes: 0 additions & 31 deletions
cv2/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
import importlib
import os
import sys

from .cv2 import *
from .data import *

# wildcard import above does not import "private" variables like __version__
# this makes them available
globals().update(importlib.import_module("cv2.cv2").__dict__)

ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

2 changes: 1 addition & 1 deletion
opencv

Open in desktop


Submodule opencv
updated

449 files


2 changes: 1 addition & 1 deletion
opencv_contrib

Open in desktop


Submodule opencv_contrib
updated

123 files


2 changes: 1 addition & 1 deletion
opencv_extra

Open in desktop


Submodule opencv_extra
updated

232 files


19 changes: 13 additions & 6 deletions
patches/patchQtPlugins

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,16 +3,23 @@ index 4c0b3880fc..dffa0a4caa 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -1187,6 +1187,13 @@ if(WITH_QT OR HAVE_QT)
 if(HAVE_QT5)
 status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
 if(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
+ if(APPLE)
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
+ endif()
+ if(UNIX AND NOT APPLE)
+ install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
+ endif()
 elseif(HAVE_QT)
 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 if(HAVE_QT_OPENGL)
 if(Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES)
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES} ${Qt${QT_VERSION_MAJOR}OpenGL_VERSION_STRING})" ELSE NO)
 else()
 status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
 endif()
 else()
 status(" QT OpenGL support:" "NO")
 endif()
 else()
 status(" QT:" "NO")

24 changes: 24 additions & 0 deletions
scripts/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
PYTHON_EXTENSIONS_PATHS = [
 LOADER_DIR
] + PYTHON_EXTENSIONS_PATHS

Comment on lines

+1
 to 
+3

@cclausscclaussNov 26, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are undefined names in Python code.

$ flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
./scripts/__init__.py:2:5: F821 undefined name 'LOADER_DIR'
LOADER_DIR
^
./scripts/__init__.py:3:5: F821 undefined name 'PYTHON_EXTENSIONS_PATHS'
] + PYTHON_EXTENSIONS_PATHS
^


ci_and_not_headless = False

try:
 from .version import ci_build, headless

 ci_and_not_headless = ci_build and not headless
@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How I can verify that case that locally?
Update: Tried CI_BUILD=1, but it fails on missing files. So it is not easy.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to build with CI_BUILD=1 and also define ENABLE_HEADLESS=0, ENABLE_CONTRIB=0 and SDIST=0.
After the build you can reproduce these lines in the python interpreter. What I've done:
from cv2.version import ci_build, headless
ci_and_not_headless = ci_build and not headless
print (ci_and_not_headless)

In addition, to understand ci_and_not_headless working or not you can print QT_QPA_FONTDIR environment variable. Example:
import cv2, os
print(os.environ["QT_QPA_FONTDIR"])

except:
 pass

# the Qt plugin is included currently only in the pre-built wheels
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
 )

# Qt will throw warning on Linux if fonts are not found
if sys.platform.startswith("linux") and ci_and_not_headless:
 os.environ["QT_QPA_FONTDIR"] = os.path.join(
 os.path.dirname(os.path.abspath(__file__)), "qt", "fonts"
 )

33 changes: 29 additions & 4 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,12 +108,32 @@ def main():
 # Naming conventions vary so widely between versions and OSes
 # had to give up on checking them.
 [
 "python/cv2[^/]*%(ext)s"
 % {"ext": re.escape(sysconfig.get_config_var("EXT_SUFFIX"))}
 "python/cv2/python-%s.%s/cv2[^/]*%s"
 % (sys.version_info[0], sys.version_info[1], re.escape(sysconfig.get_config_var("EXT_SUFFIX")))
 ]
 +
 [
 r"python/cv2/__init__.py"
 ]
 +
 [
 r"python/cv2/.*config.*.py"
 ],
 "cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
 ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
 ],
 "cv2.gapi": [
 "python/cv2" + r"/gapi/.*\.py"
 ],
 "cv2.mat_wrapper": [
 "python/cv2" + r"/mat_wrapper/.*\.py"
 ],
 "cv2.misc": [
 "python/cv2" + r"/misc/.*\.py"
 ],
 "cv2.utils": [
 "python/cv2" + r"/utils/.*\.py"
 ],

Comment on lines

+125
 to 
+136

@alalekalalekOct 15, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we copy all artifacts of "cmake install" automatically "as is"?
@alalekalalekOct 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is packages = ["cv2", "cv2.data"] line in this file. Perhaps it should be updated somehow (can we remove cv2.data?)
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we copy all artifacts of "cmake install" as is, then there will be several folders and files which we do not want to have in a package. We control what should be in a package using rearrange_cmake_output_data in setup.py.
@asenyaevasenyaevOct 18, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about cv2.data we have to keep it if we want to use haarcascades, because there are no __init__.py file in "cmake install" and we defining it here. However, we can write into a file after building. What do you think about anything of it?
@sergregorysergregoryOct 20, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we could specify haarcascades as package data, not a separate package. But it requires checking the code and import and so on, I'd delay it to the future.
 }

 # Files in sourcetree outside package dir that should be copied to package.
Expand All@@ -137,8 +157,6 @@ def main():
 "-DBUILD_opencv_python2=OFF",
 # Disable the Java build by default as it is not needed
 "-DBUILD_opencv_java=%s" % build_java,
 # When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
 "-DOPENCV_SKIP_PYTHON_LOADER=ON",
 # Relative dir to install the built module to in the build tree.
 # The default is generated from sysconfig, we'd rather have a constant for simplicity
 "-DOPENCV_PYTHON3_INSTALL_PATH=python",
Expand DownExpand Up@@ -358,6 +376,13 @@ def _classify_installed_files_override(

 print("Copying files from CMake output")

 # add lines from the old __init__.py file to the config file
 with open('scripts/__init__.py', 'r') as custom_init:
 custom_init_data = custom_init.read()
 with open('%spython/cv2/config-%s.%s.py'
 % (cmake_install_dir, sys.version_info[0], sys.version_info[1]), 'w') as opencv_init_config:
 opencv_init_config.write(custom_init_data)

 for package_name, relpaths_re in cls.package_paths_re.items():
 package_dest_reldir = package_name.replace(".", os.path.sep)
 for relpath_re in relpaths_re:
Expand Down