Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 12 commits into from
Feb 6, 2023
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ff3972c
Use date in build string instead of in the version.
bdice Jan 25, 2023
d232a40
rm `DATE_STRING` conditional
ajschmidt8 Jan 26, 2023
013cc13
mv `DATE_STRING` before `GIT_DESCRIBE_HASH`
ajschmidt8 Jan 26, 2023
2ba4d02
mv `DATE_STRING` before `GIT_DESCRIBE_HASH` again
ajschmidt8 Jan 26, 2023
546a59a
Merge remote-tracking branch 'upstream/branch-23.04' into date-string
ajschmidt8 Jan 26, 2023
8403682
fix-spacing
ajschmidt8 Jan 27, 2023
50adc45
make `DATE_STRING` env var optional
ajschmidt8 Jan 27, 2023
a11dc82
update env var name
ajschmidt8 Feb 1, 2023
8d491d9
Update conda/recipes/rmm/meta.yaml
ajschmidt8 Feb 1, 2023
4430cf8
Merge branch 'branch-23.04' into date-string
ajschmidt8 Feb 1, 2023
5bf1645
add `PKG_HASH`
ajschmidt8 Feb 1, 2023
474b76a
rm `PKG_HASH` from build string
ajschmidt8 Feb 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions conda/recipes/librmm/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Copyright (c) 2018-2022, NVIDIA CORPORATION.
# Copyright (c) 2018-2023, NVIDIA CORPORATION.

{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
{% 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['DATE_STRING']) if 'DATE_STRING' in environ else '' %}

package:
name: librmm-split
Expand Down Expand Up @@ -43,7 +44,7 @@ outputs:
script: install_librmm.sh
build:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}{{ date_string }}
run_exports:
- {{ pin_subpackage("librmm", max_pin="x.x") }}
ignore_run_exports_from:
Expand Down Expand Up @@ -97,7 +98,7 @@ outputs:
script: install_librmm_tests.sh
build:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}{{ date_string }}
raydouglass marked this conversation as resolved.
Show resolved Hide resolved
ajschmidt8 marked this conversation as resolved.
Show resolved Hide resolved
ignore_run_exports_from:
- {{ compiler('cuda') }}
requirements:
Expand Down
7 changes: 4 additions & 3 deletions conda/recipes/rmm/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Copyright (c) 2019-2022, NVIDIA CORPORATION.
# Copyright (c) 2019-2023, NVIDIA CORPORATION.

{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
{% set cuda_major = cuda_version.split('.')[0] %}
{% set py_version = environ['CONDA_PY'] %}
{% set date_string = ('_' + environ['DATE_STRING']) if 'DATE_STRING' in environ else '' %}

package:
name: rmm
Expand All @@ -14,7 +15,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 }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}{{ date_string }}
script_env:
- CMAKE_GENERATOR
- CMAKE_C_COMPILER_LAUNCHER
Expand Down