Merge branch 'openxrlab:main' into dev_nerf_viewer

WYK96 · web-flow · commit a6ceb3855586 · 2023-04-27T14:45:25.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ concurrency:
 
 jobs:
   build_cpp:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash -l {0}
@@ -54,7 +54,7 @@ jobs:
           cd build
           wget -q https://openxrlab-share-mainland.oss-cn-hangzhou.aliyuncs.com/xrprimer/xrprimer.tar.gz
           tar -xzf xrprimer.tar.gz && rm xrprimer.tar.gz
-          ln -sfn xrprimer/test test
+          ln -sfn xrprimer/tests tests
       - name: Run unittests
         run: |
           source /root/miniconda3/etc/profile.d/conda.sh && conda activate openxrlab
@@ -75,7 +75,7 @@ jobs:
           # gcovr ${coverage_filter} -r . --object-directory=${CI_PROJECT_DIR}/build
 
   build_py38:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash -l {0}
@@ -103,7 +103,7 @@ jobs:
           cd python/tests
           wget -q https://openxrlab-share-mainland.oss-cn-hangzhou.aliyuncs.com/xrprimer/xrprimer.tar.gz
           tar -xzf xrprimer.tar.gz && rm xrprimer.tar.gz
-          mv xrprimer/test/data ./
+          mv xrprimer/tests/data ./
           rm -rf xrprimer && cd ../../
       - name: Install pytest plugin
         run: |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   lint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.8
diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -1,25 +1,30 @@
 name: deploy
 
-on: push
+on:
+  push:
+    branches:
+      - 'publish*'
+    tags:
+      - 'v*'
 
 jobs:
   build-n-publish:
-    runs-on: ubuntu-18.04
-    if: startsWith(github.event.ref, 'refs/tags')
+    runs-on: ubuntu-22.04
     container:
-      image: openxrlab/xrprimer_ci:manylinux2014_x86_64_torch180_mmcv150
+      image: openxrlab/xrprimer_ci:manylinux2014_x86_64_torch1110_mmcv170
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
     steps:
       - uses: actions/checkout@v2
       - name: Build XRPrimer
         run: |
-          source /workspace/init_env.sh && conda activate py-${{ matrix.python-version }}
+          source /opt/miniconda/etc/profile.d/conda.sh && conda activate py-${{ matrix.python-version }}
           conan remote add openxrlab http://conan.openxrlab.org.cn/artifactory/api/conan/openxrlab
-          python setup.py sdist bdist_wheel
+          python setup.py bdist_wheel
       - name: Publish distribution to PyPI
         run: |
-          source /workspace/init_env.sh && conda activate py-${{ matrix.python-version }}
-          twine --h
-          twine upload dist/* -u __token__ -p ${{ secrets.PYPI_PASSWORD }}
+          for i in $( ls dist/*-linux_x86_64.whl ); do auditwheel repair $i; done
+          du -sh wheelhouse/*
+          for i in $( ls wheelhouse/*.whl ); do auditwheel show $i; done
+          twine upload wheelhouse/* -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }}
diff --git a/.gitignore b/.gitignore
@@ -507,3 +507,4 @@ inbox/*
 doxygen/
 3rdparty
 build_*/
+/wheelhouse
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-exclude: .*/test/data/|.clang-format|(tests/catch.hpp)
+exclude: .*/tests/data/|.clang-format|(tests/catch.hpp)
 repos:
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v14.0.1
@@ -28,7 +28,7 @@ repos:
     hooks:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
-        exclude: .*/test/data/
+        exclude: .*/tests/data/
       - id: check-yaml
       - id: end-of-file-fixer
       - id: requirements-txt-fixer
diff --git a/cpp/tests/test_calibrator.cpp b/cpp/tests/test_calibrator.cpp
@@ -9,9 +9,9 @@
 TEST_CASE("test_calibrator", "MultiPinholeCamera") {
 
     const std::string images_folder =
-        "test/data/calib_pinhole_camera/input/images/";
+        "tests/data/calib_pinhole_camera/input/images/";
     const std::string config_folder =
-        "test/data/calib_pinhole_camera/input/config/";
+        "tests/data/calib_pinhole_camera/input/config/";
 
     std::vector<std::string> image_files;
     FileSysUtilsFindFilesInPath(images_folder, image_files);
diff --git a/cpp/tests/test_multi_camera_calibrator.py b/cpp/tests/test_multi_camera_calibrator.py
@@ -12,8 +12,8 @@
     }
 """
 
-image_folder = 'test/data/calib_pinhole_camera/input/images/'
-camera_folder = 'test/data/calib_pinhole_camera/input/config/'
+image_folder = 'tests/data/calib_pinhole_camera/input/images/'
+camera_folder = 'tests/data/calib_pinhole_camera/input/config/'
 
 if __name__ == '__main__':
 
diff --git a/dockerfiles/publish_manylinux/Dockerfile b/dockerfiles/publish_manylinux/Dockerfile
@@ -0,0 +1,49 @@
+#Download base image pypa/manylinux2014_x86_64
+FROM quay.io/pypa/manylinux2014_x86_64:latest
+
+# Install wget
+RUN yum install wget atlas-devel \
+    lapack-devel blas-devel \
+    zlib \
+    -y && \
+    yum clean all
+# Install miniconda
+RUN wget -q \
+    https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh \
+    && bash Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda \
+    && rm -f Miniconda3-latest-Linux-x86_64.sh
+
+# Prepare shared env
+RUN . /opt/miniconda/etc/profile.d/conda.sh && \
+    conda activate base && \
+    pip install conan==1.51.1 && \
+    pip install twine && \
+    pip cache purge
+RUN . /opt/miniconda/etc/profile.d/conda.sh && \
+    conda activate base && \
+    conda install cmake && \
+    conda clean --all
+
+# Link binaries to somewhere included in PATH
+RUN ln -s /opt/miniconda/bin/conan /opt/rh/devtoolset-10/root/usr/bin/conan && \
+    ln -s /opt/miniconda/bin/twine /opt/rh/devtoolset-10/root/usr/bin/twine && \
+    ln -s /opt/miniconda/bin/cmake /opt/rh/devtoolset-10/root/usr/bin/cmake
+
+# Update in bashrc
+RUN echo "source /opt/miniconda/etc/profile.d/conda.sh" >> /root/.bashrc && \
+    echo "conda deactivate" >> /root/.bashrc
+
+ARG MMCV_VER
+ARG TORCH_VER
+ARG TORCHV_VER
+# Install py-3.6, py-3.7, py-3.8, py-3.9, py-3.10
+RUN . /opt/miniconda/etc/profile.d/conda.sh && \
+    for i in 6 7 8 9 10; do \
+        conda create -n "py-3.$i" python="3.$i" -y && \
+        conda activate "py-3.$i" && \
+        pip install --upgrade pip setuptools wheel && \
+        pip install torch==$TORCH_VER torchvision==$TORCHV_VER && \
+        pip install mmcv==$MMCV_VER && \
+        pip cache purge && \
+        conda clean --all; \
+    done
diff --git a/dockerfiles/publish_manylinux/build_publish_docker.sh b/dockerfiles/publish_manylinux/build_publish_docker.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+MMCV_VER=1.7.0
+TORCH_VER=1.11.0
+TORCHV_VER=0.12.0
+MMCV_VER_DIGIT=${MMCV_VER//./}
+TORCH_VER_DIGIT=${TORCH_VER//./}
+TAG="openxrlab/xrprimer_ci:manylinux2014_x86_64_torch${TORCH_VER_DIGIT}_mmcv${MMCV_VER_DIGIT}"
+echo "tag to build: $TAG"
+BUILD_ARGS="--build-arg MMCV_VER=${MMCV_VER} --build-arg TORCH_VER=${TORCH_VER} --build-arg TORCHV_VER=${TORCHV_VER}"
+# build according to Dockerfile
+docker build -t $TAG -f dockerfiles/publish_manylinux/Dockerfile $BUILD_ARGS --progress=plain .
diff --git a/python/xrprimer/calibration/mview_fisheye_calibrator.py b/python/xrprimer/calibration/mview_fisheye_calibrator.py
@@ -192,6 +192,7 @@ def __prepare_undistorted_frames__(
                 distorted_cam=fisheye_param_list[view_idx],
                 image_array=sview_img_arr)
             pinhole_param_list.append(pinhole_param)
+            sview_img_list = [img_arr for img_arr in undist_img_arr]
             for img, frame_idx in zip(sview_img_list, sview_idx_list):
                 path = os.path.join(
                     self.work_dir,
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal=1
-
 [aliases]
 test=pytest
 
diff --git a/setup.py b/setup.py
@@ -62,8 +62,8 @@ def parse_version_from_file(filepath):
 # If you need multiple extensions, see scikit-build.
 class CMakeExtension(Extension):
 
-    def __init__(self, name, sourcedir=''):
-        Extension.__init__(self, name, sources=[])
+    def __init__(self, name, sourcedir='', **kwargs):
+        Extension.__init__(self, name, sources=[], **kwargs)
         self.sourcedir = os.path.abspath(sourcedir)
 
 
@@ -186,8 +186,8 @@ def build_extension(self, ext):
         # cpp/pybind/CMakeList.txt, thus we also set build_lib explicitly,
         # where self.build_lib is the directory for compiled extension modules
         build_temp = self.build_temp
-        self.build_lib = os.path.join(build_temp, 'lib')
-        clean_cmake(folders=['_deps', '_exts', self.build_temp])
+        self.cmake_output_lib = os.path.join(build_temp, 'lib')
+        clean_cmake(folders=['build_deps', self.build_temp])
 
         # Build external from pre-built libs by default
         ret = os.system('conan remote list | grep xrlab')
@@ -196,13 +196,27 @@ def build_extension(self, ext):
         else:
             prebuilt_args = '-D3RT_FROM_LOCAL=ON'
 
+        # Ensure temp dir exists
+        os.makedirs(build_temp, exist_ok=True)
         # get external
-        subprocess.check_call(['cmake', '-S.', '-B', '_deps', prebuilt_args] +
-                              cmake_args)
-        subprocess.check_call(['cmake', '--build', '_deps'])
+        subprocess.check_call(
+            ['cmake', '-S.', '-B', 'build_deps', prebuilt_args] + cmake_args)
+        subprocess.check_call(['cmake', '--build', 'build_deps'])
         # build project
         subprocess.check_call(['cmake', '-S.', '-B', build_temp] + cmake_args)
         subprocess.check_call(['cmake', '--build', build_temp] + build_args)
+        # Move from build temp to final position
+        for ext in self.extensions:
+            self.copy_output(ext)
+
+    def copy_output(self, ext):
+        src_path = os.path.join(self.cmake_output_lib,
+                                self.get_ext_filename(ext.name))
+        dst_path = os.path.join(self.build_lib,
+                                self.get_ext_filename(ext.name))
+        # Ensure dst dir exists
+        os.makedirs(self.build_lib, exist_ok=True)
+        self.copy_file(src_path, dst_path)
 
 
 def readme():
@@ -293,10 +307,12 @@ def gen_packages_items():
     author='OpenXRLab',
     author_email='openxrlab@pjlab.org.cn',
     keywords='xrprimer',
-    url='https://github.com/openxrlab/xrprimer/',
-    package_dir={'': PACKAGE_DIR},
+    project_urls={
+        'Documentation': 'https://xrprimer.readthedocs.io/en/latest/',
+        'Source': 'https://github.com/openxrlab/xrprimer/',
+    },
     packages=PACKAGES,
-    include_package_data=True,
+    package_dir={'': PACKAGE_DIR},
     classifiers=[
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: Apache Software License',
@@ -309,8 +325,9 @@ def gen_packages_items():
         'Programming Language :: Python :: 3.10',
     ],
     license='Apache License 2.0',
+    python_requires='>=3.6, <=3.10',
     tests_require=parse_requirements('requirements/test.txt'),
     install_requires=parse_requirements('requirements/runtime.txt'),
-    ext_modules=[CMakeExtension('xrprimer_cpp')],
+    ext_modules=[CMakeExtension(name='xrprimer_cpp', )],
     cmdclass={'build_ext': CMakeBuild},
     zip_safe=False)

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`	`}`
`13`	`13`	`"""`
`14`	`14`
`15`		`-image_folder = 'test/data/calib_pinhole_camera/input/images/'`
`16`		`-camera_folder = 'test/data/calib_pinhole_camera/input/config/'`
	`15`	`+image_folder = 'tests/data/calib_pinhole_camera/input/images/'`
	`16`	`+camera_folder = 'tests/data/calib_pinhole_camera/input/config/'`
`17`	`17`
`18`	`18`	`if __name__ == '__main__':`
`19`	`19`