From 91145e371e0289378413c07c36969dfb1c7f8533 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Fri, 4 Apr 2025 18:28:27 +0200 Subject: [PATCH 1/8] Attempt at fixing build --- recipe/meta.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cd45f28..2b183db 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,7 @@ source: folder: triangle_tmp build: - number: 54 + number: 55 skip: True # [win] features: detect_binary_files_with_prefix: true @@ -44,6 +44,7 @@ requirements: - bzip2 - cairo # [linux] - curl + - expat - freetype # [linux] - gsl - hdf4 @@ -66,10 +67,12 @@ requirements: - xorg-libxmu # [linux] - xorg-libxrender # [linux] - xorg-libxt # [linux] + - xorg-xorgproto # [linux] run: - bzip2 - cairo # [linux] - curl + - expat - freetype # [linux] - gsl - hdf4 @@ -98,9 +101,10 @@ test: source_files: - install/make-tarfile/check_files requires: + - bc - coreutils - git - - imagemagick + - imagemagick =7.1.1_19 - patch commands: - test "$(ncl -V)" = "{{ version }}" From 057fe6ea7dff14582625656fa287933de38cb4de Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 4 Apr 2025 17:31:46 +0000 Subject: [PATCH 2/8] MNT: Re-rendered with conda-build 25.3.2, conda-smithy 3.47.1, and conda-forge-pinning 2025.04.02.21.55.06 --- .azure-pipelines/azure-pipelines-linux.yml | 2 +- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_.yaml | 24 ++++---- .ci_support/migrations/libgdal39.yaml | 9 --- .ci_support/migrations/proj_loosen_pin.yaml | 8 --- .ci_support/osx_64_.yaml | 18 +++--- .gitignore | 5 ++ .scripts/build_steps.sh | 24 ++++++-- .scripts/run_docker_build.sh | 2 +- .scripts/run_osx_build.sh | 53 +++++++++++------ azure-pipelines.yml | 31 +++++++++- build-locally.py | 63 +++++++++++++++------ 12 files changed, 158 insertions(+), 83 deletions(-) delete mode 100644 .ci_support/migrations/libgdal39.yaml delete mode 100644 .ci_support/migrations/proj_loosen_pin.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index e1f2b92..c308132 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,7 +11,7 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 SHORT_CONFIG: linux_64_ timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index c38a01e..94c7e23 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index c9dcfe7..ef69e41 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -3,15 +3,15 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cairo: - '1' cdt_name: -- cos6 +- conda channel_sources: - conda-forge channel_targets: @@ -21,13 +21,15 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 +expat: +- '2' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' gsl: @@ -39,11 +41,11 @@ hdf5: jasper: - '4' libblas: -- 3.9 *netlib +- 3.9.* *netlib libcblas: -- 3.9 *netlib +- 3.9.* *netlib libgdal: -- '3.9' +- '3.10' libiconv: - '1' libjpeg_turbo: @@ -55,14 +57,12 @@ libpng: pixman: - '0' proj: -- '9.4' +- '9.5' target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version -- - c_stdlib_version - - cdt_name zlib: - '1' diff --git a/.ci_support/migrations/libgdal39.yaml b/.ci_support/migrations/libgdal39.yaml deleted file mode 100644 index ffc85a9..0000000 --- a/.ci_support/migrations/libgdal39.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -gdal: -- '3.9' -libgdal: -- '3.9' -migrator_ts: 1715443551.4913723 diff --git a/.ci_support/migrations/proj_loosen_pin.yaml b/.ci_support/migrations/proj_loosen_pin.yaml deleted file mode 100644 index 3830824..0000000 --- a/.ci_support/migrations/proj_loosen_pin.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Loosen proj pin to 9.4 - kind: version - migration_number: 1 -migrator_ts: 1717700335 -proj: -- '9.4' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a52d313..d356d48 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,11 +21,13 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' +expat: +- '2' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' gsl: - '2.7' hdf4: @@ -35,11 +37,11 @@ hdf5: jasper: - '4' libblas: -- 3.9 *netlib +- 3.9.* *netlib libcblas: -- 3.9 *netlib +- 3.9.* *netlib libgdal: -- '3.9' +- '3.10' libiconv: - '1' libjpeg_turbo: @@ -49,11 +51,11 @@ libnetcdf: libpng: - '1.6' llvm_openmp: -- '16' +- '18' macos_machine: - x86_64-apple-darwin13.4.0 proj: -- '9.4' +- '9.5' target_platform: - osx-64 zip_keys: diff --git a/.gitignore b/.gitignore index 179afe5..47b5408 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,8 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output +# Pixi's configuration +.pixi diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f34ebf2..5723144 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,25 +31,31 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" 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 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 conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup +( +# Due to https://bugzilla.redhat.com/show_bug.cgi?id=1537564 old versions of rpm +# are drastically slowed down when the number of file descriptors is very high. +# This can be visible during a `yum install` step of a feedstock build. +# => Set a lower limit in a subshell for the `yum install`s only. +ulimit -n 1024 # Install the yum requirements defined canonically in the # "recipe/yum_requirements.txt" file. After updating that file, # run "conda smithy rerender" and this line will be updated # automatically. /usr/bin/sudo -n yum install -y csh byacc - +) # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -80,6 +86,12 @@ 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.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 00f377a..6ee04aa 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -12,7 +12,7 @@ source .scripts/logging_utils.sh set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" -PROVIDER_DIR="$(basename $THISDIR)" +PROVIDER_DIR="$(basename "$THISDIR")" FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..0e3c394 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,29 +6,41 @@ source .scripts/logging_utils.sh set -xe -MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} - -( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null - -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -rm -rf ${MINIFORGE_HOME} -bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" + +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +echo "Activating environment" +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base 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 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 conda-forge-ci-setup=4 "conda-build>=24.1" + @@ -85,6 +97,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.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..013bdc1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index e0d408d..02c2374 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,17 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess +import sys from argparse import ArgumentParser -import platform def setup_environment(ns): @@ -23,6 +27,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" @@ -34,10 +45,19 @@ def run_osx_build(ns): subprocess.check_call([script]) +def run_win_build(ns): + script = ".scripts/run_win_build.bat" + subprocess.check_call(["cmd", "/D", "/Q", "/C", f"CALL {script}"]) + + def verify_config(ns): + choices_filter = ns.filter or "*" valid_configs = { - os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") + os.path.basename(f)[:-5] + for f in glob.glob(f".ci_support/{choices_filter}.yaml") } + if choices_filter != "*": + print(f"filtering for '{choices_filter}.yaml' configs") print(f"valid configs are {valid_configs}") if ns.config in valid_configs: print("Using " + ns.config + " configuration") @@ -50,30 +70,37 @@ def verify_config(ns): selections = list(enumerate(sorted(valid_configs), 1)) for i, c in selections: print(f"{i}. {c}") - s = input("\n> ") + try: + s = input("\n> ") + except KeyboardInterrupt: + print("\nno option selected, bye!", file=sys.stderr) + sys.exit(1) idx = int(s) - 1 ns.config = selections[idx][1] print(f"selected {ns.config}") else: raise ValueError("config " + ns.config + " is not valid") - # Remove the following, as implemented - if ns.config.startswith("win"): - raise ValueError( - f"only Linux/macOS configs currently supported, got {ns.config}" + if ( + ns.config.startswith("osx") + and platform.system() == "Darwin" + and not os.environ.get("OSX_SDK_DIR") + ): + raise RuntimeError( + "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." ) - 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=$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." - ) def main(args=None): p = ArgumentParser("build-locally") p.add_argument("config", default=None, nargs="?") + p.add_argument( + "--filter", + default=None, + help="Glob string to filter which build choices are presented in interactive mode.", + ) p.add_argument( "--debug", action="store_true", @@ -94,6 +121,8 @@ def main(args=None): run_docker_build(ns) elif ns.config.startswith("osx"): run_osx_build(ns) + elif ns.config.startswith("win"): + run_win_build(ns) finally: recipe_license_file = os.path.join( "recipe", "recipe-scripts-license.txt" From a9fa1948c77bfff570ad48b482dda7efccc5ea93 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Fri, 4 Apr 2025 22:06:03 +0200 Subject: [PATCH 3/8] Unpin esmf --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2b183db..83dc2c0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -89,7 +89,7 @@ requirements: - proj - udunits2 - zlib - - esmf <8.6.0 + - esmf - xorg-imake # [linux] - xorg-libx11 # [linux] - xorg-libxaw # [linux] From 92a54350a7c43fda65df96e3d0aef4d25534f135 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Tue, 8 Apr 2025 14:15:39 +0200 Subject: [PATCH 4/8] Fix regridding example --- recipe/esmf-8-4-regrid.patch | 19 +++++++++++++++++++ recipe/meta.yaml | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 recipe/esmf-8-4-regrid.patch diff --git a/recipe/esmf-8-4-regrid.patch b/recipe/esmf-8-4-regrid.patch new file mode 100644 index 0000000..1cf735d --- /dev/null +++ b/recipe/esmf-8-4-regrid.patch @@ -0,0 +1,19 @@ +diff --git a/ni/src/examples/gsun/ESMF_regridding.ncl b/ni/src/examples/gsun/ESMF_regridding.ncl +index 2db5e1e93..750e17c62 100644 +--- a/ni/src/examples/gsun/ESMF_regridding.ncl ++++ b/ni/src/examples/gsun/ESMF_regridding.ncl +@@ -2897,12 +2897,12 @@ begin + + ;---Checking if the user specifies that source grid is ESMF + if (isatt_logical_true(opt2,"SrcESMF")) then +- ESMFCMD = ESMFCMD + " --src_type ESMF" ++ ESMFCMD = ESMFCMD + " --src_type ESMFMESH" + end if + + ;---Check if the user specifies that destination grid is ESMF + if (isatt_logical_true(opt2,"DstESMF")) then +- ESMFCMD = ESMFCMD + " --dst_type ESMF" ++ ESMFCMD = ESMFCMD + " --dst_type ESMFMESH" + end if + + ;---This flag is necessary for V5.2.0r1 and grids like WRF. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 83dc2c0..5b14213 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,6 +16,7 @@ source: - osx-arm64.patch - int-conversion.patch # [osx] - jasper-jpc.patch + - esmf-8-4-regrid.patch - url: https://netlib.sandia.gov/voronoi/triangle.zip sha256: 1766327add038495fa3499e9b7cc642179229750f7201b94f8e1b7bee76f8480 folder: triangle_tmp @@ -89,7 +90,7 @@ requirements: - proj - udunits2 - zlib - - esmf + - esmf * mpi_* - xorg-imake # [linux] - xorg-libx11 # [linux] - xorg-libxaw # [linux] From 0888ada4bd190abc9a547285e17879cd23e02663 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Tue, 8 Apr 2025 16:29:14 +0200 Subject: [PATCH 5/8] Unpin imagemagick --- recipe/comparison.patch | 2 +- recipe/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/comparison.patch b/recipe/comparison.patch index 0142651..847321a 100644 --- a/recipe/comparison.patch +++ b/recipe/comparison.patch @@ -9,7 +9,7 @@ + METRIC=$(compare -metric DSSIM images/$png bad/$png null 2>&1); - if [[ $compare_ret -eq 0 ]]; then -+ if [[ $(echo "$METRIC < 10^-5" | sed 's/e-0*/*10^-/' |bc -l) -eq 1 ]]; then ++ if [[ $(echo "$METRIC < 10^-5" | sed -E 's/.*\((.+)\)/\1/' | sed 's/e-0*/*10^-/' |bc -l) -eq 1 ]]; then dir_similar+=( $png ) else dir_different+=( $png ) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5b14213..9530bb1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -90,7 +90,7 @@ requirements: - proj - udunits2 - zlib - - esmf * mpi_* + - esmf >=8 mpi_* - xorg-imake # [linux] - xorg-libx11 # [linux] - xorg-libxaw # [linux] @@ -105,7 +105,7 @@ test: - bc - coreutils - git - - imagemagick =7.1.1_19 + - imagemagick - patch commands: - test "$(ncl -V)" = "{{ version }}" From 607e83cc03ba10199948062dc4fdc3d80faa9899 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Tue, 8 Apr 2025 19:44:58 +0200 Subject: [PATCH 6/8] Avoid latest imagemagick release --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9530bb1..b008dc3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -105,7 +105,7 @@ test: - bc - coreutils - git - - imagemagick + - imagemagick !=7.1.1_47 - patch commands: - test "$(ncl -V)" = "{{ version }}" From 638aa8dfa8079f890e9d96fac894f729a6cd989d Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Tue, 8 Apr 2025 19:58:07 +0200 Subject: [PATCH 7/8] Skip OSX build --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b008dc3..7536933 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ source: build: number: 55 - skip: True # [win] + skip: True # [not linux] features: detect_binary_files_with_prefix: true From f7572cfa6724d80a3acdc4b21d55da395c81ddd9 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Tue, 8 Apr 2025 22:40:40 +0200 Subject: [PATCH 8/8] Try to fix osx build --- recipe/meta.yaml | 3 ++- recipe/nfpfort-osx.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 recipe/nfpfort-osx.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7536933..f2afbdb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,6 +14,7 @@ source: - 0003-boz-fix.patch - jasper2.patch - osx-arm64.patch + - nfpfort-osx.patch - int-conversion.patch # [osx] - jasper-jpc.patch - esmf-8-4-regrid.patch @@ -23,7 +24,7 @@ source: build: number: 55 - skip: True # [not linux] + skip: True # [win] features: detect_binary_files_with_prefix: true diff --git a/recipe/nfpfort-osx.patch b/recipe/nfpfort-osx.patch new file mode 100644 index 0000000..dfdcb01 --- /dev/null +++ b/recipe/nfpfort-osx.patch @@ -0,0 +1,13 @@ +diff --git a/ni/src/lib/nfpfort/yMakefile b/ni/src/lib/nfpfort/yMakefile +index e421d3e95..dc7481014 100644 +--- a/ni/src/lib/nfpfort/yMakefile ++++ b/ni/src/lib/nfpfort/yMakefile +@@ -41,7 +41,7 @@ FOBJS = aam.o areaAve.o areaAve2.o areaRmse.o areaRmse2.o areaSum2.o \ + det_code42.o kmeans_kmns_as136.o spi3.o wrf_vinterp.o wrf_fctt.o \ + wrf_write_wps.o pres_hybrid_jra55_dp.o relhum_ice.o relhum_water.o \ + wetbulb_profs.o wrf_cloud_fracf.o mlegev_memory.o kernel_density.o \ +- meemd.o dpsort_large.o wrf_pw.o wrf_wind.o wrf_constants.o wrf_constants.mod ++ meemd.o dpsort_large.o wrf_pw.o wrf_wind.o wrf_constants.o + + COBJS = +