From 097011cf62ac3858f4eeeeacaba1de773ed1d7d6 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 12 Mar 2024 11:23:57 -0700 Subject: [PATCH 1/7] Switch to `rdma-core` dependency Also include on `linux_aarch64` as it uses this dependency too. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4dbbf7b..d8c3156 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -56,9 +56,9 @@ outputs: - {{ compiler("cxx") }} - arm-variant * {{ arm_variant_type }} # [aarch64] - sysroot_{{ target_platform }} 2.17 # [linux] - - {{ 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") }} From 2de3caed9868c894e74f1aa2c90ec922ddd0bfa5 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 12 Mar 2024 11:23:58 -0700 Subject: [PATCH 2/7] Test `rdma-core` support on all Linuxes --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d8c3156..d72e2de 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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: From c886d763b438eab27b1a26df6ef538dba017f80c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 12 Mar 2024 11:23:59 -0700 Subject: [PATCH 3/7] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.12.14.44.34 --- .ci_support/linux_64_.yaml | 2 ++ .ci_support/linux_aarch64_.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 0f7dae2..b615298 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -14,6 +14,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +rdma_core: +- '49' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 4f36128..24a6cef 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -20,6 +20,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 +rdma_core: +- '49' target_platform: - linux-aarch64 zip_keys: From 8decb26db1f69ca04ab030b729985f236d23db60 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 12 Mar 2024 11:23:59 -0700 Subject: [PATCH 4/7] Bump `build/number` to `1` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d72e2de..820eb77 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: sha256: 3bdfcfff9c8190e0a7e7f399f17b0b291d5cc3755117e8e53671fedd7dd25de0 # [aarch64] build: - number: 0 + number: 1 binary_relocation: false skip: true # [not (linux64 or aarch64)] From b619adad4d3616faf86a8b905c068fc2ce4b78bc Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 10 Apr 2024 00:09:56 -0500 Subject: [PATCH 5/7] Move `pkgconfig` content (not directory) --- recipe/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 4c9260c..301dc53 100644 --- 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" From 0233bdde974a57be1360b6b6f3c048165a2f18a3 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 10 Apr 2024 00:20:46 -0500 Subject: [PATCH 6/7] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.10.04.46.28 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .ci_support/linux_64_.yaml | 8 +++++++- .ci_support/linux_aarch64_.yaml | 8 +++++++- .scripts/build_steps.sh | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index abcbeb9..875d996 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -13,6 +13,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index b615298..c5bb9cb 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -15,9 +19,11 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 rdma_core: -- '49' +- '51' target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 24a6cef..8da551d 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -6,6 +6,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -21,9 +25,11 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 rdma_core: -- '49' +- '51' target_platform: - linux-aarch64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a4d638b..2f3df6c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -65,7 +65,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" From b29246cc47992b68abe81f5851d4e3f1c3ddff7b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 24 Jun 2024 23:01:34 -0700 Subject: [PATCH 7/7] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.25.03.09.40 --- .ci_support/linux_64_.yaml | 6 ------ .ci_support/linux_aarch64_.yaml | 6 ------ .gitattributes | 4 ++-- .github/workflows/automerge.yml | 2 -- .scripts/build_steps.sh | 7 +++++++ .travis.yml | 4 ++-- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index c5bb9cb..10273a4 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -2,10 +2,6 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: @@ -25,5 +21,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 8da551d..a51681e 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -6,10 +6,6 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -31,5 +27,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index da1368a..0535f6a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest name: automerge steps: - - name: checkout - uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 2f3df6c..97dc8d9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -69,6 +69,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.travis.yml b/.travis.yml index 05d64a4..18ca8e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -language: generic +language: shell -matrix: +jobs: include: - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux