From d735e2c212b039cd6c54803e667917b8b6643e0c Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Mon, 5 Feb 2024 08:32:39 +0300 Subject: [PATCH 01/13] rebuild --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dce4623..08751d6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.1" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 2 %} +{% set build = 3 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From 65e2d8c83538474d9fe2ec28c754329068ca934f Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Mon, 5 Feb 2024 19:29:28 +0300 Subject: [PATCH 02/13] Revert change to .gitignore --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 179afe5..c7c91a7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ # build_artifacts gets ignored which trips some build systems. # To avoid that we 'un-ignore' all files/folders recursively # and only ignore the root build_artifacts folder. -!/build_artifacts/** -/build_artifacts +# !/build_artifacts/** +# /build_artifacts *.pyc From 6462ccac010db8363399c215ea3c176ce65b1788 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Tue, 6 Feb 2024 15:39:04 -0500 Subject: [PATCH 03/13] Update conda-forge.yml --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index ecac8f0..db940b9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -13,3 +13,5 @@ provider: linux_ppc64le: default osx_arm64: default test: native_and_emulated +azure: + free_disk_space: true From a52c953e517ed4a24dd882b871220b4cae54e5f9 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:41:51 +0000 Subject: [PATCH 04/13] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.06.16.43.21 --- .azure-pipelines/azure-pipelines-linux.yml | 21 +++++++++++++++++++++ .gitignore | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f6cc8b8..5e640a4 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -35,6 +35,27 @@ jobs: timeoutInMinutes: 360 steps: + - script: | + sudo mkdir -p /opt/empty_dir || true + for d in \ + /opt/ghc \ + /opt/hostedtoolcache \ + /usr/lib/jvm \ + /usr/local/.ghcup \ + /usr/local/lib/android \ + /usr/local/share/powershell \ + /usr/share/dotnet \ + /usr/share/swift \ + ; do + sudo rsync --stats -a --delete /opt/empty_dir/ $d || true + done + sudo apt-get purge -y -f firefox \ + google-chrome-stable \ + microsoft-edge-stable + sudo apt-get autoremove -y >& /dev/null + sudo apt-get autoclean -y >& /dev/null + df -h + displayName: Manage disk space # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.gitignore b/.gitignore index c7c91a7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ # build_artifacts gets ignored which trips some build systems. # To avoid that we 'un-ignore' all files/folders recursively # and only ignore the root build_artifacts folder. -# !/build_artifacts/** -# /build_artifacts +!/build_artifacts/** +/build_artifacts *.pyc From 67bc1acf4c5068fe08fb18b97f85f383c2012a6a Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Tue, 6 Feb 2024 23:30:15 -0500 Subject: [PATCH 05/13] bump swap size Co-authored-by: jakirkham --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index db940b9..0adfa00 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -15,3 +15,5 @@ provider: test: native_and_emulated azure: free_disk_space: true + settings_linux: + swapfile_size: 10GiB From 674c16f5c8e601b3369de705a008c1e6e7e3d5e4 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 04:32:40 +0000 Subject: [PATCH 06/13] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.06.16.43.21 --- .azure-pipelines/azure-pipelines-linux.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5e640a4..29b3677 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -56,6 +56,12 @@ jobs: sudo apt-get autoclean -y >& /dev/null df -h displayName: Manage disk space + - script: | + sudo fallocate -l 10GiB /swapfile || true + sudo chmod 600 /swapfile || true + sudo mkswap /swapfile || true + sudo swapon /swapfile || true + displayName: Create swap file # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | From c746f629429a58af6753fdee2adae6be6560a0e1 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Wed, 7 Feb 2024 11:25:16 +0300 Subject: [PATCH 07/13] use patchelf --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 08751d6..cdc07a6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,6 +22,7 @@ build: number: {{ build }} skip: true # [win] skip: true # [linux and cuda_compiler_version != "11.8"] + rpaths_patcher: patchelf # [linux] outputs: {% if mpi_type == 'conda' %} From 57ae96bfcae27325e528ef82e9e61aa9f9cd26d4 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 8 Feb 2024 13:27:18 +0100 Subject: [PATCH 08/13] try rdma-core 49 --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cdc07a6..8f10fa3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,6 +52,7 @@ outputs: - libevent - libnl # [linux] - zlib + - rdma-core 49 # [linux] - ucx # [linux] - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: From 5b1dd67c2948cdb3e91b870e6590c8183502c598 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 19:46:53 +0000 Subject: [PATCH 09/13] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.02.26.18.33.44 --- .scripts/build_steps.sh | 6 +++--- .scripts/run_osx_build.sh | 6 +++--- build-locally.py | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247..9121002 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${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:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb9..16daa69 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -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" diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From f3ef86f8531e99f99b21533f50e5996b06638b5e Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:09:59 +0000 Subject: [PATCH 10/13] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.10.12.43.11 --- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 49f8831..279332e 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -36,9 +36,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 1454ae4..e690fc8 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -36,9 +36,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 981794a..e6c05d7 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -40,9 +40,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 530eee2..afa5537 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -40,9 +40,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 2ce6803..f65a313 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -36,9 +36,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index d0ab626..877c3e8 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -36,9 +36,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' From 65a4e587b6a23a15880d7c985a6358894208b75c Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Mon, 11 Mar 2024 09:54:27 -0400 Subject: [PATCH 11/13] Update recipe/meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8f10fa3..cdc07a6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,7 +52,6 @@ outputs: - libevent - libnl # [linux] - zlib - - rdma-core 49 # [linux] - ucx # [linux] - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: From cbf6604f9252e845041a8edfab6c6492eaf57299 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 11 Mar 2024 12:44:28 -0700 Subject: [PATCH 12/13] Use `sysroot` for `2.17` This lines up the GLIBC version with the Docker image used in the CentOS 7 case. It also ensures GLIBC is properly constrained in the packages produced. --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cdc07a6..7f0034f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,6 +41,7 @@ outputs: - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler != "None"] - {{ compiler('fortran') }} + - sysroot_{{ target_platform }} 2.17 # [linux] #- autoconf # [unix] #- automake # [unix] - libtool # [unix] From c1a080f0d503ede04bc56e22bd3f570db2f399ff Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Mon, 11 Mar 2024 15:45:35 -0400 Subject: [PATCH 13/13] remove unsuccessful attempt --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7f0034f..61f0fcb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,6 @@ build: number: {{ build }} skip: true # [win] skip: true # [linux and cuda_compiler_version != "11.8"] - rpaths_patcher: patchelf # [linux] outputs: {% if mpi_type == 'conda' %}