Merge pull request conda-forge#59 from pentschev/update-1.11.1

Update to UCX 1.11.1
jakirkham-feedstocks · Sep 9, 2021 · 12d6755 · 12d6755
2 parents 32fa817 + 71e475a
commit 12d6755
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 102 deletions.
diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml
@@ -7,10 +7,10 @@ CONDA_USERNAME:
   - rapidsai-nightly
 
 UCX_VER:
-  - 1.9.0
+  - 1.11.1
 
 UCX_COMMIT:
-  - v1.9.0
+  - v1.11.1
 
 UCX_PROC_VER:
   - 1.0.0

diff --git a/ci/axis/release.yml b/ci/axis/release.yml
@@ -7,10 +7,10 @@ CONDA_USERNAME:
   - rapidsai
 
 UCX_VER:
-  - 1.9.0
+  - 1.11.1
 
 UCX_COMMIT:
-  - v1.9.0
+  - v1.11.1
 
 UCX_PROC_VER:
   - 1.0.0

diff --git a/recipe/cuda-alloc-rcache.patch b/recipe/cuda-alloc-rcache.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,16 +1,16 @@
 #### START - Config version naming (right side is default value)
-{% set ucx_version = environ.get("UCX_VER", "v1.9.0").lstrip('v').replace("-", "") %}
+{% set ucx_version = environ.get("UCX_VER", "v1.11.1").lstrip('v').replace("-", "") %}
 {% set ucx_number = environ.get("UCX_BUILD_NUMBER", 0) %}
 {% set ucx_proc_version = environ.get("UCX_PROC_VER", "1.0.0") %}
-{% set ucx_py_version = environ.get("UCX_PY_VER", "0.14a").lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
+{% set ucx_py_version = environ.get("UCX_PY_VER", "0.22").lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
 {% set ucx_py_number = environ.get("UCX_PY_BUILD_NUMBER", 0) %}
-{% set cuda_version = '.'.join(environ.get('CUDA_VER', '9.2').split('.')[:2]) %}
-{% set py_version = environ.get('CONDA_PY', '37') %}
+{% set cuda_version = '.'.join(environ.get('CUDA_VER', '11.4').split('.')[:2]) %}
+{% set py_version = environ.get('CONDA_PY', '38') %}
 #### END - Config version naming
 
 #### START - Config source commits (right side is default value)
-{% set ucx_commit = environ.get("UCX_COMMIT", "cd9efd3") %}
-{% set ucx_py_commit = environ.get("UCX_PY_COMMIT", "7cf2144") %}
+{% set ucx_commit = environ.get("UCX_COMMIT", "c58db6b") %}
+{% set ucx_py_commit = environ.get("UCX_PY_COMMIT", "9c11581") %}
 #### END - Config source commits
 
 {% set ucx_proc_type = "cpu" if cuda_compiler_version == "None" else "gpu" %}
@@ -23,8 +23,6 @@ source:
   - git_url: https://github.com/openucx/ucx
     git_rev: {{ ucx_commit }}
     folder: ucx
-    patches:
-      - cuda-alloc-rcache.patch  # [cuda_compiler_version != "None"]
   - git_url: https://github.com/rapidsai/ucx-py
     git_rev: {{ ucx_py_commit }}
     folder: ucx-py