Merge pull request #14 from jakirkham-feedstocks/drop_cdt

conda-forge · Oct 24, 2024 · 55609a7 · 55609a7
2 parents 5802c3c + 63ee783
commit 55609a7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -18,6 +18,8 @@ cxx_compiler_version:
 - '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+rdma_core:
+- '51'
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -24,6 +24,8 @@ cxx_compiler_version:
 - '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+rdma_core:
+- '51'
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -3,11 +3,12 @@
 # Install to conda style directories
 [[ -d lib64 ]] && mv lib64 lib
 mkdir -p ${PREFIX}/lib
+mkdir -p ${PREFIX}/lib/pkgconfig
 mkdir -p ${PREFIX}/gds
 rm -rv etc
 mv -v man ${PREFIX}/man
 mv -v tools ${PREFIX}/gds/tools
-[[ -d pkg-config ]] && mv pkg-config ${PREFIX}/lib/pkgconfig
+[[ -d pkg-config ]] && mv pkg-config/* ${PREFIX}/lib/pkgconfig/
 [[ -d "$PREFIX/lib/pkgconfig" ]] && sed -E -i "s|cudaroot=.+|cudaroot=$PREFIX|g" $PREFIX/lib/pkgconfig/cufile*.pc
 
 [[ ${target_platform} == "linux-64" ]] && targetsDir="targets/x86_64-linux"

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -17,7 +17,7 @@ source:
   sha256: fda8d0491f9e3311adb317841893a531737b82316187619e2116d86d7a84faaf  # [aarch64]
 
 build:
-  number: 0
+  number: 1
   binary_relocation: false
   skip: true  # [not (linux64 or aarch64)]
 
@@ -33,13 +33,13 @@ test:
     # finding the versioned .so file.
     {% set full_version = version.split(".")[:-1] | join(".") %}
     - test -L $PREFIX/lib/libcufile.so.0
-    - test -L $PREFIX/lib/libcufile_rdma.so.{{ version.split(".")[0] }}  # [linux64]
+    - test -L $PREFIX/lib/libcufile_rdma.so.{{ version.split(".")[0] }}
     - test -L $PREFIX/lib/libcufile.so.{{ full_version }}
-    - test -L $PREFIX/lib/libcufile_rdma.so.{{ full_version }}  # [linux64]
+    - test -L $PREFIX/lib/libcufile_rdma.so.{{ full_version }}
     - test -L $PREFIX/targets/{{ target_name }}/lib/libcufile.so.0
-    - test -L $PREFIX/targets/{{ target_name }}/lib/libcufile_rdma.so.{{ version.split(".")[0] }}  # [linux64]
+    - test -L $PREFIX/targets/{{ target_name }}/lib/libcufile_rdma.so.{{ version.split(".")[0] }}
     - test -f $PREFIX/targets/{{ target_name }}/lib/libcufile.so.{{ full_version }}
-    - test -f $PREFIX/targets/{{ target_name }}/lib/libcufile_rdma.so.{{ full_version }}  # [linux64]
+    - test -f $PREFIX/targets/{{ target_name }}/lib/libcufile_rdma.so.{{ full_version }}
     - bash test-rpath.sh                                                                      # [linux]
 
 outputs:
@@ -56,9 +56,9 @@ outputs:
         - {{ compiler("cxx") }}
         - arm-variant * {{ arm_variant_type }}  # [aarch64]
         - {{ stdlib("c") }}
-        - {{ cdt("rdma-core-devel") }}          # [linux64]
         - patchelf <0.18.0                      # [linux]
       host:
+        - rdma-core                             # [linux]
         - cuda-version {{ cuda_version }}
       run:
         - {{ pin_compatible("cuda-version", max_pin="x.x") }}