Fix nightly build binary errors (#89153)
This is pretty much self explanatory issues
Two typo's in generate generate binary script caused workflows to be generated with invalid parameters:
1 .generated-linux-binary-libtorch-pre-cxx11-master.yml
2 .generated-macos-arm64-binary-wheel-nightly.yml
Pull Request resolved: https://github.com/pytorch/pytorch/pull/89153
Approved by: https://github.com/malfet
diff --git a/.github/scripts/generate_ci_workflows.py b/.github/scripts/generate_ci_workflows.py
index 1ef3142..35680e3 100755
--- a/.github/scripts/generate_ci_workflows.py
+++ b/.github/scripts/generate_ci_workflows.py
@@ -154,7 +154,7 @@
package_type="libtorch",
abi_version=generate_binary_build_matrix.PRE_CXX11_ABI,
build_configs=generate_binary_build_matrix.generate_libtorch_matrix(
- OperatingSystem.LINUX, generate_binary_build_matrix.CXX11_ABI,
+ OperatingSystem.LINUX, generate_binary_build_matrix.PRE_CXX11_ABI,
arches=["cpu"],
libtorch_variants=["shared-with-deps"],
),
@@ -277,7 +277,7 @@
BinaryBuildWorkflow(
os=OperatingSystem.MACOS_ARM64,
package_type="wheel",
- build_configs=generate_binary_build_matrix.generate_wheels_matrix(OperatingSystem.MACOS),
+ build_configs=generate_binary_build_matrix.generate_wheels_matrix(OperatingSystem.MACOS_ARM64),
cross_compile_arm64=True,
ciflow_config=CIFlowConfig(
labels={LABEL_CIFLOW_BINARIES, LABEL_CIFLOW_BINARIES_WHEEL},
diff --git a/.github/workflows/generated-linux-binary-libtorch-pre-cxx11-master.yml b/.github/workflows/generated-linux-binary-libtorch-pre-cxx11-master.yml
index edacb2e..39e41e67 100644
--- a/.github/workflows/generated-linux-binary-libtorch-pre-cxx11-master.yml
+++ b/.github/workflows/generated-linux-binary-libtorch-pre-cxx11-master.yml
@@ -31,7 +31,7 @@
cancel-in-progress: true
jobs:
- libtorch-cpu-shared-with-deps-cxx11-abi-build:
+ libtorch-cpu-shared-with-deps-pre-cxx11-build:
if: ${{ github.repository_owner == 'pytorch' }}
uses: ./.github/workflows/_binary-build-linux.yml
with:
@@ -42,17 +42,17 @@
# favor of GPU_ARCH_VERSION
DESIRED_CUDA: cpu
GPU_ARCH_TYPE: cpu
- DOCKER_IMAGE: pytorch/libtorch-cxx11-builder:cpu
+ DOCKER_IMAGE: pytorch/manylinux-builder:cpu
LIBTORCH_VARIANT: shared-with-deps
- DESIRED_DEVTOOLSET: cxx11-abi
- build_name: libtorch-cpu-shared-with-deps-cxx11-abi
+ DESIRED_DEVTOOLSET: pre-cxx11
+ build_name: libtorch-cpu-shared-with-deps-pre-cxx11
build_environment: linux-binary-libtorch-pre-cxx11
secrets:
github-token: ${{ secrets.GITHUB_TOKEN }}
- libtorch-cpu-shared-with-deps-cxx11-abi-test: # Testing
+ libtorch-cpu-shared-with-deps-pre-cxx11-test: # Testing
if: ${{ github.repository_owner == 'pytorch' }}
- needs: libtorch-cpu-shared-with-deps-cxx11-abi-build
+ needs: libtorch-cpu-shared-with-deps-pre-cxx11-build
uses: ./.github/workflows/_binary-test-linux.yml
with:
PYTORCH_ROOT: /pytorch
@@ -62,10 +62,10 @@
# favor of GPU_ARCH_VERSION
DESIRED_CUDA: cpu
GPU_ARCH_TYPE: cpu
- DOCKER_IMAGE: pytorch/libtorch-cxx11-builder:cpu
+ DOCKER_IMAGE: pytorch/manylinux-builder:cpu
LIBTORCH_VARIANT: shared-with-deps
- DESIRED_DEVTOOLSET: cxx11-abi
- build_name: libtorch-cpu-shared-with-deps-cxx11-abi
+ DESIRED_DEVTOOLSET: pre-cxx11
+ build_name: libtorch-cpu-shared-with-deps-pre-cxx11
build_environment: linux-binary-libtorch-pre-cxx11
runs_on: linux.4xlarge
secrets:
diff --git a/.github/workflows/generated-macos-arm64-binary-wheel-nightly.yml b/.github/workflows/generated-macos-arm64-binary-wheel-nightly.yml
index 6bc3894..7a7df02e 100644
--- a/.github/workflows/generated-macos-arm64-binary-wheel-nightly.yml
+++ b/.github/workflows/generated-macos-arm64-binary-wheel-nightly.yml
@@ -34,116 +34,6 @@
cancel-in-progress: true
jobs:
- wheel-py3_7-cpu-build:
- if: ${{ github.repository_owner == 'pytorch' }}
- runs-on: macos-12-xl
- timeout-minutes: 240
- env:
- PYTORCH_ROOT: ${{ github.workspace }}/pytorch
- BUILDER_ROOT: ${{ github.workspace }}/builder
- PACKAGE_TYPE: wheel
- # TODO: This is a legacy variable that we eventually want to get rid of in
- # favor of GPU_ARCH_VERSION
- DESIRED_CUDA: cpu
- GPU_ARCH_TYPE: cpu
- SKIP_ALL_TESTS: 1
- DESIRED_PYTHON: "3.7"
- # For sccache access (only on non-forked PRs)
- AWS_ACCESS_KEY_ID: ${{ secrets.MACOS_SCCACHE_S3_ACCESS_KEY_ID }}
- AWS_SECRET_ACCESS_KEY: ${{ secrets.MACOS_SCCACHE_S3_SECRET_ACCESS_KEY }}
- steps:
- # NOTE: These environment variables are put here so that they can be applied on every job equally
- # They are also here because setting them at a workflow level doesn't give us access to the
- # runner.temp variable, which we need.
- - name: Populate binary env
- shell: bash
- run: |
- # shellcheck disable=SC2129
- echo "BINARY_ENV_FILE=${RUNNER_TEMP}/env" >> "${GITHUB_ENV}"
- # shellcheck disable=SC2129
- echo "PYTORCH_FINAL_PACKAGE_DIR=${RUNNER_TEMP}/artifacts" >> "${GITHUB_ENV}"
- # shellcheck disable=SC2129
- echo "MAC_PACKAGE_WORK_DIR=${RUNNER_TEMP}" >> "${GITHUB_ENV}"
- - name: Install conda and dependencies
- run: |
- # Install conda, setup-miniconda messes with the path that messes with the ruby stuff we do later on
- curl --retry 3 -o "${RUNNER_TEMP}/conda.sh" https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
- chmod +x "${RUNNER_TEMP}/conda.sh"
- /bin/bash "${RUNNER_TEMP}/conda.sh" -b -p "${RUNNER_TEMP}/anaconda"
- echo "${RUNNER_TEMP}/anaconda/bin" >> "${GITHUB_PATH}"
- echo "DEVELOPER_DIR=/Applications/Xcode_13.3.1.app/Contents/Developer" >> "${GITHUB_ENV}"
- - name: Checkout PyTorch
- uses: zhouzhuojie/checkout@05b13c9a0d21f08f6d5e64a1d5042246d13619d9
- with:
- ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
- submodules: recursive
- path: pytorch
- - name: Clean PyTorch checkout
- run: |
- # Remove any artifacts from the previous checkouts
- git clean -fxd
- working-directory: pytorch
- - name: Checkout pytorch/builder
- uses: zhouzhuojie/checkout@05b13c9a0d21f08f6d5e64a1d5042246d13619d9
- with:
- ref: main
- submodules: recursive
- repository: pytorch/builder
- path: builder
- - name: Clean pytorch/builder checkout
- run: |
- # Remove any artifacts from the previous checkouts
- git clean -fxd
- working-directory: builder
- - name: Install sccache (only for non-forked PRs, and pushes to trunk)
- uses: nick-fields/retry@v2.8.2
- if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}
- with:
- timeout_minutes: 5
- max_attempts: 3
- retry_wait_seconds: 90
- command: |
- sudo curl --retry 3 https://s3.amazonaws.com/ossci-macos/sccache_v2.15 --output /usr/local/bin/sccache
- sudo chmod +x /usr/local/bin/sccache
- echo "SCCACHE_BUCKET=ossci-compiler-cache-circleci-v2" >> "${GITHUB_ENV}"
- - name: Populate binary env
- run: |
- # shellcheck disable=SC1091
- source "${RUNNER_TEMP}/anaconda/bin/activate"
- "${PYTORCH_ROOT}/.circleci/scripts/binary_populate_env.sh"
- - name: Build PyTorch binary
- run: |
- # shellcheck disable=SC1091
- source "${RUNNER_TEMP}/anaconda/bin/activate"
- "${PYTORCH_ROOT}/.circleci/scripts/binary_macos_build.sh"
- - uses: actions/upload-artifact@v3
- if: always()
- with:
- name: wheel-py3_7-cpu
- retention-days: 14
- if-no-files-found: error
- path: "${{ env.PYTORCH_FINAL_PACKAGE_DIR }}"
- wheel-py3_7-cpu-upload: # Uploading
- if: ${{ github.repository_owner == 'pytorch' }}
- needs: wheel-py3_7-cpu-build
- with:
- PYTORCH_ROOT: /pytorch
- BUILDER_ROOT: /builder
- PACKAGE_TYPE: wheel
- # TODO: This is a legacy variable that we eventually want to get rid of in
- # favor of GPU_ARCH_VERSION
- DESIRED_CUDA: cpu
- GPU_ARCH_TYPE: cpu
- DOCKER_IMAGE: pytorch/manylinux-builder:cpu
- DESIRED_PYTHON: "3.7"
- build_name: wheel-py3_7-cpu
- use_s3: False
- secrets:
- github-token: ${{ secrets.GITHUB_TOKEN }}
- aws-access-key-id: ${{ secrets.AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID }}
- aws-pytorch-uploader-secret-access-key: ${{ secrets.AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY }}
- conda-pytorchbot-token: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
- uses: ./.github/workflows/_binary-upload.yml
wheel-py3_8-cpu-build:
if: ${{ github.repository_owner == 'pytorch' }}
runs-on: macos-12-xl
