From d367c645494ef5ba8465acbfead712c38290ec91 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Wed, 1 Feb 2023 18:32:18 -0500 Subject: [PATCH] Move date to build string in `conda` recipe This PR moves the date string from the version to the build string for conda recipes in this repository. This is necessary to ensure that the conda packages resulting from PR builds can be installed in the same environment as nightly conda packages. This is useful for testing purposes. Additionally, this PR adds the `PKG_HASH` value to our build string. This value is a hash computed from the dependency names and versions used to build our packages. Typically the `PKG_HASH` value is included in packages when the build string is omitted, as seen on most `conda-forge` packages. Including it in our build string will help ensure that new packages are published whenever our dependencies change (which is important in the case of shared library updates). xref: https://github.com/rapidsai/rmm/pull/1195 --- conda/recipes/rapids-build-env/meta.yaml | 7 ++++--- conda/recipes/rapids-doc-env/meta.yaml | 7 ++++--- conda/recipes/rapids-notebook-env/meta.yaml | 7 ++++--- conda/recipes/rapids-xgboost/meta.yaml | 7 ++++--- conda/recipes/rapids/meta.yaml | 7 ++++--- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 1b2546ca..42d739d2 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -1,10 +1,11 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2023, NVIDIA CORPORATION. -{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') + environ.get('VERSION_SUFFIX', '') %} +{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') %} {% set minor_version = rapids_version.split('.')[0] + '.' + rapids_version.split('.')[1] %} {% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} {% set cuda_major=cuda_version.split('.')[0] %} +{% set date_string = environ['RAPIDS_DATE_STRING'] %} ### # Versions referenced below are set in `conda/recipe/*versions.yaml` except for @@ -26,7 +27,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_h{{ PKG_HASH }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CUDA_VERSION - RAPIDS_VER diff --git a/conda/recipes/rapids-doc-env/meta.yaml b/conda/recipes/rapids-doc-env/meta.yaml index 2c675514..6f64ba74 100644 --- a/conda/recipes/rapids-doc-env/meta.yaml +++ b/conda/recipes/rapids-doc-env/meta.yaml @@ -1,8 +1,9 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2023, NVIDIA CORPORATION. -{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') + environ.get('VERSION_SUFFIX', '') %} +{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') %} {% set minor_version = rapids_version.split('.')[0] + '.' + rapids_version.split('.')[1] %} {% set py_version = environ.get('CONDA_PY', 36) %} +{% set date_string = environ['RAPIDS_DATE_STRING'] %} ### # Versions referenced below are set in `conda/recipe/*versions.yaml` except for @@ -24,7 +25,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: py{{ py_version }}_{{ date_string }}_h{{ PKG_HASH }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - RAPIDS_VER - VERSION_SUFFIX diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 630b3254..244af912 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -1,10 +1,11 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2023, NVIDIA CORPORATION. -{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') + environ.get('VERSION_SUFFIX', '') %} +{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') %} {% set minor_version = rapids_version.split('.')[0] + '.' + rapids_version.split('.')[1] %} {% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} {% set cuda_major=cuda_version.split('.')[0] %} +{% set date_string = environ['RAPIDS_DATE_STRING'] %} ### # Versions referenced below are set in `conda/recipe/*versions.yaml` except for @@ -26,7 +27,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_h{{ PKG_HASH }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CUDA_VERSION - RAPIDS_VER diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index ab7aba01..1460a4c1 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -1,10 +1,11 @@ -# Copyright (c) 2019, NVIDIA CORPORATION. +# Copyright (c) 2019-2023, NVIDIA CORPORATION. -{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') + environ.get('VERSION_SUFFIX', '') %} +{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') %} {% set minor_version = rapids_version.split('.')[0] + '.' + rapids_version.split('.')[1] %} {% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} {% set cuda_major=cuda_version.split('.')[0] %} +{% set date_string = environ['RAPIDS_DATE_STRING'] %} ### # Versions referenced below are set in `conda/recipe/*versions.yaml` except for @@ -26,7 +27,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_h{{ PKG_HASH }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CUDA_VERSION - RAPIDS_VER diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index f5b28c85..2c6bc75d 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -1,10 +1,11 @@ -# Copyright (c) 2019, NVIDIA CORPORATION. +# Copyright (c) 2019-2023, NVIDIA CORPORATION. -{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') + environ.get('VERSION_SUFFIX', '') %} +{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') %} {% set minor_version = rapids_version.split('.')[0] + '.' + rapids_version.split('.')[1] %} {% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} {% set cuda_major=cuda_version.split('.')[0] %} +{% set date_string = environ['RAPIDS_DATE_STRING'] %} ### # Versions referenced below are set in `conda/recipe/*versions.yaml` except for @@ -26,7 +27,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_h{{ PKG_HASH }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CUDA_VERSION - RAPIDS_VER