From 068a0aa757a4050c10f61fde66e703e608ee3002 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 7 Sep 2023 11:17:31 -0700 Subject: [PATCH] Undo manual pinning --- conda/recipes/ucx-py/meta.yaml | 14 -------------- dependencies.yaml | 14 ++------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/conda/recipes/ucx-py/meta.yaml b/conda/recipes/ucx-py/meta.yaml index 6c49d4e87..3599a900d 100644 --- a/conda/recipes/ucx-py/meta.yaml +++ b/conda/recipes/ucx-py/meta.yaml @@ -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: @@ -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 %} @@ -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: diff --git a/dependencies.yaml b/dependencies.yaml index 8b90862b5..53fd9a84d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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]