From 9f696ed773018e6af933ba10bfae7d0e0932a4fa Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 06:21:52 +0000 Subject: [PATCH 01/12] test --- .github/workflows/manually_build.yml | 13 +++++++---- .github/workflows/nightly_build.yml | 35 +++++++++++++++------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index 24757b19ef6..879acad1e15 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -36,6 +36,7 @@ on: required: true default: '2.1.0-SNAPSHOT' type: string + push: env: TAG: ${{ inputs.tag }} @@ -225,14 +226,16 @@ jobs: sudo docker rmi -f ${image}:${TAG} 10.239.45.10/arda/${image}:${TAG} ${image}:latest ipex-llm-cpu: - if: ${{ inputs.artifact == 'ipex-llm-cpu' || inputs.artifact == 'all' }} - runs-on: [self-hosted, Shire] + # if: ${{ inputs.artifact == 'ipex-llm-cpu' || inputs.artifact == 'all' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # actions/checkout@v3 - - name: docker login - run: | - docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD} + # - name: docker login + # run: | + # docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD} + - name: Log in to Docker Hub + run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - name: ipex-llm-cpu run: | echo "##############################################################" diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 3d667443024..41b2dd3b271 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -1,7 +1,7 @@ name: Nightly Build on: - # pull_request: + push: # branches: [ main ] # paths: # - '.github/workflows/nightly_build.yml' @@ -17,14 +17,14 @@ permissions: jobs: - llm-cpp-build: - uses: ./.github/workflows/llm-binary-build.yml + # llm-cpp-build: + # uses: ./.github/workflows/llm-binary-build.yml ipex-llm-build: # python build can only be published once a day, please do not publish it manually - if: ${{ github.event.schedule || github.event_name == 'workflow_dispatch' }} - runs-on: [self-hosted, Bree] - needs: llm-cpp-build + # if: ${{ github.event.schedule || github.event_name == 'workflow_dispatch' }} + runs-on: ubuntu-latest + # needs: llm-cpp-build steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # actions/checkout@v3 @@ -40,13 +40,16 @@ jobs: pip install wheel pip install twine - - name: Download llm binary - uses: ./.github/actions/llm/download-llm-binary + # - name: Download llm binary + # uses: ./.github/actions/llm/download-llm-binary - name: Build package + env: + TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} + TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} run: | - export TIMESTAMP=`date '+%Y%m%d'` - # export TIMESTAMP=20240323 + # export TIMESTAMP=`date '+%Y%m%d'` + export TIMESTAMP=20240102 export PYPI_VERSION=2.1.0 nb_version=${PYPI_VERSION}b${TIMESTAMP} echo ${nb_version} @@ -57,9 +60,9 @@ jobs: ## linux ## bash python/llm/dev/release_default_linux.sh ${nb_version} true - docker-build: - if: ${{ github.event.schedule }} - uses: ./.github/workflows/manually_build.yml - with: - artifact: all - tag: 2.1.0-SNAPSHOT + # docker-build: + # if: ${{ github.event.schedule }} + # uses: ./.github/workflows/manually_build.yml + # with: + # artifact: all + # tag: 2.1.0-SNAPSHOT From c33ad263e435f4a94d65b6b58026de0d27169610 Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 06:29:28 +0000 Subject: [PATCH 02/12] update --- .github/workflows/manually_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index 879acad1e15..f73c83423ce 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -235,7 +235,7 @@ jobs: # run: | # docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD} - name: Log in to Docker Hub - run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin + run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - name: ipex-llm-cpu run: | echo "##############################################################" From e0cfea89a77f9cc0ab4cdb52cf8904b1f0f1a04d Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 06:40:48 +0000 Subject: [PATCH 03/12] update --- .github/workflows/manually_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index f73c83423ce..879acad1e15 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -235,7 +235,7 @@ jobs: # run: | # docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD} - name: Log in to Docker Hub - run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin + run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - name: ipex-llm-cpu run: | echo "##############################################################" From 8329667d100baf93561a72d8f980f124ce397cf4 Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 06:43:11 +0000 Subject: [PATCH 04/12] update --- .github/workflows/manually_build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index 879acad1e15..ef37e3cbca9 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -235,7 +235,7 @@ jobs: # run: | # docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD} - name: Log in to Docker Hub - run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin + run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u intelanalytics --password-stdin - name: ipex-llm-cpu run: | echo "##############################################################" @@ -245,13 +245,10 @@ jobs: cd docker/llm/inference/cpu/docker sudo docker build \ --no-cache=true \ - --build-arg http_proxy=${HTTP_PROXY} \ - --build-arg https_proxy=${HTTPS_PROXY} \ - --build-arg no_proxy=${NO_PROXY} \ -t ${image}:${TAG} -f ./Dockerfile . sudo docker push ${image}:${TAG} sudo docker tag ${image}:${TAG} 10.239.45.10/arda/${image}:${TAG} - sudo docker push 10.239.45.10/arda/${image}:${TAG} + # sudo docker push 10.239.45.10/arda/${image}:${TAG} # tag 'latest' sudo docker tag ${image}:${TAG} ${image}:latest sudo docker push ${image}:latest From d8d41128fa20fd4a31e772574c1152653bddfc65 Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 06:50:27 +0000 Subject: [PATCH 05/12] update --- .github/workflows/manually_build.yml | 1 + .github/workflows/nightly_build.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index ef37e3cbca9..cab2bc29ef4 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -242,6 +242,7 @@ jobs: echo "####### ipex-llm-cpu ########" echo "##############################################################" export image=intelanalytics/ipex-llm-cpu + export TAG=latest cd docker/llm/inference/cpu/docker sudo docker build \ --no-cache=true \ diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 41b2dd3b271..3b87550afbc 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -47,6 +47,7 @@ jobs: env: TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} + SOURCEFORGE_PW: ${{ secrets.SOURCEFORGE_PW }} run: | # export TIMESTAMP=`date '+%Y%m%d'` export TIMESTAMP=20240102 From 16e6557409a4b9dd8f18fda73c41e2985f39e7e1 Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 06:54:09 +0000 Subject: [PATCH 06/12] update version --- .github/workflows/nightly_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 3b87550afbc..6fc3027fc62 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -50,7 +50,7 @@ jobs: SOURCEFORGE_PW: ${{ secrets.SOURCEFORGE_PW }} run: | # export TIMESTAMP=`date '+%Y%m%d'` - export TIMESTAMP=20240102 + export TIMESTAMP=20240103 export PYPI_VERSION=2.1.0 nb_version=${PYPI_VERSION}b${TIMESTAMP} echo ${nb_version} From ba916fe4ee8cd4a1120ba98e48ea5a091185723b Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 07:02:48 +0000 Subject: [PATCH 07/12] update --- python/llm/dev/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/llm/dev/release.sh b/python/llm/dev/release.sh index 93ca7d57197..d273a815ebe 100644 --- a/python/llm/dev/release.sh +++ b/python/llm/dev/release.sh @@ -74,10 +74,10 @@ if [ ${upload} == true ]; then # upload to pypi upload_to_pypi_command="twine upload dist/ipex_llm-${ipex_llm_version}-*-${verbose_pname}.whl" echo "Please manually upload with this command: $upload_to_pypi_command" - $upload_to_pypi_command + # $upload_to_pypi_command # upload to sourceforge - rsync -avzr -e \ + rsync -avzr -e --verbose \ "sshpass -p '${SOURCEFORGE_PW}' ssh -o StrictHostKeyChecking=no" \ ./dist/ipex_llm-${ipex_llm_version}-*-${verbose_pname}.whl \ intelanalytics@frs.sourceforge.net:/home/frs/project/analytics-zoo/ipex-llm-whl/ipex-llm/${ipex_llm_version}/ From 63fee7a172e4766904ac8f600c76eba7468d6d14 Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 07:33:27 +0000 Subject: [PATCH 08/12] update --- .github/workflows/manually_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index cab2bc29ef4..bd71f4a5030 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -247,6 +247,7 @@ jobs: sudo docker build \ --no-cache=true \ -t ${image}:${TAG} -f ./Dockerfile . + docker login sudo docker push ${image}:${TAG} sudo docker tag ${image}:${TAG} 10.239.45.10/arda/${image}:${TAG} # sudo docker push 10.239.45.10/arda/${image}:${TAG} From e5ac6f84aaffd967421e43ec0ee6a820ec662143 Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 08:13:24 +0000 Subject: [PATCH 09/12] test --- .github/workflows/manually_build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index bd71f4a5030..bd7cbf50ea7 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -242,12 +242,13 @@ jobs: echo "####### ipex-llm-cpu ########" echo "##############################################################" export image=intelanalytics/ipex-llm-cpu - export TAG=latest + export TAG=test cd docker/llm/inference/cpu/docker sudo docker build \ --no-cache=true \ -t ${image}:${TAG} -f ./Dockerfile . docker login + docker images sudo docker push ${image}:${TAG} sudo docker tag ${image}:${TAG} 10.239.45.10/arda/${image}:${TAG} # sudo docker push 10.239.45.10/arda/${image}:${TAG} From 178fd5ff0246ae6baa7861f9d89049004de75c40 Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 08:27:09 +0000 Subject: [PATCH 10/12] test --- .github/workflows/manually_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index bd7cbf50ea7..b98a0dc96a9 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -241,6 +241,7 @@ jobs: echo "##############################################################" echo "####### ipex-llm-cpu ########" echo "##############################################################" + docker push intelanalytics/ipex-llm-cpu:test export image=intelanalytics/ipex-llm-cpu export TAG=test cd docker/llm/inference/cpu/docker From f53971dafbb629d9e34ae8018ae1fd6e806aba38 Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 08:28:21 +0000 Subject: [PATCH 11/12] test --- .github/workflows/manually_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index b98a0dc96a9..05cdb478c41 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -241,6 +241,7 @@ jobs: echo "##############################################################" echo "####### ipex-llm-cpu ########" echo "##############################################################" + docker pull intelanalytics/ipex-llm-cpu:test docker push intelanalytics/ipex-llm-cpu:test export image=intelanalytics/ipex-llm-cpu export TAG=test From 04d73aa455c28cdf5201229e5cff8f31fee131e5 Mon Sep 17 00:00:00 2001 From: liu-shaojun Date: Fri, 28 Jun 2024 08:33:03 +0000 Subject: [PATCH 12/12] test --- .github/workflows/manually_build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index 05cdb478c41..fabf4dbb0f0 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -241,23 +241,23 @@ jobs: echo "##############################################################" echo "####### ipex-llm-cpu ########" echo "##############################################################" - docker pull intelanalytics/ipex-llm-cpu:test - docker push intelanalytics/ipex-llm-cpu:test + # docker pull intelanalytics/ipex-llm-cpu:test + # docker push intelanalytics/ipex-llm-cpu:test export image=intelanalytics/ipex-llm-cpu export TAG=test cd docker/llm/inference/cpu/docker - sudo docker build \ + docker build \ --no-cache=true \ -t ${image}:${TAG} -f ./Dockerfile . docker login docker images - sudo docker push ${image}:${TAG} - sudo docker tag ${image}:${TAG} 10.239.45.10/arda/${image}:${TAG} - # sudo docker push 10.239.45.10/arda/${image}:${TAG} + docker push ${image}:${TAG} + docker tag ${image}:${TAG} 10.239.45.10/arda/${image}:${TAG} + # docker push 10.239.45.10/arda/${image}:${TAG} # tag 'latest' - sudo docker tag ${image}:${TAG} ${image}:latest - sudo docker push ${image}:latest - sudo docker rmi -f ${image}:${TAG} 10.239.45.10/arda/${image}:${TAG} ${image}:latest + docker tag ${image}:${TAG} ${image}:latest + docker push ${image}:latest + docker rmi -f ${image}:${TAG} 10.239.45.10/arda/${image}:${TAG} ${image}:latest ipex-llm-serving-xpu: if: ${{ inputs.artifact == 'ipex-llm-serving-xpu' || inputs.artifact == 'all' }}