From af91c3285b09d1fbf70e709e3b69b5201bc6dcec Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sat, 24 Dec 2022 16:51:55 +0000 Subject: [PATCH 1/9] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 3b08f48..b1bc3e3 100644 --- a/README.md +++ b/README.md @@ -216,3 +216,6 @@ Feedstock Maintainers * [@kmpaul](https://github.com/kmpaul/) * [@lindstro](https://github.com/lindstro/) + + + From 6fe419b78e73ec9bb25fbf8cd410f04cbbcdd61e Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Dec 2022 11:52:15 -0500 Subject: [PATCH 2/9] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7922313..1613bfb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,7 @@ source: - 100-update-cmake.patch build: - number: 3 + number: 4 script: source ${RECIPE_DIR}/build_zfp.sh # [unix] script: {{ RECIPE_DIR }}\bld_zfp.bat # [win] run_exports: From 1dea14f1b79d0b01b3737e38433570980044dcbe Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 24 Dec 2022 16:53:49 +0000 Subject: [PATCH 3/9] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2022.12.22.13.58.53 --- .azure-pipelines/azure-pipelines-win.yml | 6 +++++- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 5 ++--- README.md | 15 ++++++--------- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a0bcae..a192c0b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,6 +14,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -35,7 +36,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -72,6 +73,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 44f1210..493321d 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index b651d6c..e2934c7 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 6ff796c..577274b 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..84431a6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a..b3abaeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index b1bc3e3..1cb5d5b 100644 --- a/README.md +++ b/README.md @@ -42,42 +42,42 @@ Current build status linux_64 - variant + variant linux_aarch64 - variant + variant linux_ppc64le - variant + variant osx_64 - variant + variant osx_arm64 - variant + variant win_64 - variant + variant @@ -216,6 +216,3 @@ Feedstock Maintainers * [@kmpaul](https://github.com/kmpaul/) * [@lindstro](https://github.com/lindstro/) - - - From 78ed7e745923be20dead9fc40e7fd4d2a23debeb Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Dec 2022 11:58:04 -0500 Subject: [PATCH 4/9] Try to specify OSX_ARCHITECTURES --- recipe/build_zfpy.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipe/build_zfpy.sh b/recipe/build_zfpy.sh index b6559a1..6dbd82f 100644 --- a/recipe/build_zfpy.sh +++ b/recipe/build_zfpy.sh @@ -7,6 +7,12 @@ set -ex # but since the build is identical, conda will not find the newly compiled # libraries, and just keep using the old ons +OSX_ARCHITECTURES="" +if [[ "${target_platform}" == "osx-arm64" ]]; then + OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=arm64" +elif [[ "${target_platform}" == "osx-64" ]]; then + OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=x86_64" +fi # patch for cross-builds from @erykoff if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then # workaround until cross-python is fixed @@ -21,6 +27,7 @@ mkdir build cd build cmake ${CMAKE_ARGS} \ + ${OSX_ARCHITECTURES} \ -DBUILD_CFP=ON \ -DBUILD_UTILITIES=ON \ -DBUILD_ZFPY=ON \ From 683400f1206983fc1316385c7dbad2327e5e7c95 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Dec 2022 11:58:34 -0500 Subject: [PATCH 5/9] Specify OSX_ARCHITECTURES --- recipe/build_zfp.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipe/build_zfp.sh b/recipe/build_zfp.sh index 7759448..a92906b 100644 --- a/recipe/build_zfp.sh +++ b/recipe/build_zfp.sh @@ -1,9 +1,16 @@ #!/usr/bin/env bash set -e +OSX_ARCHITECTURES="" +if [[ "${target_platform}" == "osx-arm64" ]]; then + OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=arm64" +elif [[ "${target_platform}" == "osx-64" ]]; then + OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=x86_64" +fi mkdir build cd build cmake ${CMAKE_ARGS} \ + ${OSX_ARCHITECTURES} \ -DBUILD_CFP=ON \ -DBUILD_UTILITIES=ON \ -DZFP_WITH_OPENMP=ON \ From dd6d64026355e94a5561a611d0c2b8582dd8556d Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Dec 2022 12:15:15 -0500 Subject: [PATCH 6/9] Update build_zfpy.sh --- recipe/build_zfpy.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/recipe/build_zfpy.sh b/recipe/build_zfpy.sh index 6dbd82f..0792a94 100644 --- a/recipe/build_zfpy.sh +++ b/recipe/build_zfpy.sh @@ -13,14 +13,6 @@ if [[ "${target_platform}" == "osx-arm64" ]]; then elif [[ "${target_platform}" == "osx-64" ]]; then OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=x86_64" fi -# patch for cross-builds from @erykoff -if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then - # workaround until cross-python is fixed - rm $BUILD_PREFIX/bin/python - ln -sf $PREFIX/bin/python $BUILD_PREFIX/bin/python - rm $BUILD_PREFIX/bin/cython - ln -sf $PREFIX/bin/cython $BUILD_PREFIX/bin/cython -fi rm -rf build mkdir build From 227d639f5b97df8f3a60f3c3ca49fca622f0c0e5 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Dec 2022 13:18:15 -0500 Subject: [PATCH 7/9] Update build_zfpy.sh --- recipe/build_zfpy.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/build_zfpy.sh b/recipe/build_zfpy.sh index 0792a94..a4a823b 100644 --- a/recipe/build_zfpy.sh +++ b/recipe/build_zfpy.sh @@ -7,6 +7,7 @@ set -ex # but since the build is identical, conda will not find the newly compiled # libraries, and just keep using the old ons +EXTRA_ARGS= OSX_ARCHITECTURES="" if [[ "${target_platform}" == "osx-arm64" ]]; then OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=arm64" @@ -14,6 +15,10 @@ elif [[ "${target_platform}" == "osx-64" ]]; then OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=x86_64" fi + +if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then + CYTHON_EXECUTABLE=${BUILD_PREFIX}/cython +fi rm -rf build mkdir build cd build From 213937e646995669874e01c50d95ee6b46f80692 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Dec 2022 13:19:22 -0500 Subject: [PATCH 8/9] Update build_zfpy.sh --- recipe/build_zfpy.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/recipe/build_zfpy.sh b/recipe/build_zfpy.sh index a4a823b..9fe8001 100644 --- a/recipe/build_zfpy.sh +++ b/recipe/build_zfpy.sh @@ -8,23 +8,22 @@ set -ex # libraries, and just keep using the old ons EXTRA_ARGS= -OSX_ARCHITECTURES="" if [[ "${target_platform}" == "osx-arm64" ]]; then - OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=arm64" + EXTRA_ARGS="${EXTRA_ARGS} -DCMAKE_OSX_ARCHITECTURES=arm64" elif [[ "${target_platform}" == "osx-64" ]]; then - OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=x86_64" + EXTRA_ARGS="${EXTRA_ARGS} -DCMAKE_OSX_ARCHITECTURES=x86_64" fi if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then - CYTHON_EXECUTABLE=${BUILD_PREFIX}/cython + EXTRA_ARGS="${EXTRA_ARGS} -D${BUILD_PREFIX}/cython" fi rm -rf build mkdir build cd build cmake ${CMAKE_ARGS} \ - ${OSX_ARCHITECTURES} \ + ${EXTRA_ARGS} \ -DBUILD_CFP=ON \ -DBUILD_UTILITIES=ON \ -DBUILD_ZFPY=ON \ @@ -39,4 +38,3 @@ cmake ${CMAKE_ARGS} \ make -j${CPU_COUNT} make install - From 49dd494f45b7782810a99b99105bf0f8c1fc88d3 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Dec 2022 13:44:22 -0500 Subject: [PATCH 9/9] Apply suggestions from code review --- recipe/build_zfpy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_zfpy.sh b/recipe/build_zfpy.sh index 9fe8001..0a323cb 100644 --- a/recipe/build_zfpy.sh +++ b/recipe/build_zfpy.sh @@ -16,7 +16,7 @@ fi if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then - EXTRA_ARGS="${EXTRA_ARGS} -D${BUILD_PREFIX}/cython" + EXTRA_ARGS="${EXTRA_ARGS} -DCYTHON_EXECUTABLE=${BUILD_PREFIX}/bin/cython" fi rm -rf build mkdir build