Use date in build string instead of in the version. #1195

bdice · 2023-01-25T23:54:54Z

Description

Moves date information from the version to the build string. This will help with installing PR artifacts and nightly builds locally and in downstream CI workflows. cc: @ajschmidt8

Checklist

I am familiar with the Contributing Guidelines.
New or existing tests cover these changes.
The documentation is up to date with these changes.

codecov-commenter · 2023-01-26T00:27:01Z

Codecov Report

❗ No coverage uploaded for pull request base (branch-23.04@58ed5c9). Click here to learn what that means.
Patch has no changes to coverable lines.

Additional details and impacted files

@@              Coverage Diff               @@
##             branch-23.04   #1195   +/-   ##
==============================================
  Coverage                ?   0.00%           
==============================================
  Files                   ?       6           
  Lines                   ?     421           
  Branches                ?       0           
==============================================
  Hits                    ?       0           
  Misses                  ?     421           
  Partials                ?       0

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

harrism · 2023-01-26T00:32:24Z

Is this needed in 23.02? Code freeze is tonight...

bdice · 2023-01-26T00:44:12Z

@harrism, I spoke with @ajschmidt8 and we're not sure if this should target 23.02 or 23.04 yet. There are some downstream CI problems that have been reported after we enabled version suffixes (date strings) for CI artifacts. That change was necessary for enabling downstream testing of PR artifacts from rmm/cudf in other repos' CI. However, we may need this PR to remove the date strings from the version so that we can resolve those problems. @ajschmidt8 is going to look at this soon (I will be out of office for a few days).

conda/recipes/librmm/meta.yaml

ajschmidt8 · 2023-01-26T22:36:45Z

just merged rapidsai/gha-tools#39 to support these changes.

Once that's deployed to our CI images, I'll push the changes that Ray suggested above to test everything out.

ajschmidt8 · 2023-01-26T22:39:20Z

Also, Mark, we'll push this to 23.04.

Too risky for 23.02.

The base branch was changed.

ajschmidt8 · 2023-01-27T16:40:44Z

Adding a DO NOT MERGE label while I solicit broader feedback about this change.

ajschmidt8 · 2023-01-31T18:07:29Z

Seems like the consensus is that this change is okay to roll out to all the RAPIDS libraries.

I will open a similar PR to cudf and then investigate how conda behaves when the artifacts from that PR behave are installed in an environment with the artifacts from this PR.

Once that's complete, I'll continue opening PRs for the other RAPIDS repos.

Similarly to rapidsai/rmm#1195, this PR moves the date from the version to the build string in the `cudf` `conda` recipes. This prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist.

Similarly to rapidsai/rmm#1195, this PR moves the date from the version to the build string in the `dask-cuda` `conda` recipes. This prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. Additionally, this PR removes some aliases for the `GIT_DESCRIBE_HASH` and `GIT_DESCRIBE_NUMBER` variables since they are provided by `conda build` and therefore will always exist.

bdice · 2023-02-01T17:54:46Z

conda/recipes/librmm/meta.yaml

 {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
 {% set cuda_major = cuda_version.split('.')[0] %}
 {% set cuda_spec = ">=" + cuda_major ~ ",<" + (cuda_major | int + 1) ~ ".0a0" %} # i.e. >=11,<12.0a0
+{% set date_string = environ.get('DATE_STRING', '000000') %}


Discussed with @ajschmidt8.

Let's make this required. Rename it to RAPIDS_DATE_STRING. Fetch the date with git show -s --date=format:'%y%m%d' --format='%cd' so it matches the commit date and not the date that CI was run.

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: rapidsai/rmm#1195

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) - Bradley Dice (https://github.com/bdice) URL: #12661

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #1103

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #543

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) - H. Thomson Comer (https://github.com/thomcom) URL: #882

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #5190

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #3222

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) - Ajay Thorve (https://github.com/AjayThorve) URL: #441

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #497

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #165

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #1223

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #359

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #920

ajschmidt8 · 2023-02-06T17:59:17Z

/merge

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, which is useful for testing purposes. Additionally, this prevents a bug from occurring where the Python builds fail because the date string it computes is different than the one computed by the C++ build, therefore causing the Python build to search for a C++ build artifact that doesn't exist. xref: rapidsai/rmm#1195 Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: rapidsai#5190

Use date in build string instead of in the version.

ff3972c

github-actions bot added the conda label Jan 25, 2023

harrism previously approved these changes Jan 26, 2023

View reviewed changes

raydouglass requested changes Jan 26, 2023

View reviewed changes

conda/recipes/librmm/meta.yaml Outdated Show resolved Hide resolved

conda/recipes/librmm/meta.yaml Outdated Show resolved Hide resolved

ajschmidt8 added non-breaking Non-breaking change improvement Improvement / enhancement to an existing function labels Jan 26, 2023

ajschmidt8 changed the base branch from branch-23.02 to branch-23.04 January 26, 2023 22:39

ajschmidt8 added 5 commits January 26, 2023 18:19

rm DATE_STRING conditional

d232a40

mv DATE_STRING before GIT_DESCRIBE_HASH

013cc13

mv DATE_STRING before GIT_DESCRIBE_HASH again

2ba4d02

Merge remote-tracking branch 'upstream/branch-23.04' into date-string

546a59a

fix-spacing

8403682

ajschmidt8 marked this pull request as ready for review January 27, 2023 16:38

ajschmidt8 requested a review from a team as a code owner January 27, 2023 16:38

raydouglass approved these changes Jan 27, 2023

View reviewed changes

ajschmidt8 added the 5 - DO NOT MERGE Hold off on merging; see PR for details label Jan 27, 2023

make DATE_STRING env var optional

50adc45

ajschmidt8 mentioned this pull request Jan 31, 2023

Move date to build string in conda recipe rapidsai/cudf#12661

Merged

ajschmidt8 mentioned this pull request Feb 1, 2023

Move date to build string in conda recipe rapidsai/dask-cuda#1103

Merged

bdice commented Feb 1, 2023

View reviewed changes

ajschmidt8 mentioned this pull request Feb 1, 2023

Move date to build string in conda recipe rapidsai/rapids-cmake#359

Merged

This was referenced Feb 1, 2023

Move date to build string in conda recipe rapidsai/kvikio#165

Merged

Move date to build string in conda recipe rapidsai/integration#606

Merged

ajschmidt8 mentioned this pull request Feb 2, 2023

Move date to build string in conda recipe rapidsai/ucx-py#920

Merged

ajschmidt8 mentioned this pull request Feb 2, 2023

Move date to build string in conda recipe rapidsai/jupyterlab-nvdashboard#147

Merged

rm PKG_HASH from build string

474b76a

ajschmidt8 removed the 5 - DO NOT MERGE Hold off on merging; see PR for details label Feb 6, 2023

rapids-bot bot merged commit 4218800 into rapidsai:branch-23.04 Feb 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use date in build string instead of in the version. #1195

Use date in build string instead of in the version. #1195

bdice commented Jan 25, 2023

codecov-commenter commented Jan 26, 2023 •

edited

Loading

harrism commented Jan 26, 2023

bdice commented Jan 26, 2023 •

edited

Loading

ajschmidt8 commented Jan 26, 2023

ajschmidt8 commented Jan 26, 2023

ajschmidt8 commented Jan 27, 2023

ajschmidt8 commented Jan 31, 2023

bdice Feb 1, 2023 •

edited

Loading

ajschmidt8 commented Feb 6, 2023

Use date in build string instead of in the version. #1195

Use date in build string instead of in the version. #1195

Conversation

bdice commented Jan 25, 2023

Description

Checklist

codecov-commenter commented Jan 26, 2023 • edited Loading

Codecov Report

harrism commented Jan 26, 2023

bdice commented Jan 26, 2023 • edited Loading

ajschmidt8 commented Jan 26, 2023

ajschmidt8 commented Jan 26, 2023

ajschmidt8 commented Jan 27, 2023

ajschmidt8 commented Jan 31, 2023

bdice Feb 1, 2023 • edited Loading

Choose a reason for hiding this comment

ajschmidt8 commented Feb 6, 2023

codecov-commenter commented Jan 26, 2023 •

edited

Loading

bdice commented Jan 26, 2023 •

edited

Loading

bdice Feb 1, 2023 •

edited

Loading