Merge pull request #216 from agimus-project/opencv

OpenCV: fix wheel use

Author: nim65s

.git-blame-ignore-revs

@@ -1 +1,2 @@
-0e80a5fc7c514dacd1d8b957adf42ad636b4b1e3 pre-commit run -a
+# pre-commit run -a
+0e80a5fc7c514dacd1d8b957adf42ad636b4b1e3

README.md

@@ -32,12 +32,15 @@ conda activate happypose
 pip install -r requirements/base.txt
 ```
 
+With conda, you **must not** install `pypi`, `cpu` or `cu124` extras or requirements files.
+
 ### Example with uv
 
 ```
 git clone --branch dev --recurse-submodules https://github.com/agimus-project/happypose.git
 cd happypose
 uv sync --extra pypi --extra cpu  # you *must* choose between cpu / cu124
+source .venv/bin/activate
 ```
 
 ### Example with venv

pyproject.toml

@@ -36,6 +36,7 @@ dependencies = [
   "pybind11>=2.13.6",
   "pybullet>=3.2.6",
   "pypng>=0.20220715.0",
+  "pytest-order>=1.3.0",
   "pytest>=8.3.3",
   "pyyaml>=6.0.2",
   "roma>=1.5.0",
@@ -74,7 +75,6 @@ cu124 = [
 evaluation = ["cmeel-teaser-plusplus>=2.0"]
 pypi = [
   "opencv-contrib-python>=4.10.0",
-  "opencv-python>=4.10.0",
   "pin>=2.7"
 ]
 

requirements/base.txt

@@ -13,17 +13,17 @@ bokeh==3.6.1
 bop-toolkit-lib @ git+https://github.com/agimus-project/bop_toolkit@53b6e2e335c4e6aa76e5db34e809506ee3f4cf16
 braceexpand==0.1.7
 certifi==2024.8.30
-cffi==1.17.1 ; os_name == 'nt' or implementation_name == 'pypy'
+cffi==1.17.1 ; (implementation_name == 'pypy' and os_name != 'nt') or (implementation_name == 'pypy' and platform_machine == 'aarch64' and sys_platform == 'linux') or (implementation_name != 'pypy' and platform_machine == 'aarch64' and sys_platform == 'linux' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (implementation_name == 'pypy' and sys_platform == 'darwin') or (implementation_name != 'pypy' and sys_platform == 'darwin' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (os_name == 'nt' and platform_machine != 'aarch64' and sys_platform == 'linux') or (os_name == 'nt' and sys_platform != 'darwin' and sys_platform != 'linux') or (os_name != 'nt' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 cfgv==3.4.0
 charset-normalizer==3.4.0
-colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows'
+colorama==0.4.6 ; sys_platform == 'win32' or (extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 contourpy==1.3.1
 coverage==7.6.8
 cycler==0.12.1
 cython==3.0.11
 decorator==5.1.1
 distlib==0.3.9
-exceptiongroup==1.2.2 ; python_full_version < '3.11'
+exceptiongroup==1.2.2 ; python_full_version < '3.11' or (extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 executing==2.1.0
 filelock==3.16.1
 fonttools==4.55.0
@@ -61,7 +61,7 @@ packaging==24.2
 panda3d==1.10.15
 pandas==2.2.3
 parso==0.8.4
-pexpect==4.9.0 ; sys_platform != 'emscripten' and sys_platform != 'win32'
+pexpect==4.9.0 ; (sys_platform != 'emscripten' and sys_platform != 'win32') or (sys_platform == 'emscripten' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (sys_platform == 'win32' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 pillow==11.0.0
 platformdirs==4.3.6
 pluggy==1.5.0
@@ -70,11 +70,11 @@ pre-commit==4.0.1
 prompt-toolkit==3.0.48
 protobuf==5.28.3
 psutil==6.1.0
-ptyprocess==0.7.0 ; sys_platform != 'emscripten' and sys_platform != 'win32'
+ptyprocess==0.7.0 ; (sys_platform != 'emscripten' and sys_platform != 'win32') or (sys_platform == 'emscripten' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (sys_platform == 'win32' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 pure-eval==0.2.3
 pybind11==2.13.6
 pybullet==3.2.6
-pycparser==2.22 ; os_name == 'nt' or implementation_name == 'pypy'
+pycparser==2.22 ; (implementation_name == 'pypy' and os_name != 'nt') or (implementation_name == 'pypy' and platform_machine == 'aarch64' and sys_platform == 'linux') or (implementation_name != 'pypy' and platform_machine == 'aarch64' and sys_platform == 'linux' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (implementation_name == 'pypy' and sys_platform == 'darwin') or (implementation_name != 'pypy' and sys_platform == 'darwin' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (os_name == 'nt' and platform_machine != 'aarch64' and sys_platform == 'linux') or (os_name == 'nt' and sys_platform != 'darwin' and sys_platform != 'linux') or (os_name != 'nt' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 pygments==2.18.0
 pyngrok==7.2.1
 pyopengl==3.1.0
@@ -83,6 +83,7 @@ pypng==0.20220715.0
 pyre-extensions==0.0.32
 pysocks==1.7.1
 pytest==8.3.3
+pytest-order==1.3.0
 python-dateutil==2.9.0.post0
 pytz==2024.2
 pyyaml==6.0.2
@@ -107,7 +108,7 @@ tensorboard==2.18.0
 tensorboard-data-server==0.7.2
 threadpoolctl==3.5.0
 tifffile==2024.9.20
-tomli==2.1.0 ; python_full_version <= '3.11'
+tomli==2.1.0 ; python_full_version <= '3.11' or (extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 torchnet==0.0.4
 torchtnt==0.2.4
 tornado==6.4.2

requirements/cpu.txt

@@ -13,17 +13,17 @@ bokeh==3.6.1
 bop-toolkit-lib @ git+https://github.com/agimus-project/bop_toolkit@53b6e2e335c4e6aa76e5db34e809506ee3f4cf16
 braceexpand==0.1.7
 certifi==2024.8.30
-cffi==1.17.1 ; os_name == 'nt' or implementation_name == 'pypy'
+cffi==1.17.1 ; (implementation_name == 'pypy' and os_name != 'nt') or (implementation_name == 'pypy' and sys_platform == 'darwin') or (implementation_name == 'pypy' and sys_platform == 'linux') or (implementation_name != 'pypy' and sys_platform == 'darwin' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (implementation_name != 'pypy' and sys_platform == 'linux' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (os_name == 'nt' and sys_platform != 'darwin' and sys_platform != 'linux') or (os_name != 'nt' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 cfgv==3.4.0
 charset-normalizer==3.4.0
-colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows'
+colorama==0.4.6 ; sys_platform == 'win32' or (extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 contourpy==1.3.1
 coverage==7.6.8
 cycler==0.12.1
 cython==3.0.11
 decorator==5.1.1
 distlib==0.3.9
-exceptiongroup==1.2.2 ; python_full_version < '3.11'
+exceptiongroup==1.2.2 ; python_full_version < '3.11' or (extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 executing==2.1.0
 filelock==3.16.1
 fonttools==4.55.0
@@ -62,7 +62,7 @@ packaging==24.2
 panda3d==1.10.15
 pandas==2.2.3
 parso==0.8.4
-pexpect==4.9.0 ; sys_platform != 'emscripten' and sys_platform != 'win32'
+pexpect==4.9.0 ; (sys_platform != 'emscripten' and sys_platform != 'win32') or (sys_platform == 'emscripten' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (sys_platform == 'win32' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 pillow==11.0.0
 platformdirs==4.3.6
 pluggy==1.5.0
@@ -71,11 +71,11 @@ pre-commit==4.0.1
 prompt-toolkit==3.0.48
 protobuf==5.28.3
 psutil==6.1.0
-ptyprocess==0.7.0 ; sys_platform != 'emscripten' and sys_platform != 'win32'
+ptyprocess==0.7.0 ; (sys_platform != 'emscripten' and sys_platform != 'win32') or (sys_platform == 'emscripten' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (sys_platform == 'win32' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 pure-eval==0.2.3
 pybind11==2.13.6
 pybullet==3.2.6
-pycparser==2.22 ; os_name == 'nt' or implementation_name == 'pypy'
+pycparser==2.22 ; (implementation_name == 'pypy' and os_name != 'nt') or (implementation_name == 'pypy' and sys_platform == 'darwin') or (implementation_name == 'pypy' and sys_platform == 'linux') or (implementation_name != 'pypy' and sys_platform == 'darwin' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (implementation_name != 'pypy' and sys_platform == 'linux' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (os_name == 'nt' and sys_platform != 'darwin' and sys_platform != 'linux') or (os_name != 'nt' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 pygments==2.18.0
 pyngrok==7.2.1
 pyopengl==3.1.0
@@ -84,6 +84,7 @@ pypng==0.20220715.0
 pyre-extensions==0.0.32
 pysocks==1.7.1
 pytest==8.3.3
+pytest-order==1.3.0
 python-dateutil==2.9.0.post0
 pytz==2024.2
 pyyaml==6.0.2
@@ -109,13 +110,15 @@ tensorboard==2.18.0
 tensorboard-data-server==0.7.2
 threadpoolctl==3.5.0
 tifffile==2024.9.20
-tomli==2.1.0 ; python_full_version <= '3.11'
-torch==2.5.1 ; platform_system == 'Darwin'
-torch==2.5.1+cpu ; platform_system != 'Darwin'
+tomli==2.1.0 ; python_full_version <= '3.11' or (extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
+torch==2.5.1 ; platform_machine == 'aarch64' and sys_platform == 'linux'
+torch==2.5.1 ; sys_platform == 'darwin'
+torch==2.5.1+cpu ; (platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')
 torchnet==0.0.4
 torchtnt==0.2.4
-torchvision==0.20.1 ; platform_system == 'Darwin'
-torchvision==0.20.1+cpu ; platform_system != 'Darwin'
+torchvision==0.20.1 ; platform_machine == 'aarch64' and sys_platform == 'linux'
+torchvision==0.20.1 ; sys_platform == 'darwin'
+torchvision==0.20.1+cpu ; (platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')
 tornado==6.4.2
 tqdm==4.67.1
 traitlets==5.14.3

requirements/cu124.txt

@@ -13,17 +13,17 @@ bokeh==3.6.1
 bop-toolkit-lib @ git+https://github.com/agimus-project/bop_toolkit@53b6e2e335c4e6aa76e5db34e809506ee3f4cf16
 braceexpand==0.1.7
 certifi==2024.8.30
-cffi==1.17.1 ; os_name == 'nt' or implementation_name == 'pypy'
+cffi==1.17.1 ; (implementation_name == 'pypy' and os_name != 'nt') or (implementation_name == 'pypy' and sys_platform == 'darwin') or (implementation_name == 'pypy' and sys_platform == 'linux') or (implementation_name != 'pypy' and sys_platform == 'darwin' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (implementation_name != 'pypy' and sys_platform == 'linux' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (os_name == 'nt' and sys_platform != 'darwin' and sys_platform != 'linux') or (os_name != 'nt' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 cfgv==3.4.0
 charset-normalizer==3.4.0
-colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows'
+colorama==0.4.6 ; sys_platform == 'win32' or (extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 contourpy==1.3.1
 coverage==7.6.8
 cycler==0.12.1
 cython==3.0.11
 decorator==5.1.1
 distlib==0.3.9
-exceptiongroup==1.2.2 ; python_full_version < '3.11'
+exceptiongroup==1.2.2 ; python_full_version < '3.11' or (extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 executing==2.1.0
 filelock==3.16.1
 fonttools==4.55.0
@@ -56,25 +56,25 @@ mypy-extensions==1.0.0
 networkx==3.4.2
 nodeenv==1.9.1
 numpy==1.26.4
-nvidia-cublas-cu12==12.4.5.8 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-cuda-cupti-cu12==12.4.127 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-cuda-nvrtc-cu12==12.4.127 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-cuda-runtime-cu12==12.4.127 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-cudnn-cu12==9.1.0.70 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-cufft-cu12==11.2.1.3 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-curand-cu12==10.3.5.147 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-cusolver-cu12==11.6.1.9 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-cusparse-cu12==12.3.1.170 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-nccl-cu12==2.21.5 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-nvjitlink-cu12==12.4.127 ; platform_machine == 'x86_64' and platform_system == 'Linux'
-nvidia-nvtx-cu12==12.4.127 ; platform_machine == 'x86_64' and platform_system == 'Linux'
+nvidia-cublas-cu12==12.4.5.8 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cuda-cupti-cu12==12.4.127 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cuda-nvrtc-cu12==12.4.127 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cuda-runtime-cu12==12.4.127 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cudnn-cu12==9.1.0.70 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cufft-cu12==11.2.1.3 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-curand-cu12==10.3.5.147 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cusolver-cu12==11.6.1.9 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cusparse-cu12==12.3.1.170 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-nccl-cu12==2.21.5 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-nvjitlink-cu12==12.4.127 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-nvtx-cu12==12.4.127 ; platform_machine == 'x86_64' and sys_platform == 'linux'
 omegaconf==2.3.0
 outcome==1.3.0.post0
 packaging==24.2
 panda3d==1.10.15
 pandas==2.2.3
 parso==0.8.4
-pexpect==4.9.0 ; sys_platform != 'emscripten' and sys_platform != 'win32'
+pexpect==4.9.0 ; (sys_platform != 'emscripten' and sys_platform != 'win32') or (sys_platform == 'emscripten' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (sys_platform == 'win32' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 pillow==11.0.0
 platformdirs==4.3.6
 pluggy==1.5.0
@@ -83,11 +83,11 @@ pre-commit==4.0.1
 prompt-toolkit==3.0.48
 protobuf==5.28.3
 psutil==6.1.0
-ptyprocess==0.7.0 ; sys_platform != 'emscripten' and sys_platform != 'win32'
+ptyprocess==0.7.0 ; (sys_platform != 'emscripten' and sys_platform != 'win32') or (sys_platform == 'emscripten' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (sys_platform == 'win32' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 pure-eval==0.2.3
 pybind11==2.13.6
 pybullet==3.2.6
-pycparser==2.22 ; os_name == 'nt' or implementation_name == 'pypy'
+pycparser==2.22 ; (implementation_name == 'pypy' and os_name != 'nt') or (implementation_name == 'pypy' and sys_platform == 'darwin') or (implementation_name == 'pypy' and sys_platform == 'linux') or (implementation_name != 'pypy' and sys_platform == 'darwin' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (implementation_name != 'pypy' and sys_platform == 'linux' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124') or (os_name == 'nt' and sys_platform != 'darwin' and sys_platform != 'linux') or (os_name != 'nt' and extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
 pygments==2.18.0
 pyngrok==7.2.1
 pyopengl==3.1.0
@@ -96,6 +96,7 @@ pypng==0.20220715.0
 pyre-extensions==0.0.32
 pysocks==1.7.1
 pytest==8.3.3
+pytest-order==1.3.0
 python-dateutil==2.9.0.post0
 pytz==2024.2
 pyyaml==6.0.2
@@ -121,21 +122,21 @@ tensorboard==2.18.0
 tensorboard-data-server==0.7.2
 threadpoolctl==3.5.0
 tifffile==2024.9.20
-tomli==2.1.0 ; python_full_version <= '3.11'
-torch==2.5.1 ; platform_system == 'Darwin'
-torch==2.5.1+cu124 ; platform_system != 'Darwin'
+tomli==2.1.0 ; python_full_version <= '3.11' or (extra == 'extra-9-happypose-cpu' and extra == 'extra-9-happypose-cu124')
+torch==2.5.1 ; (platform_machine == 'aarch64' and sys_platform == 'linux') or sys_platform == 'darwin'
+torch==2.5.1+cu124 ; (platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')
 torchnet==0.0.4
 torchtnt==0.2.4
-torchvision==0.20.1 ; platform_system == 'Darwin'
-torchvision==0.20.1+cu124 ; platform_system != 'Darwin'
+torchvision==0.20.1 ; (platform_machine == 'aarch64' and sys_platform == 'linux') or sys_platform == 'darwin'
+torchvision==0.20.1+cu124 ; (platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')
 tornado==6.4.2
 tqdm==4.67.1
 traitlets==5.14.3
 transforms3d==0.4.2
 trimesh==4.5.2
 trio==0.27.0
 trio-websocket==0.11.1
-triton==3.1.0 ; python_full_version < '3.13' and platform_machine == 'x86_64' and platform_system == 'Linux'
+triton==3.1.0 ; python_full_version < '3.13' and platform_machine == 'x86_64' and sys_platform == 'linux'
 typing-extensions==4.12.2
 typing-inspect==0.9.0
 tzdata==2024.2