From 44adcd24808c33c25ab07cdd156d5ece0043243e Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 01:27:39 +0000 Subject: [PATCH 01/21] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeYAMLTest --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 21a3a63..a40f3fa 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,8 +1,8 @@ build_platform: {osx_arm64: osx_64, linux_ppc64le: linux_64, linux_aarch64: linux_64} conda_forge_output_validation: true -test_on_native_only: true github: branch_name: main tooling_branch_name: main conda_build: pkg_format: '2' +test: native_and_emulated From 3914e91cd061d2e9e6d337b404455d27ca9f2e4b Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Sun, 12 May 2024 20:18:15 +0000 Subject: [PATCH 02/21] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomergeUpdate --- .github/workflows/automerge.yml | 2 -- 1 file changed, 2 deletions(-) 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 From f1538df473c8e9fd98d53350795a31b45240fd7f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 25 Jul 2024 21:10:32 +1100 Subject: [PATCH 03/21] Revert "remove rc-channels" This reverts commit 21817fec0d967ee1357d446d79dd780db66855ae. --- recipe/conda_build_config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 27fcede..b94531b 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,3 +2,8 @@ c_compiler: # [osx and arm64] - clang_bootstrap # [osx and arm64] cxx_compiler: # [osx and arm64] - clang_bootstrap # [osx and arm64] + +channel_targets: + - conda-forge llvm_rc +channel_sources: + - conda-forge/label/llvm_rc,conda-forge From d42b81a2166fd89ed20af737f923d5084237053e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 25 Jul 2024 21:11:25 +1100 Subject: [PATCH 04/21] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.25.08.49.31 --- .ci_support/linux_64_.yaml | 8 ++++---- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- .scripts/build_steps.sh | 1 - README.md | 16 ++++++++-------- 8 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 15d2866..5c2c8e7 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,13 +1,13 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 67a520f..c05bcdf 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -9,9 +9,9 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index ee3d1ab..3b93fb9 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,9 +5,9 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index f0cea66..099acb0 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index cd017af..cb6371c 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 78caf41..22220ec 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,9 +1,9 @@ c_stdlib: - vs channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - vs2019 target_platform: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ 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 diff --git a/README.md b/README.md index b2f0947..4c62767 100644 --- a/README.md +++ b/README.md @@ -88,14 +88,14 @@ Current release info Installing mlir =============== -Installing `mlir` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `mlir` from the `conda-forge/label/llvm_rc` channel can be achieved by adding `conda-forge/label/llvm_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/llvm_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libmlir, libmlir18, mlir` can be installed with `conda`: +Once the `conda-forge/label/llvm_rc` channel has been enabled, `libmlir, libmlir18, mlir` can be installed with `conda`: ``` conda install libmlir libmlir18 mlir @@ -110,26 +110,26 @@ mamba install libmlir libmlir18 mlir It is possible to list all of the versions of `libmlir` available on your platform with `conda`: ``` -conda search libmlir --channel conda-forge +conda search libmlir --channel conda-forge/label/llvm_rc ``` or with `mamba`: ``` -mamba search libmlir --channel conda-forge +mamba search libmlir --channel conda-forge/label/llvm_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search libmlir --channel conda-forge +mamba repoquery search libmlir --channel conda-forge/label/llvm_rc # List packages depending on `libmlir`: -mamba repoquery whoneeds libmlir --channel conda-forge +mamba repoquery whoneeds libmlir --channel conda-forge/label/llvm_rc # List dependencies of `libmlir`: -mamba repoquery depends libmlir --channel conda-forge +mamba repoquery depends libmlir --channel conda-forge/label/llvm_rc ``` From 6aa0bf22a4f71ca2cc093f9b2cda0cab5b3ca1f4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 14 Jun 2024 15:13:45 +1100 Subject: [PATCH 05/21] alphabetize conda-forge.yml --- conda-forge.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index a40f3fa..4a6ba4a 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,8 +1,11 @@ -build_platform: {osx_arm64: osx_64, linux_ppc64le: linux_64, linux_aarch64: linux_64} +build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 + osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main -conda_build: - pkg_format: '2' test: native_and_emulated From 3adf903fb2a9728f7c4f884ce58eda1e30e1f19c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 14 Jun 2024 22:02:10 +1100 Subject: [PATCH 06/21] reduce build parallelism on aarch --- recipe/build.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 612dc9c..9d87b48 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,12 +1,15 @@ #!/bin/bash - set -euxo pipefail +PARALLEL="" if [[ "${target_platform}" == "linux-ppc64le" ]]; then export CFLAGS="${CFLAGS//-fno-plt/}" export CXXFLAGS="${CXXFLAGS//-fno-plt/}" +elif [[ "${target_platform}" == "linux-aarch64" ]]; then + # reduce parallelism on aarch to avoid OOM + PARALLEL="-j2" elif [[ "${target_platform}" == osx-* ]]; then - CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_LIBCXX=ON" + CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_LIBCXX=ON" fi if [[ "${CONDA_BUILD_CROSS_COMPILATION:-0}" == "1" ]]; then @@ -29,4 +32,4 @@ cmake ${CMAKE_ARGS} \ -GNinja \ ../mlir -ninja +ninja ${PARALLEL} From 16492f68a8e15a02ca4f3c9b27c5f73a69968a55 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 27 Jul 2024 08:17:56 +1100 Subject: [PATCH 07/21] mlir v19.1.0.rc1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bf3c3a8..dc4bf5e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "18.1.8" %} +{% set version = "19.1.0.rc1" %} {% set major_version = version.split(".")[0] %} {% set maj_min = major_version ~ "." ~ version.split(".")[1] %} @@ -12,7 +12,7 @@ package: source: - url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 09c08693a9afd6236f27a2ebae62cda656eba19021ef3f94d59e931d662d4856 + sha256: cd3b42caf8e78c497712a661303672c1a6279eb1a5ff8735488087319ab95214 patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch From 46b5bb9f60bec9098fd838fb6cd6c05291397a50 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 28 Jul 2024 12:03:48 +1100 Subject: [PATCH 08/21] adapt to new rc-suffix scheme --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dc4bf5e..ac1e864 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,8 +2,8 @@ {% set major_version = version.split(".")[0] %} {% set maj_min = major_version ~ "." ~ version.split(".")[1] %} -# as of LLVM 17, we expect an "rc" suffix for the release candidates -{% set extra = "rc" if version.split(".")[-1] not in "0123456789" else "" %} +# as of LLVM 19, we expect an "-rcX" suffix for the release candidates +{% set extra = "-" ~ version.split(".")[-1] if version.split(".")[-1] not in "0123456789" else "" %} {% set extra = "git" if version.split(".")[-1] == "dev0" else extra %} package: From 3914eacb0d9f7b7522116b37c6d9b680de01d1fe Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 5 Aug 2024 20:47:00 +1100 Subject: [PATCH 09/21] mlir v19.1.0.rc2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ac1e864..62ee01a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "19.1.0.rc1" %} +{% set version = "19.1.0.rc2" %} {% set major_version = version.split(".")[0] %} {% set maj_min = major_version ~ "." ~ version.split(".")[1] %} @@ -12,7 +12,7 @@ package: source: - url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: cd3b42caf8e78c497712a661303672c1a6279eb1a5ff8735488087319ab95214 + sha256: 5332e77a658136c778fc32ec2a3687de4d63e0ff48010be205c4e7af6e76f1f1 patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch From 242609e2176a22d9ae8217685bd12700920e3898 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 6 Aug 2024 09:53:56 +1100 Subject: [PATCH 10/21] use bootstrap compilers consistently on osx the build necessarily needs to compile llvm-tblgen, which requires symbols from a matching version of llvmdev, which contradicts with the compilers in the build environment in cross-compilation. Given that, it's easier to also use the bootstrap compilers on osx-64, in order to be able to specify the required metadata consistently for osx across both architectures. --- recipe/conda_build_config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b94531b..984e903 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ -c_compiler: # [osx and arm64] - - clang_bootstrap # [osx and arm64] -cxx_compiler: # [osx and arm64] - - clang_bootstrap # [osx and arm64] +c_compiler: # [osx] + - clang_bootstrap # [osx] +cxx_compiler: # [osx] + - clang_bootstrap # [osx] channel_targets: - conda-forge llvm_rc From 25d16e1f927ad950b33a5b9167294d302212c963 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 6 Aug 2024 11:02:28 +1100 Subject: [PATCH 11/21] clean-ups from link check --- recipe/meta.yaml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 62ee01a..7af7756 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,7 @@ source: - patches/0001-Support-cross-compiling-standalone-MLIR.patch build: - number: 0 + number: 1 requirements: build: @@ -48,10 +48,13 @@ outputs: - {{ pin_subpackage("libmlir", exact=True) }} - llvmdev {{ version }} - llvm {{ version }} - - zlib + - zlib # [win] + - zstd # [win] run: - - {{ pin_subpackage("libmlir", exact=True) }} - llvmdev {{ version }} + - {{ pin_subpackage("libmlir" ~ major_version, exact=True) }} # [unix] + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] test: commands: # static library @@ -84,7 +87,9 @@ outputs: host: - llvmdev {{ version }} - llvm {{ version }} - - zlib + run: + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] test: commands: # presence of versioned libraries @@ -118,14 +123,16 @@ outputs: host: - llvmdev {{ version }} - llvm {{ version }} - - zlib - {{ pin_subpackage("libmlir" ~ major_version, exact=True) }} # [unix] run: - {{ pin_subpackage("libmlir" ~ major_version, exact=True) }} # [unix] + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] test: commands: # presence of unversioned libraries - test -f $PREFIX/lib/libMLIR${SHLIB_EXT} # [unix] + # nothing on windows (package currently empty) - if exist %LIBRARY_BIN%\libmlir.dll exit 1 # [win] about: From 3267229b9c6aa4d76f184cf2cb146b73acb19edc Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 6 Aug 2024 11:04:06 +1100 Subject: [PATCH 12/21] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.37.2, and conda-forge-pinning 2024.08.05.15.28.08 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 ++ .scripts/run_osx_build.sh | 2 +- README.md | 8 ++++---- build-locally.py | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d609fcd..204327b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -24,7 +24,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 099acb0..cdea76b 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge llvm_rc cxx_compiler: -- clangxx +- clang_bootstrap cxx_compiler_version: - '16' macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 22220ec..8ad39bc 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -10,3 +10,5 @@ target_platform: - win-64 zlib: - '1' +zstd: +- '1.5' diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c879..420f051 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ 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" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} diff --git a/README.md b/README.md index 4c62767..2d76720 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-libmlir-green.svg)](https://anaconda.org/conda-forge/libmlir) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libmlir.svg)](https://anaconda.org/conda-forge/libmlir) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libmlir.svg)](https://anaconda.org/conda-forge/libmlir) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libmlir.svg)](https://anaconda.org/conda-forge/libmlir) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libmlir18-green.svg)](https://anaconda.org/conda-forge/libmlir18) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libmlir18.svg)](https://anaconda.org/conda-forge/libmlir18) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libmlir18.svg)](https://anaconda.org/conda-forge/libmlir18) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libmlir18.svg)](https://anaconda.org/conda-forge/libmlir18) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libmlir19-green.svg)](https://anaconda.org/conda-forge/libmlir19) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libmlir19.svg)](https://anaconda.org/conda-forge/libmlir19) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libmlir19.svg)](https://anaconda.org/conda-forge/libmlir19) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libmlir19.svg)](https://anaconda.org/conda-forge/libmlir19) | | [![Conda Recipe](https://img.shields.io/badge/recipe-mlir-green.svg)](https://anaconda.org/conda-forge/mlir) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/mlir.svg)](https://anaconda.org/conda-forge/mlir) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/mlir.svg)](https://anaconda.org/conda-forge/mlir) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/mlir.svg)](https://anaconda.org/conda-forge/mlir) | Installing mlir @@ -95,16 +95,16 @@ conda config --add channels conda-forge/label/llvm_rc conda config --set channel_priority strict ``` -Once the `conda-forge/label/llvm_rc` channel has been enabled, `libmlir, libmlir18, mlir` can be installed with `conda`: +Once the `conda-forge/label/llvm_rc` channel has been enabled, `libmlir, libmlir19, mlir` can be installed with `conda`: ``` -conda install libmlir libmlir18 mlir +conda install libmlir libmlir19 mlir ``` or with `mamba`: ``` -mamba install libmlir libmlir18 mlir +mamba install libmlir libmlir19 mlir ``` It is possible to list all of the versions of `libmlir` available on your platform with `conda`: diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From f5b0bf12482acb588d152151790783e9e279f322 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 6 Aug 2024 11:07:00 +1100 Subject: [PATCH 13/21] clean up -DCROSS_TOOLCHAIN_FLAGS_NATIVE --- recipe/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 9d87b48..61207e5 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -14,7 +14,12 @@ fi if [[ "${CONDA_BUILD_CROSS_COMPILATION:-0}" == "1" ]]; then CMAKE_ARGS="${CMAKE_ARGS} -DLLVM_TABLEGEN_EXE=$BUILD_PREFIX/bin/llvm-tblgen -DNATIVE_LLVM_DIR=$BUILD_PREFIX/lib/cmake/llvm" - CMAKE_ARGS="${CMAKE_ARGS} -DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_C_COMPILER=$CC_FOR_BUILD;-DCMAKE_CXX_COMPILER=$CXX_FOR_BUILD;-DCMAKE_C_FLAGS=-O2;-DCMAKE_CXX_FLAGS=-O2;-DCMAKE_EXE_LINKER_FLAGS=\"-L$BUILD_PREFIX/lib\";-DCMAKE_MODULE_LINKER_FLAGS=;-DCMAKE_SHARED_LINKER_FLAGS=;-DCMAKE_STATIC_LINKER_FLAGS=;-DCMAKE_AR=$(which ${AR});-DCMAKE_RANLIB=$(which ${RANLIB});-DCMAKE_PREFIX_PATH=${BUILD_PREFIX}" + NATIVE_FLAGS="-DCMAKE_C_COMPILER=$CC_FOR_BUILD;-DCMAKE_CXX_COMPILER=$CXX_FOR_BUILD" + NATIVE_FLAGS="${NATIVE_FLAGS};-DCMAKE_C_FLAGS=-O2;-DCMAKE_CXX_FLAGS=-O2" + NATIVE_FLAGS="${NATIVE_FLAGS};-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${BUILD_PREFIX}/lib" + NATIVE_FLAGS="${NATIVE_FLAGS};-DCMAKE_MODULE_LINKER_FLAGS=;-DCMAKE_SHARED_LINKER_FLAGS=" + NATIVE_FLAGS="${NATIVE_FLAGS};-DCMAKE_STATIC_LINKER_FLAGS=;-DCMAKE_PREFIX_PATH=${BUILD_PREFIX}" + CMAKE_ARGS="${CMAKE_ARGS} -DCROSS_TOOLCHAIN_FLAGS_NATIVE=${NATIVE_FLAGS}" else rm -rf $BUILD_PREFIX/bin/llvm-tblgen fi From 41974da14c3643c95d01d225c4d7cd7262e195a7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 21 Aug 2024 16:24:31 +1100 Subject: [PATCH 14/21] mlir v19.1.0.rc3 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7af7756..e36817a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "19.1.0.rc2" %} +{% set version = "19.1.0.rc3" %} {% set major_version = version.split(".")[0] %} {% set maj_min = major_version ~ "." ~ version.split(".")[1] %} @@ -12,13 +12,13 @@ package: source: - url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 5332e77a658136c778fc32ec2a3687de4d63e0ff48010be205c4e7af6e76f1f1 + sha256: 57f926edf60a92947fa9b8b0adfdf3c6f2182a4ecf1c929176218eef619d7411 patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch build: - number: 1 + number: 0 requirements: build: From bcbd66718ec39b309dfb4cd34c57d11405b674d8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 21 Aug 2024 16:25:21 +1100 Subject: [PATCH 15/21] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.38.0, and conda-forge-pinning 2024.08.20.23.21.46 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 5c2c8e7..a1de580 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index c05bcdf..02e365f 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 3b93fb9..8356983 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index cdea76b..a78a3a6 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index cb6371c..72c5fb0 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 target_platform: From 001f3a9d296ab2409201442464b86821047565fa Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 22 Aug 2024 04:36:20 +1100 Subject: [PATCH 16/21] re-add zlib as a host-dep for mlir on unix --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e36817a..c1b5bbd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,7 +48,7 @@ outputs: - {{ pin_subpackage("libmlir", exact=True) }} - llvmdev {{ version }} - llvm {{ version }} - - zlib # [win] + - zlib - zstd # [win] run: - llvmdev {{ version }} From 18733bf0630a86a385437d98d7cb3091b2e2802f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 22 Aug 2024 08:21:43 +1100 Subject: [PATCH 17/21] ignore unused zlib run-export --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c1b5bbd..45ad9a9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,6 +37,10 @@ outputs: - name: mlir script: install_mlir.sh # [unix] script: install_mlir.bat # [win] + build: + ignore_run_exports_from: + # the build fails if it doesn't find zlib, but it's not used + - zlib # [unix] requirements: build: - {{ stdlib('c') }} From 33e1bdd34c89ba53a876a096e7ddf2db9a6382e7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 4 Sep 2024 10:36:00 +1100 Subject: [PATCH 18/21] mlir v19.1.0.rc4 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 45ad9a9..5be6a6f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "19.1.0.rc3" %} +{% set version = "19.1.0.rc4" %} {% set major_version = version.split(".")[0] %} {% set maj_min = major_version ~ "." ~ version.split(".")[1] %} @@ -12,7 +12,7 @@ package: source: - url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 57f926edf60a92947fa9b8b0adfdf3c6f2182a4ecf1c929176218eef619d7411 + sha256: 570ea538eae9939e1b008c4e8055227dae3ab58054c74707ad1d5a8cb51536c3 patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch From 1a9c4b65d670b2d98ceac24cc170b705962f426d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 17 Sep 2024 15:52:28 +0000 Subject: [PATCH 19/21] updated v19.1.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5be6a6f..512bb34 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "19.1.0.rc4" %} +{% set version = "19.1.0" %} {% set major_version = version.split(".")[0] %} {% set maj_min = major_version ~ "." ~ version.split(".")[1] %} @@ -12,7 +12,7 @@ package: source: - url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 570ea538eae9939e1b008c4e8055227dae3ab58054c74707ad1d5a8cb51536c3 + sha256: 0a08341036ca99a106786f50f9c5cb3fbe458b3b74cab6089fd368d0edb2edfe patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch From 9a5b60ff344acf2aab769518e9127b29eedc28ec Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 17 Sep 2024 21:45:50 +0200 Subject: [PATCH 20/21] remove rc-channels --- recipe/conda_build_config.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 984e903..9de62ab 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,8 +2,3 @@ c_compiler: # [osx] - clang_bootstrap # [osx] cxx_compiler: # [osx] - clang_bootstrap # [osx] - -channel_targets: - - conda-forge llvm_rc -channel_sources: - - conda-forge/label/llvm_rc,conda-forge From 6f0e1394f2497492eb1d671e760ccb0875ee83f4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 17 Sep 2024 21:48:10 +0200 Subject: [PATCH 21/21] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.17.18.35.22 --- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- README.md | 16 ++++++++-------- build-locally.py | 5 ++++- 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index a1de580..bfe3161 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,9 +5,9 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 02e365f..619ccff 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -9,9 +9,9 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 8356983..0e7c317 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,9 +5,9 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a78a3a6..34c924e 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 72c5fb0..10181f5 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 8ad39bc..3144b4b 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,9 +1,9 @@ c_stdlib: - vs channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - vs2019 target_platform: diff --git a/README.md b/README.md index 2d76720..b847e90 100644 --- a/README.md +++ b/README.md @@ -88,14 +88,14 @@ Current release info Installing mlir =============== -Installing `mlir` from the `conda-forge/label/llvm_rc` channel can be achieved by adding `conda-forge/label/llvm_rc` to your channels with: +Installing `mlir` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` -conda config --add channels conda-forge/label/llvm_rc +conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge/label/llvm_rc` channel has been enabled, `libmlir, libmlir19, mlir` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `libmlir, libmlir19, mlir` can be installed with `conda`: ``` conda install libmlir libmlir19 mlir @@ -110,26 +110,26 @@ mamba install libmlir libmlir19 mlir It is possible to list all of the versions of `libmlir` available on your platform with `conda`: ``` -conda search libmlir --channel conda-forge/label/llvm_rc +conda search libmlir --channel conda-forge ``` or with `mamba`: ``` -mamba search libmlir --channel conda-forge/label/llvm_rc +mamba search libmlir --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search libmlir --channel conda-forge/label/llvm_rc +mamba repoquery search libmlir --channel conda-forge # List packages depending on `libmlir`: -mamba repoquery whoneeds libmlir --channel conda-forge/label/llvm_rc +mamba repoquery whoneeds libmlir --channel conda-forge # List dependencies of `libmlir`: -mamba repoquery depends libmlir --channel conda-forge/label/llvm_rc +mamba repoquery depends libmlir --channel conda-forge ``` diff --git a/build-locally.py b/build-locally.py index d78427b..8ac9b84 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/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. # +# 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