Merge pull request #64 from jakirkham-feedstocks/release_1.7.0

Release 1.7.0
conda-forge · Jan 21, 2020 · 66df729 · 66df729
2 parents 456764f + d74fec1
commit 66df729
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 34 deletions.
diff --git a/recipe/fixes_4218.diff b/recipe/fixes_4218.diff
diff --git a/recipe/install_ucx.sh b/recipe/install_ucx.sh
@@ -7,17 +7,13 @@ if [ ${cuda_compiler_version} != "None" ]; then
     CUDA_CONFIG_ARG="--with-cuda=${CUDA_HOME}"
 fi
 
-# Disable CMA to workaround an upstream bug.
-# xref: https://github.com/openucx/ucx/issues/3391
-# xref: https://github.com/openucx/ucx/pull/3424
-
 ./autogen.sh
 ./configure \
     --build="${BUILD}" \
     --host="${HOST}" \
     --prefix="${PREFIX}" \
     --with-sysroot \
-    --disable-cma \
+    --enable-cma \
     --enable-mt \
     --enable-numa \
     --with-gnu-ld \

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
-{% set ucx_version = "1.6.1" %}
+{% set ucx_version = "1.7.0" %}
 {% set ucx_proc_version = "1.0.0" %}
-{% set number = "7" %}
+{% set number = "0" %}
 
 {% set ucx_proc_type = "cpu" if cuda_compiler_version == "None" else "gpu" %}
 
@@ -10,14 +10,7 @@ package:
 
 source:
   url: https://github.com/openucx/ucx/archive/v{{ ucx_version }}.tar.gz
-  sha256: 20b2970b3e714ff2d41937e53525d49c3012df7ef7eb7fcb75ae47efd7bd1396
-  patches:
-    #####################################################
-    # Fix a linking issue with `test_link_map`.         #
-    #                                                   #
-    # xref: https://github.com/openucx/ucx/issues/4218  #
-    #####################################################
-    - fixes_4218.diff
+  sha256: d7d8b2436990e106642fc90116bbf951cb2bf73479ebbe384c34410483b51187
 
 build:
   skip: true  # [not linux]