From 8ca324e3c510ca0cf4b54006aca9cfedb7100f74 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Tue, 7 Jun 2022 22:05:23 -0700 Subject: [PATCH 01/26] add rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 80 ++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 .github/workflows/rc-wheel-build.yml diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml new file mode 100644 index 000000000..73b09a42c --- /dev/null +++ b/.github/workflows/rc-wheel-build.yml @@ -0,0 +1,80 @@ +name: TorchArrow RC Build and Test +on: + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + workflow_call: + secrets: + AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: + required: true + AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY: + required: true + +jobs: + linux-container: + runs-on: ubuntu-latest + container: prestocpp/velox-sse-velox-torcharrow:kpai-20220524 + strategy: + fail-fast: false + matrix: + python-version: + - 3.7 + - 3.8 + - 3.9 + steps: + - name: Print CPU info + run: cat /proc/cpuinfo + + - name: Check out source repository + uses: actions/checkout@v2 + with: + ref: release/0.1.0 + submodules: recursive + + - name: Build the wheel + run: | + source /opt/conda/etc/profile.d/conda.sh + BUILD_VERSION=0.1.0 PYTHON_VERSION=${{ matrix.python-version }} CPU_TARGET="sse" packaging/build_wheel.sh + conda activate env${{ matrix.python-version }} + pip install auditwheel + auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 + + - name: Upload Wheels to Github + uses: actions/upload-artifact@v2 + with: + name: torcharrow-artifact + path: dist/torcharrow*.whl + + macos-container: + runs-on: macos-latest + strategy: + fail-fast: false + matrix: + python-version: + - 3.7 + - 3.8 + - 3.9 + steps: + - name: Setup Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - name: Check out source repository + uses: actions/checkout@v2 + with: + ref: release/0.1.0 + submodules: recursive + + - name: Build the wheel + run: | + MACOSX_DEPLOYMENT_TARGET=10.15 CPU_TARGET="sse" ./csrc/velox/velox/scripts/setup-macos.sh + pip install wheel + CPU_TARGET="sse" ./packaging/build_wheel.sh + pip install delocate + delocate-wheel dist/*.whl -w fixed_dist + + - name: Upload Wheels to Github + uses: actions/upload-artifact@v2 + with: + name: torcharrow-artifact + path: dist/torcharrow*.whl From bca4175865628730f64973ef78d5e2c73568fcdf Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Tue, 7 Jun 2022 22:22:42 -0700 Subject: [PATCH 02/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 73b09a42c..ef7e3e3b6 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -2,6 +2,14 @@ name: TorchArrow RC Build and Test on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + + # Use the following to trigger test on a dev PR + pull_request: + branches: + - main + # For PR created by ghstack + - gh/*/*/base + workflow_call: secrets: AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: From 37c3ad8a3314d640ae213dae07c4f1b748e821af Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Tue, 7 Jun 2022 22:31:00 -0700 Subject: [PATCH 03/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index ef7e3e3b6..fa1ebe265 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -3,13 +3,6 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: - # Use the following to trigger test on a dev PR - pull_request: - branches: - - main - # For PR created by ghstack - - gh/*/*/base - workflow_call: secrets: AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: @@ -35,7 +28,7 @@ jobs: - name: Check out source repository uses: actions/checkout@v2 with: - ref: release/0.1.0 + ref: "release/0.1.0" submodules: recursive - name: Build the wheel @@ -70,7 +63,7 @@ jobs: - name: Check out source repository uses: actions/checkout@v2 with: - ref: release/0.1.0 + ref: "release/0.1.0" submodules: recursive - name: Build the wheel From a7c8ec7d1869cd8221e84f5ad05ae1b273637ace Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Tue, 7 Jun 2022 22:31:48 -0700 Subject: [PATCH 04/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index fa1ebe265..9e6ebcaf2 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -3,6 +3,13 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + # Use the following to trigger test on a dev PR + pull_request: + branches: + - main + # For PR created by ghstack + - gh/*/*/base + workflow_call: secrets: AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: From b5535452fc7c8b3bac3bf2a5efd7efa0c602c991 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Wed, 8 Jun 2022 10:45:53 -0700 Subject: [PATCH 05/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 9e6ebcaf2..2de8e1362 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -52,6 +52,13 @@ jobs: name: torcharrow-artifact path: dist/torcharrow*.whl + - name: Install and Test TorchArrow Wheel + shell: bash + env: + PYTHON_VERSION: ${{ matrix.python-version }} + run: | + pip3 install dist/torcharrow*.whl + macos-container: runs-on: macos-latest strategy: @@ -86,3 +93,10 @@ jobs: with: name: torcharrow-artifact path: dist/torcharrow*.whl + + - name: Install and Test TorchArrow Wheel + shell: bash + env: + PYTHON_VERSION: ${{ matrix.python-version }} + run: | + pip3 install dist/torcharrow*.whl From 79ae006414d542ec12d18fe915d9ceaf8b605294 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Wed, 8 Jun 2022 11:09:05 -0700 Subject: [PATCH 06/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 1 + packaging/manylinux/python_helper.sh | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 packaging/manylinux/python_helper.sh diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 2de8e1362..52d62b130 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -57,6 +57,7 @@ jobs: env: PYTHON_VERSION: ${{ matrix.python-version }} run: | + source packaging/manylinux/python_helper.sh pip3 install dist/torcharrow*.whl macos-container: diff --git a/packaging/manylinux/python_helper.sh b/packaging/manylinux/python_helper.sh new file mode 100644 index 000000000..9a9e4ec25 --- /dev/null +++ b/packaging/manylinux/python_helper.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# Copyright (c) Meta Platforms, Inc. and affiliates. +# All rights reserved. +# +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. + +python_nodot="$(echo $PYTHON_VERSION | tr -d '.')" +case $PYTHON_VERSION in + 3.[6-7]*) + DESIRED_PYTHON="cp${python_nodot}-cp${python_nodot}m" + ;; + 3.*) + DESIRED_PYTHON="cp${python_nodot}-cp${python_nodot}" + ;; +esac + +pydir="/opt/python/$DESIRED_PYTHON" +export PATH="$pydir/bin:$PATH" From 0178e695941bf006a863ca3ce4b847816c9d9c51 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Wed, 8 Jun 2022 11:31:50 -0700 Subject: [PATCH 07/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 52d62b130..c5fd478a1 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -46,12 +46,6 @@ jobs: pip install auditwheel auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 - - name: Upload Wheels to Github - uses: actions/upload-artifact@v2 - with: - name: torcharrow-artifact - path: dist/torcharrow*.whl - - name: Install and Test TorchArrow Wheel shell: bash env: @@ -60,6 +54,12 @@ jobs: source packaging/manylinux/python_helper.sh pip3 install dist/torcharrow*.whl + - name: Upload Wheels to Github + uses: actions/upload-artifact@v2 + with: + name: torcharrow-artifact + path: dist/torcharrow*.whl + macos-container: runs-on: macos-latest strategy: @@ -89,15 +89,15 @@ jobs: pip install delocate delocate-wheel dist/*.whl -w fixed_dist - - name: Upload Wheels to Github - uses: actions/upload-artifact@v2 - with: - name: torcharrow-artifact - path: dist/torcharrow*.whl - - name: Install and Test TorchArrow Wheel shell: bash env: PYTHON_VERSION: ${{ matrix.python-version }} run: | pip3 install dist/torcharrow*.whl + + - name: Upload Wheels to Github + uses: actions/upload-artifact@v2 + with: + name: torcharrow-artifact + path: dist/torcharrow*.whl From a566d0010896ea13d0e371c1a2c13bd29e2d3503 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Wed, 8 Jun 2022 22:38:01 -0700 Subject: [PATCH 08/26] rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index c5fd478a1..9e07ef772 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -35,7 +35,7 @@ jobs: - name: Check out source repository uses: actions/checkout@v2 with: - ref: "release/0.1.0" + # ref: "release/0.1.0" submodules: recursive - name: Build the wheel @@ -78,7 +78,7 @@ jobs: - name: Check out source repository uses: actions/checkout@v2 with: - ref: "release/0.1.0" + # ref: "release/0.1.0" submodules: recursive - name: Build the wheel From 675b70217d2693f6e6523f8e719442d0423f3320 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Wed, 8 Jun 2022 23:01:06 -0700 Subject: [PATCH 09/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 9e07ef772..b4f1968f4 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -53,6 +53,9 @@ jobs: run: | source packaging/manylinux/python_helper.sh pip3 install dist/torcharrow*.whl + pip3 install pytest + pip3 install torch + pytest --no-header -v torcharrow/test - name: Upload Wheels to Github uses: actions/upload-artifact@v2 @@ -95,6 +98,9 @@ jobs: PYTHON_VERSION: ${{ matrix.python-version }} run: | pip3 install dist/torcharrow*.whl + pip3 install pytest + pip3 install torch + pytest --no-header -v torcharrow/test - name: Upload Wheels to Github uses: actions/upload-artifact@v2 From 2361b45a76f7971ba8ca9603fe622ec49da06b93 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Wed, 8 Jun 2022 23:22:25 -0700 Subject: [PATCH 10/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index b4f1968f4..ab62ce5eb 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -55,7 +55,7 @@ jobs: pip3 install dist/torcharrow*.whl pip3 install pytest pip3 install torch - pytest --no-header -v torcharrow/test + pytest torcharrow/test/integration - name: Upload Wheels to Github uses: actions/upload-artifact@v2 @@ -100,7 +100,7 @@ jobs: pip3 install dist/torcharrow*.whl pip3 install pytest pip3 install torch - pytest --no-header -v torcharrow/test + pytest torcharrow/test/integration - name: Upload Wheels to Github uses: actions/upload-artifact@v2 From a0450dbd5c71708150b1210d5f43cb84eb17747b Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Thu, 9 Jun 2022 00:12:37 -0700 Subject: [PATCH 11/26] linux build without docker container --- .github/workflows/rc-wheel-build.yml | 168 ++++++++++++++++++++------- 1 file changed, 125 insertions(+), 43 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index ab62ce5eb..7cfbe8646 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -18,9 +18,53 @@ on: required: true jobs: + # linux-container: + # runs-on: ubuntu-latest + # container: prestocpp/velox-sse-velox-torcharrow:kpai-20220524 + # strategy: + # fail-fast: false + # matrix: + # python-version: + # - 3.7 + # - 3.8 + # - 3.9 + # steps: + # - name: Print CPU info + # run: cat /proc/cpuinfo + + # - name: Check out source repository + # uses: actions/checkout@v2 + # with: + # # ref: "release/0.1.0" + # submodules: recursive + + # - name: Build the wheel + # run: | + # source /opt/conda/etc/profile.d/conda.sh + # BUILD_VERSION=0.1.0 PYTHON_VERSION=${{ matrix.python-version }} CPU_TARGET="sse" packaging/build_wheel.sh + # conda activate env${{ matrix.python-version }} + # pip install auditwheel + # auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 + + # - name: Install and Test TorchArrow Wheel + # shell: bash + # env: + # PYTHON_VERSION: ${{ matrix.python-version }} + # run: | + # source packaging/manylinux/python_helper.sh + # pip3 install dist/torcharrow*.whl + # pip3 install pytest + # pip3 install torch + # pytest torcharrow/test/integration + + # - name: Upload Wheels to Github + # uses: actions/upload-artifact@v2 + # with: + # name: torcharrow-artifact + # path: dist/torcharrow*.whl + linux-container: runs-on: ubuntu-latest - container: prestocpp/velox-sse-velox-torcharrow:kpai-20220524 strategy: fail-fast: false matrix: @@ -28,21 +72,59 @@ jobs: - 3.7 - 3.8 - 3.9 + steps: - name: Print CPU info run: cat /proc/cpuinfo + - name: Setup Python environment + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Check out source repository uses: actions/checkout@v2 with: # ref: "release/0.1.0" submodules: recursive + # Based on https://cristianadam.eu/20200113/speeding-up-c-plus-plus-github-actions-using-ccache/ + - name: Prepare ccache timestamp + id: ccache_cache_timestamp + run: | + echo "::set-output name=timestamp::$(/bin/date -u "+%Y%m%d-%H:%M:%S")" + shell: bash + + - name: Load ccache files + uses: actions/cache@v2 + with: + path: .ccache + key: ubuntu-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} + restore-keys: | + ubuntu-ccache- + + - name: Install dependencies with APT + run: | + sudo apt-get update + sudo apt install -y g++ cmake ccache ninja-build checkinstall git \ + libssl-dev libboost-all-dev libdouble-conversion-dev libgoogle-glog-dev \ + libgflags-dev libevent-dev libre2-dev + + # Based on https://github.com/facebookincubator/velox/blob/99429407c3d524e07b32b8b19a03aa7382f819cf/.circleci/config.yml#L114-L116 + - name: Configure ccache + run: | + echo "$GITHUB_WORKSPACE" + CCACHE_DIR=$GITHUB_WORKSPACE/.ccache_root ccache -sz -M 1G + CCACHE_DIR=$GITHUB_WORKSPACE/.ccache ccache -sz -M 1G + + - name: Build and install folly and fmt + # sudo doesn't preserve environment vairable; set it after sudo: https://stackoverflow.com/questions/8633461/how-to-keep-environment-variables-when-using-sudo/33183620#33183620 + run: | + sudo CMAKE_C_COMPILER_LAUNCHER=ccache CPU_TARGET="sse" CMAKE_CXX_COMPILER_LAUNCHER=ccache CCACHE_DIR=$GITHUB_WORKSPACE/.ccache_root scripts/setup-ubuntu.sh + - name: Build the wheel run: | - source /opt/conda/etc/profile.d/conda.sh BUILD_VERSION=0.1.0 PYTHON_VERSION=${{ matrix.python-version }} CPU_TARGET="sse" packaging/build_wheel.sh - conda activate env${{ matrix.python-version }} pip install auditwheel auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 @@ -63,47 +145,47 @@ jobs: name: torcharrow-artifact path: dist/torcharrow*.whl - macos-container: - runs-on: macos-latest - strategy: - fail-fast: false - matrix: - python-version: - - 3.7 - - 3.8 - - 3.9 - steps: - - name: Setup Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + # macos-container: + # runs-on: macos-latest + # strategy: + # fail-fast: false + # matrix: + # python-version: + # - 3.7 + # - 3.8 + # - 3.9 + # steps: + # - name: Setup Python ${{ matrix.python-version }} + # uses: actions/setup-python@v2 + # with: + # python-version: ${{ matrix.python-version }} - - name: Check out source repository - uses: actions/checkout@v2 - with: - # ref: "release/0.1.0" - submodules: recursive + # - name: Check out source repository + # uses: actions/checkout@v2 + # with: + # # ref: "release/0.1.0" + # submodules: recursive - - name: Build the wheel - run: | - MACOSX_DEPLOYMENT_TARGET=10.15 CPU_TARGET="sse" ./csrc/velox/velox/scripts/setup-macos.sh - pip install wheel - CPU_TARGET="sse" ./packaging/build_wheel.sh - pip install delocate - delocate-wheel dist/*.whl -w fixed_dist + # - name: Build the wheel + # run: | + # MACOSX_DEPLOYMENT_TARGET=10.15 CPU_TARGET="sse" ./csrc/velox/velox/scripts/setup-macos.sh + # pip install wheel + # CPU_TARGET="sse" ./packaging/build_wheel.sh + # pip install delocate + # delocate-wheel dist/*.whl -w fixed_dist - - name: Install and Test TorchArrow Wheel - shell: bash - env: - PYTHON_VERSION: ${{ matrix.python-version }} - run: | - pip3 install dist/torcharrow*.whl - pip3 install pytest - pip3 install torch - pytest torcharrow/test/integration + # - name: Install and Test TorchArrow Wheel + # shell: bash + # env: + # PYTHON_VERSION: ${{ matrix.python-version }} + # run: | + # pip3 install dist/torcharrow*.whl + # pip3 install pytest + # pip3 install torch + # pytest torcharrow/test/integration - - name: Upload Wheels to Github - uses: actions/upload-artifact@v2 - with: - name: torcharrow-artifact - path: dist/torcharrow*.whl + # - name: Upload Wheels to Github + # uses: actions/upload-artifact@v2 + # with: + # name: torcharrow-artifact + # path: dist/torcharrow*.whl From 2345b571254a15720da732bddc9adc5f9e42c549 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Thu, 9 Jun 2022 13:34:10 -0700 Subject: [PATCH 12/26] install boost in linux docker container --- .github/workflows/rc-wheel-build.yml | 170 ++++++++++++++------------- 1 file changed, 89 insertions(+), 81 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 7cfbe8646..68b0ebd5c 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -18,53 +18,9 @@ on: required: true jobs: - # linux-container: - # runs-on: ubuntu-latest - # container: prestocpp/velox-sse-velox-torcharrow:kpai-20220524 - # strategy: - # fail-fast: false - # matrix: - # python-version: - # - 3.7 - # - 3.8 - # - 3.9 - # steps: - # - name: Print CPU info - # run: cat /proc/cpuinfo - - # - name: Check out source repository - # uses: actions/checkout@v2 - # with: - # # ref: "release/0.1.0" - # submodules: recursive - - # - name: Build the wheel - # run: | - # source /opt/conda/etc/profile.d/conda.sh - # BUILD_VERSION=0.1.0 PYTHON_VERSION=${{ matrix.python-version }} CPU_TARGET="sse" packaging/build_wheel.sh - # conda activate env${{ matrix.python-version }} - # pip install auditwheel - # auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 - - # - name: Install and Test TorchArrow Wheel - # shell: bash - # env: - # PYTHON_VERSION: ${{ matrix.python-version }} - # run: | - # source packaging/manylinux/python_helper.sh - # pip3 install dist/torcharrow*.whl - # pip3 install pytest - # pip3 install torch - # pytest torcharrow/test/integration - - # - name: Upload Wheels to Github - # uses: actions/upload-artifact@v2 - # with: - # name: torcharrow-artifact - # path: dist/torcharrow*.whl - linux-container: runs-on: ubuntu-latest + container: prestocpp/velox-sse-velox-torcharrow:kpai-20220524 strategy: fail-fast: false matrix: @@ -72,59 +28,29 @@ jobs: - 3.7 - 3.8 - 3.9 - steps: - name: Print CPU info run: cat /proc/cpuinfo - - name: Setup Python environment - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Check out source repository uses: actions/checkout@v2 with: # ref: "release/0.1.0" submodules: recursive - # Based on https://cristianadam.eu/20200113/speeding-up-c-plus-plus-github-actions-using-ccache/ - - name: Prepare ccache timestamp - id: ccache_cache_timestamp - run: | - echo "::set-output name=timestamp::$(/bin/date -u "+%Y%m%d-%H:%M:%S")" - shell: bash - - - name: Load ccache files - uses: actions/cache@v2 - with: - path: .ccache - key: ubuntu-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - restore-keys: | - ubuntu-ccache- - - name: Install dependencies with APT run: | sudo apt-get update - sudo apt install -y g++ cmake ccache ninja-build checkinstall git \ - libssl-dev libboost-all-dev libdouble-conversion-dev libgoogle-glog-dev \ - libgflags-dev libevent-dev libre2-dev - - # Based on https://github.com/facebookincubator/velox/blob/99429407c3d524e07b32b8b19a03aa7382f819cf/.circleci/config.yml#L114-L116 - - name: Configure ccache - run: | - echo "$GITHUB_WORKSPACE" - CCACHE_DIR=$GITHUB_WORKSPACE/.ccache_root ccache -sz -M 1G - CCACHE_DIR=$GITHUB_WORKSPACE/.ccache ccache -sz -M 1G - - - name: Build and install folly and fmt - # sudo doesn't preserve environment vairable; set it after sudo: https://stackoverflow.com/questions/8633461/how-to-keep-environment-variables-when-using-sudo/33183620#33183620 - run: | - sudo CMAKE_C_COMPILER_LAUNCHER=ccache CPU_TARGET="sse" CMAKE_CXX_COMPILER_LAUNCHER=ccache CCACHE_DIR=$GITHUB_WORKSPACE/.ccache_root scripts/setup-ubuntu.sh + # sudo apt install -y g++ cmake ccache ninja-build checkinstall git \ + # libssl-dev libboost-all-dev libdouble-conversion-dev libgoogle-glog-dev \ + # libgflags-dev libevent-dev libre2-dev + sudo apt install -y libboost-all-dev - name: Build the wheel run: | + source /opt/conda/etc/profile.d/conda.sh BUILD_VERSION=0.1.0 PYTHON_VERSION=${{ matrix.python-version }} CPU_TARGET="sse" packaging/build_wheel.sh + conda activate env${{ matrix.python-version }} pip install auditwheel auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 @@ -145,6 +71,88 @@ jobs: name: torcharrow-artifact path: dist/torcharrow*.whl + # linux-container: + # runs-on: ubuntu-latest + # strategy: + # fail-fast: false + # matrix: + # python-version: + # - 3.7 + # - 3.8 + # - 3.9 + + # steps: + # - name: Print CPU info + # run: cat /proc/cpuinfo + + # - name: Setup Python environment + # uses: actions/setup-python@v2 + # with: + # python-version: ${{ matrix.python-version }} + + # - name: Check out source repository + # uses: actions/checkout@v2 + # with: + # # ref: "release/0.1.0" + # submodules: recursive + + # # Based on https://cristianadam.eu/20200113/speeding-up-c-plus-plus-github-actions-using-ccache/ + # - name: Prepare ccache timestamp + # id: ccache_cache_timestamp + # run: | + # echo "::set-output name=timestamp::$(/bin/date -u "+%Y%m%d-%H:%M:%S")" + # shell: bash + + # - name: Load ccache files + # uses: actions/cache@v2 + # with: + # path: .ccache + # key: ubuntu-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} + # restore-keys: | + # ubuntu-ccache- + + # - name: Install dependencies with APT + # run: | + # sudo apt-get update + # sudo apt install -y g++ cmake ccache ninja-build checkinstall git \ + # libssl-dev libboost-all-dev libdouble-conversion-dev libgoogle-glog-dev \ + # libgflags-dev libevent-dev libre2-dev + + # # Based on https://github.com/facebookincubator/velox/blob/99429407c3d524e07b32b8b19a03aa7382f819cf/.circleci/config.yml#L114-L116 + # - name: Configure ccache + # run: | + # echo "$GITHUB_WORKSPACE" + # CCACHE_DIR=$GITHUB_WORKSPACE/.ccache_root ccache -sz -M 1G + # CCACHE_DIR=$GITHUB_WORKSPACE/.ccache ccache -sz -M 1G + + # - name: Build and install folly and fmt + # # sudo doesn't preserve environment vairable; set it after sudo: https://stackoverflow.com/questions/8633461/how-to-keep-environment-variables-when-using-sudo/33183620#33183620 + # run: | + # sudo CMAKE_C_COMPILER_LAUNCHER=ccache CPU_TARGET="sse" CMAKE_CXX_COMPILER_LAUNCHER=ccache CCACHE_DIR=$GITHUB_WORKSPACE/.ccache_root scripts/setup-ubuntu.sh + + # - name: Build the wheel + # run: | + # BUILD_VERSION=0.1.0 PYTHON_VERSION=${{ matrix.python-version }} CPU_TARGET="sse" packaging/build_wheel.sh + # pip install auditwheel + # auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 + + # - name: Install and Test TorchArrow Wheel + # shell: bash + # env: + # PYTHON_VERSION: ${{ matrix.python-version }} + # run: | + # source packaging/manylinux/python_helper.sh + # pip3 install dist/torcharrow*.whl + # pip3 install pytest + # pip3 install torch + # pytest torcharrow/test/integration + + # - name: Upload Wheels to Github + # uses: actions/upload-artifact@v2 + # with: + # name: torcharrow-artifact + # path: dist/torcharrow*.whl + # macos-container: # runs-on: macos-latest # strategy: From de4259942268c007a2cc4dfb3f88ae27ebbef1f5 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Thu, 9 Jun 2022 13:42:34 -0700 Subject: [PATCH 13/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 68b0ebd5c..524e471c6 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -38,13 +38,13 @@ jobs: # ref: "release/0.1.0" submodules: recursive - - name: Install dependencies with APT - run: | - sudo apt-get update - # sudo apt install -y g++ cmake ccache ninja-build checkinstall git \ - # libssl-dev libboost-all-dev libdouble-conversion-dev libgoogle-glog-dev \ - # libgflags-dev libevent-dev libre2-dev - sudo apt install -y libboost-all-dev + # - name: Install dependencies with APT + # run: | + # sudo apt-get update + # # sudo apt install -y g++ cmake ccache ninja-build checkinstall git \ + # # libssl-dev libboost-all-dev libdouble-conversion-dev libgoogle-glog-dev \ + # # libgflags-dev libevent-dev libre2-dev + # sudo apt install -y libboost-all-dev - name: Build the wheel run: | @@ -63,7 +63,7 @@ jobs: pip3 install dist/torcharrow*.whl pip3 install pytest pip3 install torch - pytest torcharrow/test/integration + pytest -v torcharrow/test/integration - name: Upload Wheels to Github uses: actions/upload-artifact@v2 From 79e30176496f122eda39e24287cb122dd466b790 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Thu, 9 Jun 2022 14:25:22 -0700 Subject: [PATCH 14/26] rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 524e471c6..a5eb35c18 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -63,7 +63,8 @@ jobs: pip3 install dist/torcharrow*.whl pip3 install pytest pip3 install torch - pytest -v torcharrow/test/integration + # pytest -v torcharrow/test/integration + python torcharrow/test/integration/test_criteo.py - name: Upload Wheels to Github uses: actions/upload-artifact@v2 From 90841b926e3fc6120ad073f3034ef959ba59b920 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Fri, 10 Jun 2022 17:32:05 -0700 Subject: [PATCH 15/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index a5eb35c18..f258183ed 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -54,17 +54,17 @@ jobs: pip install auditwheel auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 - - name: Install and Test TorchArrow Wheel - shell: bash - env: - PYTHON_VERSION: ${{ matrix.python-version }} - run: | - source packaging/manylinux/python_helper.sh - pip3 install dist/torcharrow*.whl - pip3 install pytest - pip3 install torch - # pytest -v torcharrow/test/integration - python torcharrow/test/integration/test_criteo.py + # - name: Install and Test TorchArrow Wheel + # shell: bash + # env: + # PYTHON_VERSION: ${{ matrix.python-version }} + # run: | + # source packaging/manylinux/python_helper.sh + # pip3 install dist/torcharrow*.whl + # pip3 install pytest + # pip3 install torch + # # pytest -v torcharrow/test/integration + # python torcharrow/test/integration/test_criteo.py - name: Upload Wheels to Github uses: actions/upload-artifact@v2 From ecc863beb7cfde6ca33c43a5842187d086300cb3 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Sat, 11 Jun 2022 12:41:24 -0700 Subject: [PATCH 16/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index f258183ed..078ffc257 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -54,17 +54,17 @@ jobs: pip install auditwheel auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 - # - name: Install and Test TorchArrow Wheel - # shell: bash - # env: - # PYTHON_VERSION: ${{ matrix.python-version }} - # run: | - # source packaging/manylinux/python_helper.sh - # pip3 install dist/torcharrow*.whl - # pip3 install pytest - # pip3 install torch - # # pytest -v torcharrow/test/integration - # python torcharrow/test/integration/test_criteo.py + - name: Install and Test TorchArrow Wheel + shell: bash + env: + PYTHON_VERSION: ${{ matrix.python-version }} + run: | + source packaging/manylinux/python_helper.sh + # pip3 install dist/torcharrow*.whl + pip3 install fixed_dist/torcharrow*.whl + pip3 install pytest + pip3 install torch + pytest -v torcharrow/test/integration - name: Upload Wheels to Github uses: actions/upload-artifact@v2 From c0ab9aac634696e5a6f1a06ef370a0cd99b63ca2 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Sat, 11 Jun 2022 13:36:00 -0700 Subject: [PATCH 17/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 82 ++++++++++++++-------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 078ffc257..e78030e44 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -64,7 +64,7 @@ jobs: pip3 install fixed_dist/torcharrow*.whl pip3 install pytest pip3 install torch - pytest -v torcharrow/test/integration + pytest -v torcharrow/test - name: Upload Wheels to Github uses: actions/upload-artifact@v2 @@ -154,47 +154,47 @@ jobs: # name: torcharrow-artifact # path: dist/torcharrow*.whl - # macos-container: - # runs-on: macos-latest - # strategy: - # fail-fast: false - # matrix: - # python-version: - # - 3.7 - # - 3.8 - # - 3.9 - # steps: - # - name: Setup Python ${{ matrix.python-version }} - # uses: actions/setup-python@v2 - # with: - # python-version: ${{ matrix.python-version }} + macos-container: + runs-on: macos-latest + strategy: + fail-fast: false + matrix: + python-version: + - 3.7 + - 3.8 + - 3.9 + steps: + - name: Setup Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} - # - name: Check out source repository - # uses: actions/checkout@v2 - # with: - # # ref: "release/0.1.0" - # submodules: recursive + - name: Check out source repository + uses: actions/checkout@v2 + with: + # ref: "release/0.1.0" + submodules: recursive - # - name: Build the wheel - # run: | - # MACOSX_DEPLOYMENT_TARGET=10.15 CPU_TARGET="sse" ./csrc/velox/velox/scripts/setup-macos.sh - # pip install wheel - # CPU_TARGET="sse" ./packaging/build_wheel.sh - # pip install delocate - # delocate-wheel dist/*.whl -w fixed_dist + - name: Build the wheel + run: | + MACOSX_DEPLOYMENT_TARGET=10.15 CPU_TARGET="sse" ./csrc/velox/velox/scripts/setup-macos.sh + pip install wheel + CPU_TARGET="sse" ./packaging/build_wheel.sh + pip install delocate + delocate-wheel dist/*.whl -w fixed_dist - # - name: Install and Test TorchArrow Wheel - # shell: bash - # env: - # PYTHON_VERSION: ${{ matrix.python-version }} - # run: | - # pip3 install dist/torcharrow*.whl - # pip3 install pytest - # pip3 install torch - # pytest torcharrow/test/integration + - name: Install and Test TorchArrow Wheel + shell: bash + env: + PYTHON_VERSION: ${{ matrix.python-version }} + run: | + pip3 install dist/torcharrow*.whl + pip3 install pytest + pip3 install torch + pytest torcharrow/test - # - name: Upload Wheels to Github - # uses: actions/upload-artifact@v2 - # with: - # name: torcharrow-artifact - # path: dist/torcharrow*.whl + - name: Upload Wheels to Github + uses: actions/upload-artifact@v2 + with: + name: torcharrow-artifact + path: dist/torcharrow*.whl From d864674303c3858da8dce3dfc82739bacaf9eb78 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Sat, 11 Jun 2022 13:56:25 -0700 Subject: [PATCH 18/26] update /rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index e78030e44..45c8eb5a6 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -64,7 +64,8 @@ jobs: pip3 install fixed_dist/torcharrow*.whl pip3 install pytest pip3 install torch - pytest -v torcharrow/test + pytest -v torcharrow/test/integration + pytest -v torcharrow/test/lib_test - name: Upload Wheels to Github uses: actions/upload-artifact@v2 @@ -191,7 +192,8 @@ jobs: pip3 install dist/torcharrow*.whl pip3 install pytest pip3 install torch - pytest torcharrow/test + pytest -v torcharrow/test/integration + pytest -v torcharrow/test/lib_test - name: Upload Wheels to Github uses: actions/upload-artifact@v2 From 381604512997a99002d9628980f6c6399d7aebbc Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Sat, 11 Jun 2022 15:42:05 -0700 Subject: [PATCH 19/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 45c8eb5a6..054cd751b 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -65,7 +65,6 @@ jobs: pip3 install pytest pip3 install torch pytest -v torcharrow/test/integration - pytest -v torcharrow/test/lib_test - name: Upload Wheels to Github uses: actions/upload-artifact@v2 @@ -193,7 +192,6 @@ jobs: pip3 install pytest pip3 install torch pytest -v torcharrow/test/integration - pytest -v torcharrow/test/lib_test - name: Upload Wheels to Github uses: actions/upload-artifact@v2 From f4e1d461d0efb10c647758f83cd5f6b9bfc97f37 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Mon, 13 Jun 2022 12:03:00 -0700 Subject: [PATCH 20/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 93 +--------------------------- 1 file changed, 1 insertion(+), 92 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 054cd751b..f8bf3063c 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -38,14 +38,6 @@ jobs: # ref: "release/0.1.0" submodules: recursive - # - name: Install dependencies with APT - # run: | - # sudo apt-get update - # # sudo apt install -y g++ cmake ccache ninja-build checkinstall git \ - # # libssl-dev libboost-all-dev libdouble-conversion-dev libgoogle-glog-dev \ - # # libgflags-dev libevent-dev libre2-dev - # sudo apt install -y libboost-all-dev - - name: Build the wheel run: | source /opt/conda/etc/profile.d/conda.sh @@ -60,7 +52,6 @@ jobs: PYTHON_VERSION: ${{ matrix.python-version }} run: | source packaging/manylinux/python_helper.sh - # pip3 install dist/torcharrow*.whl pip3 install fixed_dist/torcharrow*.whl pip3 install pytest pip3 install torch @@ -72,88 +63,6 @@ jobs: name: torcharrow-artifact path: dist/torcharrow*.whl - # linux-container: - # runs-on: ubuntu-latest - # strategy: - # fail-fast: false - # matrix: - # python-version: - # - 3.7 - # - 3.8 - # - 3.9 - - # steps: - # - name: Print CPU info - # run: cat /proc/cpuinfo - - # - name: Setup Python environment - # uses: actions/setup-python@v2 - # with: - # python-version: ${{ matrix.python-version }} - - # - name: Check out source repository - # uses: actions/checkout@v2 - # with: - # # ref: "release/0.1.0" - # submodules: recursive - - # # Based on https://cristianadam.eu/20200113/speeding-up-c-plus-plus-github-actions-using-ccache/ - # - name: Prepare ccache timestamp - # id: ccache_cache_timestamp - # run: | - # echo "::set-output name=timestamp::$(/bin/date -u "+%Y%m%d-%H:%M:%S")" - # shell: bash - - # - name: Load ccache files - # uses: actions/cache@v2 - # with: - # path: .ccache - # key: ubuntu-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - # restore-keys: | - # ubuntu-ccache- - - # - name: Install dependencies with APT - # run: | - # sudo apt-get update - # sudo apt install -y g++ cmake ccache ninja-build checkinstall git \ - # libssl-dev libboost-all-dev libdouble-conversion-dev libgoogle-glog-dev \ - # libgflags-dev libevent-dev libre2-dev - - # # Based on https://github.com/facebookincubator/velox/blob/99429407c3d524e07b32b8b19a03aa7382f819cf/.circleci/config.yml#L114-L116 - # - name: Configure ccache - # run: | - # echo "$GITHUB_WORKSPACE" - # CCACHE_DIR=$GITHUB_WORKSPACE/.ccache_root ccache -sz -M 1G - # CCACHE_DIR=$GITHUB_WORKSPACE/.ccache ccache -sz -M 1G - - # - name: Build and install folly and fmt - # # sudo doesn't preserve environment vairable; set it after sudo: https://stackoverflow.com/questions/8633461/how-to-keep-environment-variables-when-using-sudo/33183620#33183620 - # run: | - # sudo CMAKE_C_COMPILER_LAUNCHER=ccache CPU_TARGET="sse" CMAKE_CXX_COMPILER_LAUNCHER=ccache CCACHE_DIR=$GITHUB_WORKSPACE/.ccache_root scripts/setup-ubuntu.sh - - # - name: Build the wheel - # run: | - # BUILD_VERSION=0.1.0 PYTHON_VERSION=${{ matrix.python-version }} CPU_TARGET="sse" packaging/build_wheel.sh - # pip install auditwheel - # auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 - - # - name: Install and Test TorchArrow Wheel - # shell: bash - # env: - # PYTHON_VERSION: ${{ matrix.python-version }} - # run: | - # source packaging/manylinux/python_helper.sh - # pip3 install dist/torcharrow*.whl - # pip3 install pytest - # pip3 install torch - # pytest torcharrow/test/integration - - # - name: Upload Wheels to Github - # uses: actions/upload-artifact@v2 - # with: - # name: torcharrow-artifact - # path: dist/torcharrow*.whl - macos-container: runs-on: macos-latest strategy: @@ -188,7 +97,7 @@ jobs: env: PYTHON_VERSION: ${{ matrix.python-version }} run: | - pip3 install dist/torcharrow*.whl + pip3 install fixed_dist/torcharrow*.whl pip3 install pytest pip3 install torch pytest -v torcharrow/test/integration From 04c1c007cefc036135c11e7676668d45f65dadb7 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Mon, 13 Jun 2022 12:40:27 -0700 Subject: [PATCH 21/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index f8bf3063c..b4adc40fc 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -10,13 +10,6 @@ on: # For PR created by ghstack - gh/*/*/base - workflow_call: - secrets: - AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: - required: true - AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY: - required: true - jobs: linux-container: runs-on: ubuntu-latest From 4efef5e522003c436b589c2f286e5b43d46148d0 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Mon, 13 Jun 2022 12:41:52 -0700 Subject: [PATCH 22/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index b4adc40fc..3250b1874 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -3,13 +3,6 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: - # Use the following to trigger test on a dev PR - pull_request: - branches: - - main - # For PR created by ghstack - - gh/*/*/base - jobs: linux-container: runs-on: ubuntu-latest From 0ec135a905446ac79fede663485b88c44c095595 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Mon, 13 Jun 2022 12:44:00 -0700 Subject: [PATCH 23/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 3250b1874..8bfd35b42 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -21,7 +21,7 @@ jobs: - name: Check out source repository uses: actions/checkout@v2 with: - # ref: "release/0.1.0" + ref: "release/0.1.0" submodules: recursive - name: Build the wheel @@ -67,7 +67,7 @@ jobs: - name: Check out source repository uses: actions/checkout@v2 with: - # ref: "release/0.1.0" + ref: "release/0.1.0" submodules: recursive - name: Build the wheel From d3d0596c5a79725ea5680d9def3514f417a5b27c Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Mon, 13 Jun 2022 15:27:19 -0700 Subject: [PATCH 24/26] update rc-wheel-build.yml --- .github/workflows/rc-wheel-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 8bfd35b42..7722b864e 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -27,7 +27,7 @@ jobs: - name: Build the wheel run: | source /opt/conda/etc/profile.d/conda.sh - BUILD_VERSION=0.1.0 PYTHON_VERSION=${{ matrix.python-version }} CPU_TARGET="sse" packaging/build_wheel.sh + PYTHON_VERSION=${{ matrix.python-version }} CPU_TARGET="sse" packaging/build_wheel.sh conda activate env${{ matrix.python-version }} pip install auditwheel auditwheel repair dist/*.whl -w fixed_dist --plat manylinux2014_x86_64 From c45215c9dfe8485e67eb520ac49bff28121911d2 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Mon, 13 Jun 2022 15:32:55 -0700 Subject: [PATCH 25/26] fix GH upload file path --- .github/workflows/rc-wheel-build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rc-wheel-build.yml b/.github/workflows/rc-wheel-build.yml index 7722b864e..5eaeb6d1f 100644 --- a/.github/workflows/rc-wheel-build.yml +++ b/.github/workflows/rc-wheel-build.yml @@ -15,9 +15,6 @@ jobs: - 3.8 - 3.9 steps: - - name: Print CPU info - run: cat /proc/cpuinfo - - name: Check out source repository uses: actions/checkout@v2 with: @@ -47,7 +44,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: torcharrow-artifact - path: dist/torcharrow*.whl + path: fixed_dist/torcharrow*.whl macos-container: runs-on: macos-latest @@ -92,4 +89,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: torcharrow-artifact - path: dist/torcharrow*.whl + path: fixed_dist/torcharrow*.whl From a8028d9765cc0ed854683d37703aae14e1e223d7 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Tue, 14 Jun 2022 12:07:49 -0700 Subject: [PATCH 26/26] Update version info for the builds --- packaging/build_wheel.sh | 4 ++-- setup.py | 2 +- version.txt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 version.txt diff --git a/packaging/build_wheel.sh b/packaging/build_wheel.sh index 4eb6040ee..1801774b8 100755 --- a/packaging/build_wheel.sh +++ b/packaging/build_wheel.sh @@ -52,7 +52,8 @@ setup_wheel_python() { } -setup_build_version 0.0.4 +version=$(cat "version.txt") +setup_build_version "$version" setup_wheel_python python setup.py clean if [[ "$(uname)" == Darwin ]]; then @@ -64,4 +65,3 @@ else echo "Unsupported" exit 1 fi - diff --git a/setup.py b/setup.py index 95b660ccb..28919ffd8 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ def _get_version(): - version = "0.1.0a0" + version = open("./version.txt").read().strip() sha = "Unknown" try: sha = ( diff --git a/version.txt b/version.txt new file mode 100644 index 000000000..919f951b3 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +0.0.5a0