From dfc1a8710135a16781174cab535598ffc76faf1b Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 3 Feb 2023 11:49:02 -0500 Subject: [PATCH] CUDA 11.8 / Python 3.10 Builds (#32) WIP... body to follow --------- Co-authored-by: Sevag H --- ...matrix-build.yaml => conda-cpp-build.yaml} | 5 ++-- .github/workflows/conda-cpp-tests.yaml | 26 +++++++++---------- ...rix-build.yaml => conda-python-build.yaml} | 10 ++++--- .github/workflows/conda-python-tests.yaml | 26 +++++++++---------- .github/workflows/wheels-manylinux-build.yml | 12 ++++++--- .../workflows/wheels-manylinux-publish.yml | 4 +-- .github/workflows/wheels-manylinux-test.yml | 12 ++++----- .github/workflows/wheels-pure-build.yml | 4 +-- .github/workflows/wheels-pure-publish.yml | 2 +- .github/workflows/wheels-pure-test.yml | 4 +-- 10 files changed, 57 insertions(+), 48 deletions(-) rename .github/workflows/{conda-cpp-matrix-build.yaml => conda-cpp-build.yaml} (91%) rename .github/workflows/{conda-python-matrix-build.yaml => conda-python-build.yaml} (79%) diff --git a/.github/workflows/conda-cpp-matrix-build.yaml b/.github/workflows/conda-cpp-build.yaml similarity index 91% rename from .github/workflows/conda-cpp-matrix-build.yaml rename to .github/workflows/conda-cpp-build.yaml index 5c168c57..6561f7ca 100644 --- a/.github/workflows/conda-cpp-matrix-build.yaml +++ b/.github/workflows/conda-cpp-build.yaml @@ -21,12 +21,13 @@ on: jobs: build: + timeout-minutes: 480 strategy: fail-fast: false matrix: include: - - { CUDA_VER: "11.5.1", LINUX_VER: "ubuntu20.04", ARCH: "amd64", PY_VER: "3.8" } - - { CUDA_VER: "11.5.1", LINUX_VER: "ubuntu20.04", ARCH: "arm64", PY_VER: "3.8" } + - { CUDA_VER: "11.8.0", LINUX_VER: "ubuntu20.04", ARCH: "amd64", PY_VER: "3.8" } + - { CUDA_VER: "11.8.0", LINUX_VER: "ubuntu20.04", ARCH: "arm64", PY_VER: "3.8" } runs-on: - self-hosted - linux diff --git a/.github/workflows/conda-cpp-tests.yaml b/.github/workflows/conda-cpp-tests.yaml index d7936d5e..0f0259d0 100644 --- a/.github/workflows/conda-cpp-tests.yaml +++ b/.github/workflows/conda-cpp-tests.yaml @@ -39,26 +39,26 @@ jobs: export MATRICES='{ "pull-request": [ { "CUDA_VER": "11.2.2", "LINUX_VER": "centos7", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "450" }, - { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "v100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "arm64", "PY_VER": "3.9", "GPU": "a100", "DRIVER": "495" } + { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "520" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "v100", "DRIVER": "520" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "ubuntu20.04", "ARCH": "arm64", "PY_VER": "3.10", "GPU": "a100", "DRIVER": "520" } ], "nightly": [ { "CUDA_VER": "11.2.2", "LINUX_VER": "centos7", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "450" }, { "CUDA_VER": "11.2.2", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "450" }, - { "CUDA_VER": "11.2.2", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "495" }, + { "CUDA_VER": "11.2.2", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "520" }, { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "450" }, - { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "495" }, - { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "arm64", "PY_VER": "3.8", "GPU": "a100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "v100", "DRIVER": "450" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "v100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "arm64", "PY_VER": "3.9", "GPU": "a100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "rockylinux8", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "v100", "DRIVER": "450" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "rockylinux8", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "v100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "rockylinux8", "ARCH": "arm64", "PY_VER": "3.9", "GPU": "a100", "DRIVER": "495" } + { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "520" }, + { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "arm64", "PY_VER": "3.8", "GPU": "a100", "DRIVER": "520" }, + { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "v100", "DRIVER": "450" }, + { "CUDA_VER": "11.5.1", "LINUX_VER": "rockylinux8", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "v100", "DRIVER": "450" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "v100", "DRIVER": "520" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "ubuntu20.04", "ARCH": "arm64", "PY_VER": "3.10", "GPU": "a100", "DRIVER": "520" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "rockylinux8", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "v100", "DRIVER": "520" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "rockylinux8", "ARCH": "arm64", "PY_VER": "3.10", "GPU": "a100", "DRIVER": "520" } ], "ext_nightly": [ - { "CUDA_VER": "11.2.2", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "t4", "DRIVER": "495" } + { "CUDA_VER": "11.2.2", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "t4", "DRIVER": "495" } ] }' diff --git a/.github/workflows/conda-python-matrix-build.yaml b/.github/workflows/conda-python-build.yaml similarity index 79% rename from .github/workflows/conda-python-matrix-build.yaml rename to .github/workflows/conda-python-build.yaml index 7bdd21e0..058f94e0 100644 --- a/.github/workflows/conda-python-matrix-build.yaml +++ b/.github/workflows/conda-python-build.yaml @@ -25,10 +25,12 @@ jobs: fail-fast: false matrix: include: - - { CUDA_VER: "11.5.1", LINUX_VER: "ubuntu20.04", ARCH: "amd64", PY_VER: "3.8" } - - { CUDA_VER: "11.5.1", LINUX_VER: "ubuntu20.04", ARCH: "arm64", PY_VER: "3.8" } - - { CUDA_VER: "11.5.1", LINUX_VER: "ubuntu20.04", ARCH: "amd64", PY_VER: "3.9" } - - { CUDA_VER: "11.5.1", LINUX_VER: "ubuntu20.04", ARCH: "arm64", PY_VER: "3.9" } + - { CUDA_VER: "11.8.0", LINUX_VER: "ubuntu20.04", ARCH: "amd64", PY_VER: "3.8" } + - { CUDA_VER: "11.8.0", LINUX_VER: "ubuntu20.04", ARCH: "arm64", PY_VER: "3.8" } + - { CUDA_VER: "11.8.0", LINUX_VER: "ubuntu20.04", ARCH: "amd64", PY_VER: "3.9" } + - { CUDA_VER: "11.8.0", LINUX_VER: "ubuntu20.04", ARCH: "arm64", PY_VER: "3.9" } + - { CUDA_VER: "11.8.0", LINUX_VER: "ubuntu20.04", ARCH: "amd64", PY_VER: "3.10" } + - { CUDA_VER: "11.8.0", LINUX_VER: "ubuntu20.04", ARCH: "arm64", PY_VER: "3.10" } runs-on: - self-hosted - linux diff --git a/.github/workflows/conda-python-tests.yaml b/.github/workflows/conda-python-tests.yaml index 812d82bf..e9216181 100644 --- a/.github/workflows/conda-python-tests.yaml +++ b/.github/workflows/conda-python-tests.yaml @@ -42,26 +42,26 @@ jobs: export MATRICES='{ "pull-request": [ { "CUDA_VER": "11.2.2", "LINUX_VER": "centos7", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "450" }, - { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "v100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "arm64", "PY_VER": "3.9", "GPU": "a100", "DRIVER": "495" } + { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "520" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "v100", "DRIVER": "520" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "ubuntu20.04", "ARCH": "arm64", "PY_VER": "3.10", "GPU": "a100", "DRIVER": "520" } ], "nightly": [ { "CUDA_VER": "11.2.2", "LINUX_VER": "centos7", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "450" }, { "CUDA_VER": "11.2.2", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "450" }, - { "CUDA_VER": "11.2.2", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "495" }, + { "CUDA_VER": "11.2.2", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "520" }, { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "450" }, - { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "495" }, - { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "arm64", "PY_VER": "3.8", "GPU": "a100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "v100", "DRIVER": "450" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "v100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "arm64", "PY_VER": "3.9", "GPU": "a100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "rockylinux8", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "v100", "DRIVER": "450" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "rockylinux8", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "v100", "DRIVER": "495" }, - { "CUDA_VER": "11.5.1", "LINUX_VER": "rockylinux8", "ARCH": "arm64", "PY_VER": "3.9", "GPU": "a100", "DRIVER": "495" } + { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.8", "GPU": "v100", "DRIVER": "520" }, + { "CUDA_VER": "11.4.1", "LINUX_VER": "ubuntu18.04", "ARCH": "arm64", "PY_VER": "3.8", "GPU": "a100", "DRIVER": "520" }, + { "CUDA_VER": "11.5.1", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "v100", "DRIVER": "450" }, + { "CUDA_VER": "11.5.1", "LINUX_VER": "rockylinux8", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "v100", "DRIVER": "450" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "ubuntu20.04", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "v100", "DRIVER": "520" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "ubuntu20.04", "ARCH": "arm64", "PY_VER": "3.10", "GPU": "a100", "DRIVER": "520" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "rockylinux8", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "v100", "DRIVER": "520" }, + { "CUDA_VER": "11.8.0", "LINUX_VER": "rockylinux8", "ARCH": "arm64", "PY_VER": "3.10", "GPU": "a100", "DRIVER": "520" } ], "ext_nightly": [ - { "CUDA_VER": "11.2.2", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.9", "GPU": "t4", "DRIVER": "495" } + { "CUDA_VER": "11.2.2", "LINUX_VER": "ubuntu18.04", "ARCH": "amd64", "PY_VER": "3.10", "GPU": "t4", "DRIVER": "495" } ] }' diff --git a/.github/workflows/wheels-manylinux-build.yml b/.github/workflows/wheels-manylinux-build.yml index 7fe2006c..03735a38 100644 --- a/.github/workflows/wheels-manylinux-build.yml +++ b/.github/workflows/wheels-manylinux-build.yml @@ -16,6 +16,12 @@ on: required: true type: string + # allow a bigger runner instance + node_type: + required: false + type: string + default: "cpu16" + # general settings package-name: required: true @@ -97,14 +103,14 @@ jobs: needs: wheel-epoch-timestamp strategy: matrix: - python: ['3.8', '3.9'] + python: ['3.8', '3.10'] arch: [amd64, arm64] - ctk: ['11.5.1'] + ctk: ['11.8.0'] runs-on: - self-hosted - linux - ${{ matrix.arch }} - - cpu16 + - ${{ inputs.node_type }} container: # ctk version of the cibw container is irrelevant in the manylinux case # it's simply a launcher for cibuildwheel diff --git a/.github/workflows/wheels-manylinux-publish.yml b/.github/workflows/wheels-manylinux-publish.yml index 03d53453..9742fb81 100644 --- a/.github/workflows/wheels-manylinux-publish.yml +++ b/.github/workflows/wheels-manylinux-publish.yml @@ -27,9 +27,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ['3.8', '3.9'] + python: ['3.8', '3.10'] linux-arch: ["x86_64", "aarch64"] - ctk: ['11.5.1'] + ctk: ['11.8.0'] container: # ctk version of the cibw container is irrelevant in the publish step # it's simply a launcher for twine diff --git a/.github/workflows/wheels-manylinux-test.yml b/.github/workflows/wheels-manylinux-test.yml index e5f62de9..a88d3854 100644 --- a/.github/workflows/wheels-manylinux-test.yml +++ b/.github/workflows/wheels-manylinux-test.yml @@ -65,14 +65,14 @@ jobs: export MATRICES=$(cat <