Skip to content

Commit

Permalink
Undo manual pinning (#987)
Browse files Browse the repository at this point in the history
This PR is a test to validate that upstream ucx builds are no longer broken, at which point we will also be able to remove this pinning.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Benjamin Zaitlen (https://github.com/quasiben)
  - Ray Douglass (https://github.com/raydouglass)

URL: #987
  • Loading branch information
vyasr authored Sep 8, 2023
1 parent d380ce7 commit cdaac6d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 26 deletions.
14 changes: 0 additions & 14 deletions conda/recipes/ucx-py/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
{% set py_version = environ['CONDA_PY'] %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
{% set cuda_major = cuda_version.split('.')[0] %}
{% set date_string = environ['RAPIDS_DATE_STRING'] %}

package:
Expand All @@ -28,13 +27,7 @@ requirements:
host:
- python
- pip
{% if cuda_major == "11" %}
- ucx
{% else %}
# Temporary pin because the subsequent build (h64cca9d_3) is missing proper
# CUDA support
- ucx==1.14.1=h195a15c_3
{% endif %}
{% for r in data.get("build-system", {}).get("requires", []) %}
- {{ r }}
{% endfor %}
Expand All @@ -43,14 +36,7 @@ requirements:
{% for r in data.get("project", {}).get("dependencies", []) %}
- {{ r }}
{% endfor %}
# Something seems wrong with the run export as well now
{% if cuda_major == "11" %}
- ucx
{% else %}
# Temporary pin because the subsequent build (h64cca9d_3) is missing proper
# CUDA support
- ucx==1.14.1=h195a15c_3
{% endif %}

test:
imports:
Expand Down
14 changes: 2 additions & 12 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,9 @@ dependencies:
packages:
- numpy>=1.21
- pynvml>=11.4.1
specific:
- output_types: conda
matrices:
- matrix:
cuda: "12.0"
packages:
# Temporary pin because the subsequent build (h64cca9d_3) is
# missing proper CUDA support
- ucx==1.14.1=h195a15c_3
- matrix:
cuda: "11.8"
packages:
- ucx
packages:
- ucx
test_python:
common:
- output_types: [conda, requirements, pyproject]
Expand Down

0 comments on commit cdaac6d

Please sign in to comment.