From af4f00a66a187d6a1257d23de14d521c2d7d8d1b Mon Sep 17 00:00:00 2001 From: Michael Mi Date: Fri, 21 Jun 2024 11:17:09 -0700 Subject: [PATCH 1/4] fix workflow --- .github/workflows/build_wheel.yml | 2 +- .github/workflows/package_test.yml | 2 +- .github/workflows/release.yml | 6 ++---- .github/workflows/release_test.yml | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index c7b13a31..e794aee0 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -1,4 +1,4 @@ -name: Build wheel for Release +name: Build wheel on: workflow_dispatch: inputs: diff --git a/.github/workflows/package_test.yml b/.github/workflows/package_test.yml index c3e27ddd..ce1d5292 100644 --- a/.github/workflows/package_test.yml +++ b/.github/workflows/package_test.yml @@ -1,4 +1,4 @@ -name: ScaleLLM package test +name: Package test on: workflow_dispatch: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de605985..deef6251 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,10 @@ -name: ScaleLLM Release +name: Release on: # Release scalellm on creation of tags to https://hub.docker.com/r/vectorchai/scalellm # Push events to matching v*, i.e. v1.0.0, v1.0.0-rc1, v20.15.10-rc5, etc. push: tags: - v[0-9]+.[0-9]+.[0-9]+* - branches: - - main jobs: # extract version from tag @@ -17,7 +15,7 @@ jobs: steps: - name: Extract version from tag id: version - run: echo "::set-output name=tag::$(echo ${{ github.ref }} | sed -n 's/refs\/tags\/v//p')" + run: echo "name=tag::$(echo ${{ github.ref }} | sed -n 's/refs\/tags\/v//p')" >> $GITHUB_OUTPUT # Run tests on release release-test: diff --git a/.github/workflows/release_test.yml b/.github/workflows/release_test.yml index c330a4de..4e225749 100644 --- a/.github/workflows/release_test.yml +++ b/.github/workflows/release_test.yml @@ -25,8 +25,7 @@ jobs: steps: - name: Install toolkits run: | - sudo apt-get install -y build-essential ninja-build bison gcc-12 g++-12 libunwind-dev python3-dev libboost-all-dev ccache - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 10 --slave /usr/bin/g++ g++ /usr/bin/g++-12 + sudo apt-get install -y build-essential ninja-build bison ccache - name: Show gcc version run: gcc --version From f299acc4eee9d6db00d5cb28994001e6a9f63444 Mon Sep 17 00:00:00 2001 From: Michael Mi Date: Fri, 21 Jun 2024 11:18:03 -0700 Subject: [PATCH 2/4] update --- .github/workflows/package_test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/package_test.yml b/.github/workflows/package_test.yml index ce1d5292..52441548 100644 --- a/.github/workflows/package_test.yml +++ b/.github/workflows/package_test.yml @@ -50,8 +50,7 @@ jobs: steps: - name: Install toolkits run: | - sudo apt-get install -y build-essential ninja-build bison gcc-12 g++-12 libunwind-dev python3-dev libboost-all-dev ccache - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 10 --slave /usr/bin/g++ g++ /usr/bin/g++-12 + sudo apt-get install -y build-essential ninja-build bison python3-dev ccache - name: Show gcc version run: gcc --version From e0a449bf2f4de83834bd09e15fccac4c1046cca0 Mon Sep 17 00:00:00 2001 From: Michael Mi Date: Fri, 21 Jun 2024 11:32:27 -0700 Subject: [PATCH 3/4] fix --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index deef6251..d7e3450e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Extract version from tag id: version - run: echo "name=tag::$(echo ${{ github.ref }} | sed -n 's/refs\/tags\/v//p')" >> $GITHUB_OUTPUT + run: echo "tag=$(echo ${{ github.ref }} | sed -n 's/refs\/tags\/v//p')" >> $GITHUB_OUTPUT # Run tests on release release-test: From 1390e8414a03a913225553eb6ec165a1962e20ca Mon Sep 17 00:00:00 2001 From: Michael Mi Date: Fri, 21 Jun 2024 11:47:48 -0700 Subject: [PATCH 4/4] fix typo --- scripts/build_wheel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_wheel.sh b/scripts/build_wheel.sh index 5fa67669..ce6043ee 100755 --- a/scripts/build_wheel.sh +++ b/scripts/build_wheel.sh @@ -28,7 +28,7 @@ export PATH="/opt/python/cp${PYVER}-cp${PYVER}/bin:$PATH" pip install torch==$TORCH_VERSION -i "https://download.pytorch.org/whl/cu${CUDA_VERSION//./}" # install other dependencies -pip install numpy, jinja2 +pip install numpy jinja2 pip install --upgrade setuptools wheel # zero out ccache if ccache is installed