From 1f0d2bc608d83cfb23826e662e58cae93fda4a10 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Feb 2023 10:44:22 -0800 Subject: [PATCH 1/9] Switch to new workflow for generating the named package. --- .github/workflows/pr.yaml | 3 ++- ci/release/apply_wheel_modifications.sh | 3 +++ python/setup.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 858c02691..a2d1dd8ee 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -62,13 +62,14 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@static_wheel_name with: build_type: pull-request package-dir: python package-name: rmm skbuild-configure-options: "-DRMM_BUILD_WHEELS=ON" uses-versioneer: false + uses-dynamic-name: false wheel-tests: needs: wheel-build secrets: inherit diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index aad6ae84f..b1cbc3358 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -4,6 +4,9 @@ # Usage: bash apply_wheel_modifications.sh VERSION=${1} +CUDA_SUFFIX=${1} sed -i "s/__version__ = .*/__version__ = \"${VERSION}\"/g" python/rmm/__init__.py sed -i "s/version=.*,/version=\"${VERSION}\",/g" python/setup.py + +sed -i "s/name=\"rmm\",/name=\"rmm-${CUDA_SUFFIX}\"/g" python/setup.py diff --git a/python/setup.py b/python/setup.py index a60f87e75..45b4aa807 100644 --- a/python/setup.py +++ b/python/setup.py @@ -6,7 +6,7 @@ from skbuild import setup setup( - name="rmm" + os.getenv("RAPIDS_PY_WHEEL_CUDA_SUFFIX", default=""), + name="rmm", version="23.04.00", description="rmm - RAPIDS Memory Manager", url="https://github.com/rapidsai/rmm", From aae937691213383fc059bb24946672c5dc49d8b7 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Feb 2023 10:47:32 -0800 Subject: [PATCH 2/9] Also update build.yaml. --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 31a1bd35f..b8bcbd399 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -75,6 +75,7 @@ jobs: package-dir: python skbuild-configure-options: "-DRMM_BUILD_WHEELS=ON" uses-versioneer: false + uses-dynamic-name: false wheel-publish: needs: wheel-build secrets: inherit From 72f124204044697f8a4a79c9e11f8c1d2bf8b3c7 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Feb 2023 10:59:13 -0800 Subject: [PATCH 3/9] Remove unused import. --- python/setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/setup.py b/python/setup.py index 45b4aa807..221908184 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,7 +1,5 @@ # Copyright (c) 2019-2022, NVIDIA CORPORATION. -import os - from setuptools import find_packages from skbuild import setup From 13c86b140b4e38baa1b4f84168d507fe3fa2e88f Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Feb 2023 14:36:45 -0800 Subject: [PATCH 4/9] Update to new param name. --- .github/workflows/build.yaml | 3 +-- .github/workflows/pr.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b8bcbd399..0189aebb2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -74,8 +74,7 @@ jobs: package-name: rmm package-dir: python skbuild-configure-options: "-DRMM_BUILD_WHEELS=ON" - uses-versioneer: false - uses-dynamic-name: false + uses-setup-env-vars: false wheel-publish: needs: wheel-build secrets: inherit diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a2d1dd8ee..240388229 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -68,8 +68,7 @@ jobs: package-dir: python package-name: rmm skbuild-configure-options: "-DRMM_BUILD_WHEELS=ON" - uses-versioneer: false - uses-dynamic-name: false + uses-setup-env-vars: false wheel-tests: needs: wheel-build secrets: inherit From 4cf0c3885f4664b9efb1f069c7ffee81d64e78c7 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Feb 2023 14:36:55 -0800 Subject: [PATCH 5/9] Fix typo. --- ci/release/apply_wheel_modifications.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index b1cbc3358..b0d4584e1 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -4,7 +4,7 @@ # Usage: bash apply_wheel_modifications.sh VERSION=${1} -CUDA_SUFFIX=${1} +CUDA_SUFFIX=${2} sed -i "s/__version__ = .*/__version__ = \"${VERSION}\"/g" python/rmm/__init__.py sed -i "s/version=.*,/version=\"${VERSION}\",/g" python/setup.py From abb2e25bd153242a82f48a6548eee9c6de5b84da Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Feb 2023 15:00:35 -0800 Subject: [PATCH 6/9] bump From 817609d5903f1726c035e2cbd36901c2c5593a48 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Feb 2023 15:09:13 -0800 Subject: [PATCH 7/9] Remove duplicate hyphen. --- ci/release/apply_wheel_modifications.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index b0d4584e1..3b652d2ff 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -9,4 +9,4 @@ CUDA_SUFFIX=${2} sed -i "s/__version__ = .*/__version__ = \"${VERSION}\"/g" python/rmm/__init__.py sed -i "s/version=.*,/version=\"${VERSION}\",/g" python/setup.py -sed -i "s/name=\"rmm\",/name=\"rmm-${CUDA_SUFFIX}\"/g" python/setup.py +sed -i "s/name=\"rmm\",/name=\"rmm${CUDA_SUFFIX}\"/g" python/setup.py From 3b82c9f878f4ff09f41762b77247d935d6580c89 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Feb 2023 15:14:29 -0800 Subject: [PATCH 8/9] Add missing comma. --- ci/release/apply_wheel_modifications.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index 3b652d2ff..c981cd162 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -9,4 +9,4 @@ CUDA_SUFFIX=${2} sed -i "s/__version__ = .*/__version__ = \"${VERSION}\"/g" python/rmm/__init__.py sed -i "s/version=.*,/version=\"${VERSION}\",/g" python/setup.py -sed -i "s/name=\"rmm\",/name=\"rmm${CUDA_SUFFIX}\"/g" python/setup.py +sed -i "s/name=\"rmm\",/name=\"rmm${CUDA_SUFFIX}\",/g" python/setup.py From 9b9ec4b095629002b3a74db555b4142acde4b002 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 17 Feb 2023 09:59:31 -0800 Subject: [PATCH 9/9] Switch branch back to 23.04. --- .github/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 240388229..240344bc1 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -62,7 +62,7 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@static_wheel_name + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.04 with: build_type: pull-request package-dir: python