Minor buildsystem fixes (llvm#778)

Sets up auto-pinning of latest torch-nightly
zjgarvey · Apr 21, 2022 · 4ef61aa · 4ef61aa
1 parent 0257d91
commit 4ef61aa
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/buildManylinux.yml → .github/workflows/buildRelease.yml b/.github/workflows/buildManylinux.yml → .github/workflows/buildRelease.yml
@@ -1,10 +1,6 @@
-name: Manylinux Build
+name: Release Build
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
   workflow_dispatch:
     inputs:
       release_id:

diff --git a/.github/workflows/oneshotSnapshotPackage.yml b/.github/workflows/oneshotSnapshotPackage.yml
@@ -55,10 +55,10 @@ jobs:
           ref: "${{ env.tag_name }}"
           inputs: '{"release_id": "", "python_package_version": "${{ env.package_version }}"}'
 
-      - name: "Invoke workflow :: Manylinux Build"
+      - name: "Invoke workflow :: Release Build"
         uses: benc-uk/workflow-dispatch@v1
         with:
-          workflow: Manylinux Build
+          workflow: Release Build
           token: ${{ secrets.WORKFLOW_INVOCATION_TOKEN }}
           ref: "${{ env.tag_name }}"
           inputs: '{"release_id": "${{ steps.create_release.outputs.id }}", "python_package_version": "${{ env.package_version }}"}'
diff --git a/build_tools/python_deploy/build_linux_packages.sh b/build_tools/python_deploy/build_linux_packages.sh
@@ -95,6 +95,7 @@ function run_in_docker() {
 }
 
 function build_torch_mlir() {
+  python -m pip install -r /main_checkout/torch-mlir/requirements.txt --extra-index-url https://download.pytorch.org/whl/nightly/cpu
   CMAKE_GENERATOR=Ninja \
   python -m pip wheel -v -w /wheelhouse /main_checkout/torch-mlir/ \
     --extra-index-url https://download.pytorch.org/whl/nightly/cpu

diff --git a/build_tools/python_deploy/build_macos_packages.sh b/build_tools/python_deploy/build_macos_packages.sh
@@ -20,7 +20,7 @@ set -eu -o errtrace
 
 this_dir="$(cd $(dirname $0) && pwd)"
 repo_root="$(cd $this_dir/../../ && pwd)"
-python_versions="${python_versions:3.9 3.10}"
+python_versions="${python_versions:-3.9 3.10}"
 output_dir="${output_dir:-${this_dir}/wheelhouse}"
 packages="${packages:-torch-mlir}"
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -16,6 +16,6 @@ requires = [
     # artifacts.
     # TODO: Come up with a better way to pin the version.
     "numpy",
-    "torch==1.12.0.dev20220420",
+    "torch>=1.12.0.dev20220420",
 ]
 build-backend = "setuptools.build_meta"
diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,8 @@
 -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
 --pre
+torch
 
 numpy
-torch
 torchvision
 
 # Build requirements.