fix prebuild workflow ()

pull/2122/head
RunningLeon 2023-05-23 17:38:26 +08:00 committed by GitHub
parent faa9139690
commit bd7117c9c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 4 deletions
.github/workflows
tools/package_tools

View File

@ -7,10 +7,19 @@ on:
paths:
- "mmdeploy/version.py"
workflow_dispatch:
inputs:
run:
description: 'Manually start pre-build workflow'
required: false
type: boolean
default: false
permissions: write-all
jobs:
linux_build:
if: inputs.run == true || ${{ github.event_name == 'push' }}
runs-on: [self-hosted, linux-3090]
container:
image: openmmlab/mmdeploy:manylinux2014_x86_64-cuda11.3
@ -58,6 +67,7 @@ jobs:
cp -r pack/* /__w/mmdeploy/prebuild/$OUTPUT_DIR
linux_build_cxx11abi:
if: inputs.run == true || ${{ github.event_name == 'push' }}
runs-on: [self-hosted, linux-3090]
container:
image: openmmlab/mmdeploy:build-ubuntu16.04-cuda11.3
@ -95,6 +105,7 @@ jobs:
cp -r pack/* /__w/mmdeploy/prebuild/$OUTPUT_DIR
linux_test:
if: inputs.run == true || ${{ github.event_name == 'push' }}
runs-on: [self-hosted, linux-3090]
needs:
- linux_build
@ -124,6 +135,7 @@ jobs:
bash $GITHUB_WORKSPACE/tools/package_tools/test/test_sdk.sh
linux_upload:
if: inputs.run == true || ${{ github.event_name == 'push' }}
runs-on: [self-hosted, linux-3090]
environment: 'prod'
needs: linux_test
@ -164,6 +176,7 @@ jobs:
windows_build:
if: inputs.run == true || ${{ github.event_name == 'push' }}
runs-on: [self-hosted, win10-3080]
steps:
- name: Checkout repository
@ -209,6 +222,7 @@ jobs:
Move-Item pack/* "D:/DEPS/ciartifact/$env:OUTPUT_DIR"
windows_test:
if: inputs.run == true || ${{ github.event_name == 'push' }}
runs-on: [self-hosted, win10-3080]
needs: windows_build
steps:
@ -234,6 +248,7 @@ jobs:
& "$env:GITHUB_WORKSPACE/tools/package_tools/test/test_sdk.ps1"
windows_upload:
if: inputs.run == true || ${{ github.event_name == 'push' }}
runs-on: [self-hosted, win10-3080]
environment: 'prod'
needs: windows_test

View File

@ -21,6 +21,7 @@ logger.setLevel(logging.INFO)
CUR_DIR = osp.dirname(osp.abspath(__file__))
MMDEPLOY_DIR = osp.abspath(osp.join(CUR_DIR, '../..'))
PACKAGING_DIR = osp.join(CUR_DIR, 'packaging')
VERSION_FILE = osp.join(MMDEPLOY_DIR, 'mmdeploy', 'version.py')
def get_version(version_file):
@ -336,7 +337,7 @@ def create_mmdeploy_runtime(cfg: Dict, work_dir: str):
sdk_python_package_dir = osp.join(work_dir, '.mmdeploy_runtime')
_copy(PACKAGING_DIR, sdk_python_package_dir)
_copy(
osp.join(MMDEPLOY_DIR, 'mmdeploy', 'version.py'),
VERSION_FILE,
osp.join(sdk_python_package_dir, 'mmdeploy_runtime', 'version.py'),
)
@ -385,7 +386,11 @@ def create_mmdeploy_runtime(cfg: Dict, work_dir: str):
libs_to_copy = ['*net.dll', 'mmdeploy.dll']
search_dir = osp.join(MMDEPLOY_DIR, 'build', 'install', 'bin')
elif sys.platform == 'linux':
libs_to_copy = ['*net.so', '*mmdeploy.so.0']
mmdeploy_version = get_version(VERSION_FILE)
mmdeploy_version = version.parse(mmdeploy_version)
libs_to_copy = [
'*net.so', f'*mmdeploy.so.{mmdeploy_version.major}'
]
search_dir = osp.join(MMDEPLOY_DIR, 'build', 'install', 'lib')
else:
raise Exception('unsupported')
@ -425,8 +430,7 @@ def create_sdk(cfg: Dict, work_dir: str):
sdk_root = osp.abspath(osp.join(work_dir, 'sdk'))
build_sdk_name = cfg['BUILD_SDK_NAME']
env_info = check_env(cfg)
version_file = osp.join(MMDEPLOY_DIR, 'mmdeploy', 'version.py')
mmdeploy_version = get_version(version_file)
mmdeploy_version = get_version(VERSION_FILE)
build_sdk_name = build_sdk_name.format(
mmdeploy_v=mmdeploy_version, **env_info)
sdk_path = osp.join(sdk_root, build_sdk_name)