CI: test both python3.8 and 3.10

Author: fracape

.gitlab-ci.yml

@@ -104,6 +104,22 @@ pytest-pip-py38:
   tags:
     - docker
 
+pytest-pip-py310:
+  stage: test
+  image: python:3.10-bullseye
+  before_script:
+    - apt-get update -y
+    - apt-get install -y libgl1-mesa-glx build-essential
+    - python3 -m venv venv
+    - source venv/bin/activate
+    - pip install -U pip wheel setuptools
+    - pip install torch==2.0.0 torchvision==0.15.1 --index-url https://download.pytorch.org/whl/cpu
+    - bash scripts/install.sh --no-weights --cpu -m "detectron2,yolox,segment_anything,jde"
+    - pip install -e .[dev,cpu]
+  script:
+    - pytest
+  tags:
+    - docker
 
 ruff-format:
   stage: static-analysis

scripts/patches/0002-detectron2-setup-defer-torch-import.patch

@@ -1,6 +1,10 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -7,13 +7,9 @@
+@@ -4,14 +4,20 @@
+ import glob
+ import os
+ import shutil
++import sys
  from os import path
  from setuptools import find_packages, setup
  from typing import List
@@ -10,31 +14,57 @@
 
 -torch_ver = [int(x) for x in torch.__version__.split(".")[:2]]
 -assert torch_ver >= [1, 8], "Requires PyTorch >= 1.8"
++
++
++def _get_torch_version():
++    import torch
++    return [int(x) for x in torch.__version__.split(".")[:2]]
++
++
++def _get_build_ext_class():
++    try:
++        from torch.utils.cpp_extension import BuildExtension
++        return BuildExtension
++    except ImportError:
++        return type('DummyBuildExt', (), {'run': lambda self: None})
 
 -
  def get_version():
-     init_py_path = path.join(path.abspath(path.dirname(__file__)), "detectron2", "__init__.py")
-     init_py = open(init_py_path, "r").readlines()
-@@ -38,6 +34,15 @@
+@@ -38,6 +44,21 @@ def get_version():
 
 
  def get_extensions():
++    # Skip extension building during build requirements detection
++    # This is called by setuptools even when just determining build requirements
++    if any(arg in sys.argv for arg in ['egg_info', 'dist_info', '--help-commands', '--name', '--version']):
++        return []
++    
++    # Import torch only when actually building extensions
 +    try:
 +        import torch
 +        from torch.utils.cpp_extension import CUDA_HOME, CppExtension, CUDAExtension
-+        torch_ver = [int(x) for x in torch.__version__.split(".")[:2]]
++        torch_ver = _get_torch_version()
 +        assert torch_ver >= [1, 8], "Requires PyTorch >= 1.8"
 +    except ImportError:
-+        # Return empty extensions list if torch is not available during build requirements detection
 +        return []
-+
++    except Exception:
++        return []
++    
      this_dir = path.dirname(path.abspath(__file__))
      extensions_dir = path.join(this_dir, "detectron2", "layers", "csrc")
 
-@@ -204,5 +209,5 @@
+@@ -204,9 +225,6 @@ setup(
          ],
      },
      ext_modules=get_extensions(),
 -    cmdclass={"build_ext": torch.utils.cpp_extension.BuildExtension},
-+    cmdclass={"build_ext": lambda dist: __import__('torch.utils.cpp_extension', fromlist=['BuildExtension']).BuildExtension(dist)},
++    cmdclass={"build_ext": _get_build_ext_class()},
  )
+-
+-
+-def _get_build_ext_class():
+-    try:
+-        from torch.utils.cpp_extension import BuildExtension
+-        return BuildExtension
+-    except ImportError:
+-        return type('DummyBuildExt', (), {'run': lambda self: None})