update release build base image from centos7 to Almalinux 8

BabitMF · Jul 31, 2024 · 44622f1 · 44622f1
1 parent 187970d
commit 44622f1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.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:

diff --git a/.github/workflows/release.yml b/.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}

diff --git a/CMakeLists.txt b/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)
 

diff --git a/bmf/hml/CMakeLists.txt b/bmf/hml/CMakeLists.txt
@@ -5,7 +5,11 @@ cmake_policy(SET CMP0077 NEW)
 project(HML CXX C)
 
 ### general settings
-set(CMAKE_CXX_STANDARD 20)
+if(WIN32)
+    set(CMAKE_CXX_STANDARD 20)
+else()
+    set(CMAKE_CXX_STANDARD 17)
+endif()
 
 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
     set(_HMP_MAIN_PROJECT TRUE)

diff --git a/scripts/build_ffmpeg.sh b/scripts/build_ffmpeg.sh
@@ -226,6 +226,14 @@ function install_cuda_linux() {
         add-apt-repository contrib
         apt-get update
         apt-get -y install cuda-toolkit-11-8
+    elif [[ ${NAME} =~ "AlmaLinux" ]] && [[ ${VERSION_ID} == "8.10" ]]
+    then
+        dnf install epel-release -y
+        dnf update -y
+        yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo
+        dnf install kernel-devel -y
+        dnf install cuda-11-8 -y
+
     fi
     export PATH=${PATH}:/usr/local/cuda/bin
     cd -