From 1f546dc4c128a157563afdb16580d0c8fb5983e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jind=C5=99ich=20Makovi=C4=8Dka?= Date: Tue, 11 Feb 2025 10:46:42 +0100 Subject: [PATCH 1/3] Boost 1.86 SHA1 compatibility fix --- recipe/boost-sha1.diff | 19 +++++++++++++++++++ recipe/meta.yaml | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 recipe/boost-sha1.diff diff --git a/recipe/boost-sha1.diff b/recipe/boost-sha1.diff new file mode 100644 index 0000000..813e78e --- /dev/null +++ b/recipe/boost-sha1.diff @@ -0,0 +1,19 @@ +diff -ur lightgbm-4.5.0.orig/external_libs/compute/include/boost/compute/detail/sha1.hpp lightgbm-4.5.0/external_libs/compute/include/boost/compute/detail/sha1.hpp +--- lightgbm-4.5.0.orig/external_libs/compute/include/boost/compute/detail/sha1.hpp 2022-11-09 07:37:21.000000000 -0500 ++++ lightgbm-4.5.0/external_libs/compute/include/boost/compute/detail/sha1.hpp 2025-02-11 04:25:47.787251140 -0500 +@@ -37,12 +37,12 @@ + } + + operator std::string() { +- unsigned int digest[5]; ++ boost::uuids::detail::sha1::digest_type digest; + h.get_digest(digest); + + std::ostringstream buf; +- for(int i = 0; i < 5; ++i) +- buf << std::hex << std::setfill('0') << std::setw(8) << digest[i]; ++ for(size_t i = 0; i < sizeof(digest) / sizeof(digest[0]); ++i) ++ buf << std::hex << std::setfill('0') << std::setw(sizeof(digest[0]) * 2) << digest[i]; + + return buf.str(); + } diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c3f4890..c00f874 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,6 +12,8 @@ source: # Taken from https://github.com/microsoft/LightGBM/blob/v4.5.0/build-python.sh#L308-L316 # except that we don't copy lib_lightgbm.so to SP_DIR - use_precompiled.diff + # Compatibility fix for Boost 1.86 + - boost-sha1.diff build: number: 4 From bf36b712828c88d48a7980958a494777f72b768c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jind=C5=99ich=20Makovi=C4=8Dka?= Date: Tue, 11 Feb 2025 10:56:27 +0100 Subject: [PATCH 2/3] Rebuild for libboost 1.86 --- .ci_support/migrations/libboost186.yaml | 14 ++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libboost186.yaml diff --git a/.ci_support/migrations/libboost186.yaml b/.ci_support/migrations/libboost186.yaml new file mode 100644 index 0000000..001c6a6 --- /dev/null +++ b/.ci_support/migrations/libboost186.yaml @@ -0,0 +1,14 @@ +__migrator: + build_number: 1 + kind: version + commit_message: "Rebuild for libboost 1.86" + migration_number: 1 +assimp: +- 5.4.2 +libboost_devel: +- "1.86" +libboost_headers: +- "1.86" +libboost_python_devel: +- "1.86" +migrator_ts: 1723764795.6693385 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c00f874..1b7b867 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,7 @@ source: - boost-sha1.diff build: - number: 4 + number: 5 string: cuda_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] string: cpu_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] # CUDA is not supported in windows From efb435af644222905ba265e637edc721f931ef82 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2025 10:10:18 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.4, and conda-forge-pinning 2025.02.10.18.05.55 --- ...ilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...uda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml | 2 +- ...ilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...uda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml | 2 +- ...ilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...uda-nvcccuda_compiler_version12.4cxx_compiler_version12.yaml | 2 +- ...ilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index d92417a..bdc7dd4 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 libboost_devel: -- '1.84' +- '1.86' python_min: - '3.9' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index e4c5801..66da533 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libboost_devel: -- '1.84' +- '1.86' python_min: - '3.9' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml index 82cbe36..68edf85 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libboost_devel: -- '1.84' +- '1.86' python_min: - '3.9' target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 773a100..908ac59 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 libboost_devel: -- '1.84' +- '1.86' python_min: - '3.9' target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index 7d5f134..a118c5e 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libboost_devel: -- '1.84' +- '1.86' python_min: - '3.9' target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml index eac05ef..fa82663 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libboost_devel: -- '1.84' +- '1.86' python_min: - '3.9' target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 5d1ec20..ceb2209 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 libboost_devel: -- '1.84' +- '1.86' python_min: - '3.9' target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12.yaml index ee84446..de03336 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libboost_devel: -- '1.84' +- '1.86' python_min: - '3.9' target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index b61f1ae..a63d6cf 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libboost_devel: -- '1.84' +- '1.86' python_min: - '3.9' target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index d1b016f..1efc917 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '18' libboost_devel: -- '1.84' +- '1.86' llvm_openmp: - '18' macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index dd5992b..4f95a8d 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '18' libboost_devel: -- '1.84' +- '1.86' llvm_openmp: - '18' macos_machine: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 6823835..ad2d6e6 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -11,7 +11,7 @@ cuda_compiler_version: cxx_compiler: - vs2019 libboost_devel: -- '1.84' +- '1.86' python_min: - '3.9' target_platform: