Fix release ci GitHub

.github/workflows/build_wheels.yml

@@ -19,11 +19,9 @@ jobs:
     strategy:
       matrix:
         py_ver_prefix: [cp36, cp37, cp38, cp39, cp310]
-        linux_arch: [x86_64, i686, aarch64, s390x, ppc64le] #the maximum timeout of a job is 360 minutes, which is easy to time out, so we compile different system architectures separately.
+        linux_arch: [x86_64, aarch64, s390x, ppc64le] #the maximum timeout of a job is 360 minutes, which is easy to time out, so we compile different system architectures separately.
         device: [cpu, gpu]
         exclude:
-          - linux_arch: i686
-            device: gpu
           - linux_arch: aarch64
             device: gpu
           - linux_arch: s390x
@@ -80,11 +78,10 @@ jobs:
         #CIBW_MANYLINUX_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_manylinux2014_aarch64_shared_python:latest
         #CIBW_MANYLINUX_PPC64LE_IMAGE: ghcr.io/${{ github.repository }}_manylinux2014_ppc64le_shared_python:latest
         #CIBW_MANYLINUX_S390X_IMAGE: ghcr.io/${{ github.repository }}_manylinux2014_s390x_shared_python:latest
-        CIBW_MANYLINUX_X86_64_IMAGE: smartbrave/manylinux2014_x86_64_shared_python:latest
-        CIBW_MANYLINUX_I686_IMAGE: smartbrave/manylinux2014_i686_shared_python:latest
-        CIBW_MANYLINUX_AARCH64_IMAGE: smartbrave/manylinux2014_aarch64_shared_python:latest
-        CIBW_MANYLINUX_PPC64LE_IMAGE: smartbrave/manylinux2014_ppc64le_shared_python:latest
-        CIBW_MANYLINUX_S390X_IMAGE: smartbrave/manylinux2014_s390x_shared_python:latest
+        CIBW_MANYLINUX_X86_64_IMAGE: babitmf/manylinux_2_28_x86_64_shared_python:latest
+        CIBW_MANYLINUX_AARCH64_IMAGE: babitmf/manylinux_2_28_aarch64_shared_python:latest
+        CIBW_MANYLINUX_PPC64LE_IMAGE: babitmf/manylinux_2_28_ppc64le_shared_python:latest
+        CIBW_MANYLINUX_S390X_IMAGE: babitmf/manylinux_2_28_s390x_shared_python:latest
         CIBW_BEFORE_ALL_LINUX: >
           (./scripts/build_ffmpeg.sh --device=${{ matrix.device }})
         CIBW_REPAIR_WHEEL_COMMAND_LINUX:

.github/workflows/release.yml

@@ -28,10 +28,6 @@ jobs:
             arch: x86_64
             py_ver_prefix: cp39
             device: gpu
-          - os: ubuntu-20.04
-            arch: i686
-            py_ver_prefix: cp39
-            device: cpu
           - os: ubuntu-20.04
             arch: aarch64
             py_ver_prefix: cp39
@@ -91,11 +87,11 @@ jobs:
       if: runner.os == 'Linux'
       run: |
         tmp_file=$(mktemp -p .)
-        echo "FROM smartbrave/manylinux2014_${{ matrix.arch }}_shared_python" >>${tmp_file}
+        echo "FROM babitmf/manylinux_2_28_${{ matrix.arch }}_shared_python" >>${tmp_file}
         echo "RUN yum -y install binutils-devel openssl-devel" >>${tmp_file}
         echo "WORKDIR /root" >>${tmp_file}
-        echo "ENV PATH=\${PATH}:/opt/python/cp39-cp39/bin" >>${tmp_file}
-        echo "ENV LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:/opt/python/cp39-cp39/lib" >>${tmp_file}
+        echo "ENV PATH=/opt/python/cp39-cp39/bin:\${PATH}" >>${tmp_file}
+        echo "ENV LD_LIBRARY_PATH=/opt/python/cp39-cp39/lib:\${LD_LIBRARY_PATH}" >>${tmp_file}
         echo "ENV GITHUB_ACTIONS=${GITHUB_ACTIONS}" >>${tmp_file}
         if [ "${{ matrix.device }}" == "gpu" ]; then
           echo "ENV CUDA_PATH=/usr/local/cuda" >>${tmp_file}

CMakeLists.txt

@@ -47,7 +47,12 @@ list(GET VERSION_LIST 2 BMF_VERSION_PATCH)
 
 
 ### general settings
-set(CMAKE_CXX_STANDARD 20)
+if(WIN32)
+    set(CMAKE_CXX_STANDARD 20)
+else()
+    set(CMAKE_CXX_STANDARD 17)
+endif()
+
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 

bmf/demo/face_detect/facedetect_demo_colab.ipynb

@@ -54,7 +54,6 @@
         "%cd ..\n",
         "!rm -rf python uff graphsurgeon onnx_graphsurgeon\n",
         "%cd /content\n",
-        "!pip install tensorrt --force-reinstall\n",
         "%env LIBRARY_PATH=/usr/local/cuda/lib64/stubs:/content/trt/TensorRT-8.6.1.6/lib\n",
         "%env LD_LIBRARY_PATH=/content/trt/TensorRT-8.6.1.6/lib:/usr/lib64-nvidia:/content/trt/TensorRT-8.6.1.6/lib\n",
         "%env PATH=/opt/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/tools/node/bin:/tools/google-cloud-sdk/bin:/content/trt/TensorRT-8.6.1.6/bin"
@@ -179,6 +178,8 @@
       },
       "outputs": [],
       "source": [
+        "%%writefile /content/trt_face_detect.py\n",
+        "\n",
         "import tensorrt as trt\n",
         "import torch\n",
         "import torch.nn.functional as F\n",
@@ -529,6 +530,8 @@
       },
       "outputs": [],
       "source": [
+        "%%writefile /content/trt.py\n",
+        "\n",
         "import sys\n",
         "import torch\n",
         "import numpy as np\n",
@@ -552,7 +555,7 @@
         "            \"input_shapes\": {\n",
         "                \"input\": [1, 3, 480, 640]\n",
         "            }\n",
-        "        }, entry=\"__main__.trt_face_detect\").encode(\n",
+        "        }).encode(\n",
         "        None, {\n",
         "            \"output_path\": \"./trt_out.mp4\",\n",
         "            \"video_params\": {\n",
@@ -566,6 +569,17 @@
         "    main()\n"
       ]
     },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "PkEp8bKrAXQX"
+      },
+      "outputs": [],
+      "source": [
+        "!python3 trt.py"
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {