From 154426a1c02fe431317420657842413819cd1408 Mon Sep 17 00:00:00 2001 From: cf-blacksmithy <41433396+cf-blacksmithy@users.noreply.github.com> Date: Fri, 2 Apr 2021 05:35:24 +0000 Subject: [PATCH 01/31] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CFEP13TokenCleanup From c7cfe0ccdc54df387021058ba99d8f29b4a695d4 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Wed, 15 Dec 2021 01:37:05 +0000 Subject: [PATCH 02/31] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeGHAWithMain --- .github/workflows/automerge.yml | 3 ++- .github/workflows/webservices.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index e8e5902..773b3d1 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -13,6 +13,7 @@ jobs: uses: actions/checkout@v2 - name: automerge-action id: automerge-action - uses: conda-forge/automerge-action@master + uses: conda-forge/automerge-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} + rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index 78f51e6..d6f06b5 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,6 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@master + uses: conda-forge/webservices-dispatch-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} + rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} From 4e8517f25ef48d2eccec7b57258b0fa15a90dff0 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Fri, 17 Dec 2021 07:23:45 +0000 Subject: [PATCH 03/31] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeGHAWithMain --- .github/workflows/automerge.yml | 2 +- .github/workflows/webservices.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 773b3d1..f79fe85 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v2 - name: automerge-action id: automerge-action - uses: conda-forge/automerge-action@main + uses: conda-forge/automerge-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index d6f06b5..2e5fe71 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,7 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@main + uses: conda-forge/webservices-dispatch-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} From a5c83ab77ff8e5188d7e0e5cefa740e557c0b53f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 22 Feb 2022 15:39:01 +0100 Subject: [PATCH 04/31] Build 14.0.0.rc1 --- .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 | 6 +++--- recipe/conda_build_config.yaml | 4 ++++ recipe/meta.yaml | 4 ++-- 9 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 3cd2791..7258894 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,9 +1,9 @@ cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge mlir_rc cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index cb31508..67209d4 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -5,9 +5,9 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge mlir_rc cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 847f571..c010187 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,9 +1,9 @@ cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge mlir_rc cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 14677a7..3250ca5 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,9 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge mlir_rc cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index e46598b..36fe083 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,9 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge mlir_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index b7679a1..6a75054 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,7 +1,7 @@ channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge mlir_rc cxx_compiler: - vs2017 pin_run_as_build: diff --git a/README.md b/README.md index fdba7d0..571134e 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-libmlir13-green.svg)](https://anaconda.org/conda-forge/libmlir13) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libmlir13.svg)](https://anaconda.org/conda-forge/libmlir13) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libmlir13.svg)](https://anaconda.org/conda-forge/libmlir13) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libmlir13.svg)](https://anaconda.org/conda-forge/libmlir13) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libmlir14-green.svg)](https://anaconda.org/conda-forge/libmlir14) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libmlir14.svg)](https://anaconda.org/conda-forge/libmlir14) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libmlir14.svg)](https://anaconda.org/conda-forge/libmlir14) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libmlir14.svg)](https://anaconda.org/conda-forge/libmlir14) | | [![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,10 +95,10 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libmlir, libmlir13, mlir` can be installed with: +Once the `conda-forge` channel has been enabled, `libmlir, libmlir14, mlir` can be installed with: ``` -conda install libmlir libmlir13 mlir +conda install libmlir libmlir14 mlir ``` It is possible to list all of the versions of `libmlir` available on your platform with: diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 27fcede..1a89588 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,3 +2,7 @@ c_compiler: # [osx and arm64] - clang_bootstrap # [osx and arm64] cxx_compiler: # [osx and arm64] - clang_bootstrap # [osx and arm64] +channel_targets: + - conda-forge mlir_rc +channel_sources: + - conda-forge/label/llvm_rc,conda-forge diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8869bda..1896a94 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "13.0.1" %} +{% set version = "14.0.0.rc1" %} {% set major_version = version.split(".")[0] %} package: @@ -7,7 +7,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 326335a830f2e32d06d0a36393b5455d17dc73e0bd1211065227ee014f92cbf8 + sha256: 3de5fb12e2c43ba4964fabb1baddea870b652d2c971aaff1172ca0c57bb1f54a patches: # https://reviews.llvm.org/D99470 - 0001-Support-cross-compiling-standalone-MLIR.patch From 7951eaa8298836e885d084175f2a5ad5e0e131dc Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 22 Feb 2022 15:39:14 +0100 Subject: [PATCH 05/31] Helper libs are no longer installed --- recipe/install_libmlir.sh | 6 ------ recipe/meta.yaml | 7 ------- 2 files changed, 13 deletions(-) diff --git a/recipe/install_libmlir.sh b/recipe/install_libmlir.sh index e2483a3..6999834 100644 --- a/recipe/install_libmlir.sh +++ b/recipe/install_libmlir.sh @@ -11,14 +11,8 @@ mkdir lib cp lib2/libLLVM* lib/ if [[ "$PKG_NAME" == "libmlir" ]]; then cp lib2/libMLIR${SHLIB_EXT} lib/ - cp lib2/libmlir_runner_utils${SHLIB_EXT} lib/ - cp lib2/libmlir_c_runner_utils${SHLIB_EXT} lib/ - cp lib2/libmlir_async_runtime${SHLIB_EXT} lib/ else cp lib2/libMLIR.*.* lib/ - cp lib2/libmlir_runner_utils.*.* lib/ - cp lib2/libmlir_c_runner_utils.*.* lib/ - cp lib2/libmlir_async_runtime.*.* lib/ fi rm -rf lib2 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1896a94..62c92ee 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -76,15 +76,8 @@ outputs: test: commands: - test ! -f "$PREFIX/lib/libMLIR$SHLIB_EXT" # [unix] - - test ! -f "$PREFIX/lib/libmlir_runner_utils$SHLIB_EXT" # [unix] - - test ! -f "$PREFIX/lib/libmlir_c_runner_utils$SHLIB_EXT" # [unix] - - test ! -f "$PREFIX/lib/libmlir_c_runner_utils_static.a" # [unix] - test -f "$PREFIX/lib/libMLIR.so.{{ major_version }}" # [linux] - - test -f "$PREFIX/lib/libmlir_runner_utils.so.{{ major_version }}" # [linux] - - test -f "$PREFIX/lib/libmlir_c_runner_utils.so.{{ major_version }}" # [linux] - test -f "$PREFIX/lib/libMLIR.{{ major_version }}.dylib" # [osx] - - test -f "$PREFIX/lib/libmlir_runner_utils.{{ major_version }}.dylib" # [osx] - - test -f "$PREFIX/lib/libmlir_c_runner_utils.{{ major_version }}.dylib" # [osx] - name: libmlir script: install_libmlir.sh # [unix] From c5f33934f691977a0ce3ff71ab5e483a82d638df Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 22 Feb 2022 17:37:23 +0100 Subject: [PATCH 06/31] Update to vs2019 --- .ci_support/win_64_.yaml | 2 +- recipe/bld.bat | 3 +++ recipe/conda_build_config.yaml | 12 ++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 6a75054..880faaa 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -3,7 +3,7 @@ channel_sources: channel_targets: - conda-forge mlir_rc cxx_compiler: -- vs2017 +- vs2019 pin_run_as_build: zlib: max_pin: x.x diff --git a/recipe/bld.bat b/recipe/bld.bat index b44525d..566d65d 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,3 +1,4 @@ +@echo on mkdir build cd build @@ -8,5 +9,7 @@ cmake -GNinja ^ -DLLVM_BUILD_TOOLS=ON ^ -DLLVM_BUILD_UTILS=ON ^ ..\mlir +if %ERRORLEVEL% neq 0 exit 1 ninja -j%CPU_COUNT% +if %ERRORLEVEL% neq 0 exit 1 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 1a89588..b0db312 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,11 @@ -c_compiler: # [osx and arm64] - - clang_bootstrap # [osx and arm64] -cxx_compiler: # [osx and arm64] - - clang_bootstrap # [osx and arm64] +c_compiler: # [win] +- vs2019 # [win] +cxx_compiler: # [win] +- vs2019 # [win] +c_compiler: # [osx and arm64] + - clang_bootstrap # [osx and arm64] +cxx_compiler: # [osx and arm64] + - clang_bootstrap # [osx and arm64] channel_targets: - conda-forge mlir_rc channel_sources: From 7bbc725ad6652e5122056e7e92c0c64c6b587eed Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 23 Feb 2022 10:46:51 +0100 Subject: [PATCH 07/31] Revert "Helper libs are no longer installed" This reverts commit 7951eaa8298836e885d084175f2a5ad5e0e131dc. --- recipe/install_libmlir.sh | 6 ++++++ recipe/meta.yaml | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/recipe/install_libmlir.sh b/recipe/install_libmlir.sh index 6999834..e2483a3 100644 --- a/recipe/install_libmlir.sh +++ b/recipe/install_libmlir.sh @@ -11,8 +11,14 @@ mkdir lib cp lib2/libLLVM* lib/ if [[ "$PKG_NAME" == "libmlir" ]]; then cp lib2/libMLIR${SHLIB_EXT} lib/ + cp lib2/libmlir_runner_utils${SHLIB_EXT} lib/ + cp lib2/libmlir_c_runner_utils${SHLIB_EXT} lib/ + cp lib2/libmlir_async_runtime${SHLIB_EXT} lib/ else cp lib2/libMLIR.*.* lib/ + cp lib2/libmlir_runner_utils.*.* lib/ + cp lib2/libmlir_c_runner_utils.*.* lib/ + cp lib2/libmlir_async_runtime.*.* lib/ fi rm -rf lib2 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 62c92ee..1896a94 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -76,8 +76,15 @@ outputs: test: commands: - test ! -f "$PREFIX/lib/libMLIR$SHLIB_EXT" # [unix] + - test ! -f "$PREFIX/lib/libmlir_runner_utils$SHLIB_EXT" # [unix] + - test ! -f "$PREFIX/lib/libmlir_c_runner_utils$SHLIB_EXT" # [unix] + - test ! -f "$PREFIX/lib/libmlir_c_runner_utils_static.a" # [unix] - test -f "$PREFIX/lib/libMLIR.so.{{ major_version }}" # [linux] + - test -f "$PREFIX/lib/libmlir_runner_utils.so.{{ major_version }}" # [linux] + - test -f "$PREFIX/lib/libmlir_c_runner_utils.so.{{ major_version }}" # [linux] - test -f "$PREFIX/lib/libMLIR.{{ major_version }}.dylib" # [osx] + - test -f "$PREFIX/lib/libmlir_runner_utils.{{ major_version }}.dylib" # [osx] + - test -f "$PREFIX/lib/libmlir_c_runner_utils.{{ major_version }}.dylib" # [osx] - name: libmlir script: install_libmlir.sh # [unix] From b6a381e9338a80e05138100dea890508a8aed352 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 24 Feb 2022 17:10:44 +0100 Subject: [PATCH 08/31] Revert upstream patch; use ninja --- ...he-MLIR-ExecutionEngine-library-when.patch | 154 ++++++++++++++++++ recipe/build.sh | 3 +- recipe/install_libmlir.sh | 2 +- recipe/install_mlir.sh | 2 +- recipe/meta.yaml | 13 +- 5 files changed, 164 insertions(+), 10 deletions(-) create mode 100644 recipe/0002-Revert-Disable-the-MLIR-ExecutionEngine-library-when.patch diff --git a/recipe/0002-Revert-Disable-the-MLIR-ExecutionEngine-library-when.patch b/recipe/0002-Revert-Disable-the-MLIR-ExecutionEngine-library-when.patch new file mode 100644 index 0000000..f6e7e42 --- /dev/null +++ b/recipe/0002-Revert-Disable-the-MLIR-ExecutionEngine-library-when.patch @@ -0,0 +1,154 @@ +From 6dffa56d409151b45141161cef77c5659d2205a2 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 24 Feb 2022 16:49:26 +0100 +Subject: [PATCH] Revert "Disable the MLIR ExecutionEngine library when the + native target is not configured" + +This reverts commit 772f7b87f8cc040203476e3cc6e6164473349a26. +--- + mlir/lib/CAPI/CMakeLists.txt | 7 +------ + mlir/lib/CMakeLists.txt | 1 + + mlir/python/CMakeLists.txt | 25 +++++++++++-------------- + mlir/test/CAPI/CMakeLists.txt | 17 +++++++---------- + mlir/test/CMakeLists.txt | 8 ++++---- + 5 files changed, 24 insertions(+), 34 deletions(-) + +diff --git a/mlir/lib/CAPI/CMakeLists.txt b/mlir/lib/CAPI/CMakeLists.txt +index 393b49ecb43f..5545de691f69 100644 +--- a/mlir/lib/CAPI/CMakeLists.txt ++++ b/mlir/lib/CAPI/CMakeLists.txt +@@ -10,16 +10,12 @@ endfunction() + add_subdirectory(Debug) + add_subdirectory(Dialect) + add_subdirectory(Conversion) ++add_subdirectory(ExecutionEngine) + add_subdirectory(Interfaces) + add_subdirectory(IR) + add_subdirectory(Registration) + add_subdirectory(Transforms) + +-# Only enable the ExecutionEngine if the native target is configured in. +-if(TARGET ${LLVM_NATIVE_ARCH}) +- add_subdirectory(ExecutionEngine) +-endif() +- + # Build the optional CAPI dylib. + if(MLIR_BUILD_MLIR_C_DYLIB) + message(STATUS "Building MLIR-C dylib") +@@ -37,4 +33,3 @@ if(MLIR_BUILD_MLIR_C_DYLIB) + endif() + endif() + endif() +- +diff --git a/mlir/lib/CMakeLists.txt b/mlir/lib/CMakeLists.txt +index 05bfbb47e28e..ec5c326d5d78 100644 +--- a/mlir/lib/CMakeLists.txt ++++ b/mlir/lib/CMakeLists.txt +@@ -4,6 +4,7 @@ add_flag_if_supported("-Werror=global-constructors" WERROR_GLOBAL_CONSTRUCTOR) + add_subdirectory(Analysis) + add_subdirectory(Conversion) + add_subdirectory(Dialect) ++add_subdirectory(ExecutionEngine) + add_subdirectory(IR) + add_subdirectory(Interfaces) + add_subdirectory(Parser) +diff --git a/mlir/python/CMakeLists.txt b/mlir/python/CMakeLists.txt +index 59ddd83fb8b0..9a92bb2b378d 100644 +--- a/mlir/python/CMakeLists.txt ++++ b/mlir/python/CMakeLists.txt +@@ -315,20 +315,17 @@ declare_mlir_python_extension(MLIRPythonExtension.Conversions + MLIRCAPIConversion + ) + +-# Only enable the ExecutionEngine if the native target is configured in. +-if(TARGET ${LLVM_NATIVE_ARCH}) +- declare_mlir_python_extension(MLIRPythonExtension.ExecutionEngine +- MODULE_NAME _mlirExecutionEngine +- ADD_TO_PARENT MLIRPythonSources.ExecutionEngine +- ROOT_DIR "${PYTHON_SOURCE_DIR}" +- SOURCES +- ExecutionEngineModule.cpp +- PRIVATE_LINK_LIBS +- LLVMSupport +- EMBED_CAPI_LINK_LIBS +- MLIRCAPIExecutionEngine +- ) +-endif() ++declare_mlir_python_extension(MLIRPythonExtension.ExecutionEngine ++ MODULE_NAME _mlirExecutionEngine ++ ADD_TO_PARENT MLIRPythonSources.ExecutionEngine ++ ROOT_DIR "${PYTHON_SOURCE_DIR}" ++ SOURCES ++ ExecutionEngineModule.cpp ++ PRIVATE_LINK_LIBS ++ LLVMSupport ++ EMBED_CAPI_LINK_LIBS ++ MLIRCAPIExecutionEngine ++) + + declare_mlir_python_extension(MLIRPythonExtension.GPUDialectPasses + MODULE_NAME _mlirGPUPasses +diff --git a/mlir/test/CAPI/CMakeLists.txt b/mlir/test/CAPI/CMakeLists.txt +index 9610df62457e..8228bbb7d26f 100644 +--- a/mlir/test/CAPI/CMakeLists.txt ++++ b/mlir/test/CAPI/CMakeLists.txt +@@ -19,16 +19,13 @@ function(_add_capi_test_executable name) + endif() + endfunction(_add_capi_test_executable) + +-# Only enable the ExecutionEngine if the native target is configured in. +-if(TARGET ${LLVM_NATIVE_ARCH}) +- _add_capi_test_executable(mlir-capi-execution-engine-test +- execution_engine.c +- LINK_LIBS PRIVATE +- MLIRCAPIConversion +- MLIRCAPIExecutionEngine +- MLIRCAPIRegistration +- ) +-endif() ++_add_capi_test_executable(mlir-capi-execution-engine-test ++ execution_engine.c ++LINK_LIBS PRIVATE ++ MLIRCAPIConversion ++ MLIRCAPIExecutionEngine ++ MLIRCAPIRegistration ++) + + _add_capi_test_executable(mlir-capi-ir-test + ir.c +diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt +index 8e44a9c37cf1..415f0bb50cec 100644 +--- a/mlir/test/CMakeLists.txt ++++ b/mlir/test/CMakeLists.txt +@@ -75,6 +75,7 @@ configure_lit_site_cfg( + + set(MLIR_TEST_DEPENDS + FileCheck count not split-file ++ mlir-capi-execution-engine-test + mlir-capi-ir-test + mlir-capi-llvm-test + mlir-capi-pass-test +@@ -88,6 +89,9 @@ set(MLIR_TEST_DEPENDS + mlir-reduce + mlir-tblgen + mlir-translate ++ mlir_runner_utils ++ mlir_c_runner_utils ++ mlir_async_runtime + ) + + # The native target may not be enabled, in this case we won't +@@ -97,10 +101,6 @@ if(TARGET ${LLVM_NATIVE_ARCH}) + list(APPEND MLIR_TEST_DEPENDS + mlir-cpu-runner + llc +- mlir_async_runtime +- mlir-capi-execution-engine-test +- mlir_c_runner_utils +- mlir_runner_utils + ) + endif() + +-- +2.35.0 + diff --git a/recipe/build.sh b/recipe/build.sh index 0bdf337..a6cc488 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -19,6 +19,7 @@ cmake ${CMAKE_ARGS} \ -DLLVM_LINK_LLVM_DYLIB=ON \ -DLLVM_BUILD_TOOLS=ON \ -DLLVM_BUILD_UTILS=ON \ + -GNinja \ ../mlir -make -j${CPU_COUNT} +ninja diff --git a/recipe/install_libmlir.sh b/recipe/install_libmlir.sh index e2483a3..1ab6e9a 100644 --- a/recipe/install_libmlir.sh +++ b/recipe/install_libmlir.sh @@ -2,7 +2,7 @@ set -x -e cd ${SRC_DIR}/build -make install +ninja install cd $PREFIX rm -rf libexec share bin include diff --git a/recipe/install_mlir.sh b/recipe/install_mlir.sh index d71002f..a2212cc 100644 --- a/recipe/install_mlir.sh +++ b/recipe/install_mlir.sh @@ -1,4 +1,4 @@ #!/bin/bash cd build -make install +ninja install diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1896a94..0b8452a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,6 +11,8 @@ source: patches: # https://reviews.llvm.org/D99470 - 0001-Support-cross-compiling-standalone-MLIR.patch + # https://github.com/llvm/llvm-project/issues/53989 + - 0002-Revert-Disable-the-MLIR-ExecutionEngine-library-when.patch build: number: 0 @@ -18,7 +20,7 @@ build: requirements: build: - cmake - - make # [unix] + - ninja - {{ compiler('cxx') }} - llvmdev {{ version }} # [build_platform != target_platform] host: @@ -34,8 +36,7 @@ outputs: build: - {{ compiler('cxx') }} - cmake - - ninja # [win] - - make # [unix] + - ninja - llvmdev {{ version }} # [build_platform != target_platform] host: - {{ pin_subpackage("libmlir", exact=True) }} @@ -66,8 +67,7 @@ outputs: build: - {{ compiler('cxx') }} - cmake - - ninja # [win] - - make # [unix] + - ninja - llvmdev {{ version }} # [build_platform != target_platform] host: - llvmdev {{ version }} @@ -97,8 +97,7 @@ outputs: build: - {{ compiler('cxx') }} - cmake - - ninja # [win] - - make # [unix] + - ninja - llvmdev {{ version }} # [build_platform != target_platform] host: - llvmdev {{ version }} From 340aa9951e3fc58bc6c3b6f515351776dc62604b Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Wed, 2 Nov 2022 09:07:27 +0000 Subject: [PATCH 09/31] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomergeUpdate --- .github/workflows/automerge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f79fe85..da1368a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -10,10 +10,10 @@ jobs: name: automerge steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: automerge-action id: automerge-action - uses: conda-forge/automerge-action@master + uses: conda-forge/automerge-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} From 94ae112679a24fad95975bc6fe27cee0a23b2a6b Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 08:28:33 +0000 Subject: [PATCH 10/31] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration DotConda --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 98302ab..035ad30 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,5 @@ build_platform: {osx_arm64: osx_64, linux_ppc64le: linux_64, linux_aarch64: linux_64} conda_forge_output_validation: true test_on_native_only: true +conda_build: + pkg_format: '2' From 288587f9b824cafef93d2e5a0c7a455f3bf11fea Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 6 Feb 2023 17:37:30 +1100 Subject: [PATCH 11/31] remove obsolete compiler pins --- recipe/conda_build_config.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index e4bdb27..27fcede 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,7 +2,3 @@ c_compiler: # [osx and arm64] - clang_bootstrap # [osx and arm64] cxx_compiler: # [osx and arm64] - clang_bootstrap # [osx and arm64] -c_compiler: # [win] -- vs2019 # [win] -cxx_compiler: # [win] -- vs2019 # [win] From 845213db987b8c588b37d9edce6a7f4d2f953820 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 6 Feb 2023 17:38:05 +1100 Subject: [PATCH 12/31] add llvm_rc-channel sources & targets --- 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..ff88665 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 mlir_rc +channel_sources: + - conda-forge/label/llvm_rc,conda-forge From 265fbbf46faf51667a3f396a1b4170f6b39d9c77 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 6 Feb 2023 17:39:39 +1100 Subject: [PATCH 13/31] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2023.02.05.22.35.38 --- .ci_support/win_64_.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index a3fcf8a..46dc4df 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,7 +1,7 @@ channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge mlir_rc cxx_compiler: - vs2019 target_platform: From 80acabc3245e52a89bae27d970be606df8614ba6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 6 Feb 2023 17:40:47 +1100 Subject: [PATCH 14/31] move patch to folder; remove obsolete one --- ...he-MLIR-ExecutionEngine-library-when.patch | 154 ------------------ recipe/meta.yaml | 2 +- ...port-cross-compiling-standalone-MLIR.patch | 0 3 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 recipe/0002-Revert-Disable-the-MLIR-ExecutionEngine-library-when.patch rename recipe/{ => patches}/0001-Support-cross-compiling-standalone-MLIR.patch (100%) diff --git a/recipe/0002-Revert-Disable-the-MLIR-ExecutionEngine-library-when.patch b/recipe/0002-Revert-Disable-the-MLIR-ExecutionEngine-library-when.patch deleted file mode 100644 index f6e7e42..0000000 --- a/recipe/0002-Revert-Disable-the-MLIR-ExecutionEngine-library-when.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 6dffa56d409151b45141161cef77c5659d2205a2 Mon Sep 17 00:00:00 2001 -From: "Uwe L. Korn" -Date: Thu, 24 Feb 2022 16:49:26 +0100 -Subject: [PATCH] Revert "Disable the MLIR ExecutionEngine library when the - native target is not configured" - -This reverts commit 772f7b87f8cc040203476e3cc6e6164473349a26. ---- - mlir/lib/CAPI/CMakeLists.txt | 7 +------ - mlir/lib/CMakeLists.txt | 1 + - mlir/python/CMakeLists.txt | 25 +++++++++++-------------- - mlir/test/CAPI/CMakeLists.txt | 17 +++++++---------- - mlir/test/CMakeLists.txt | 8 ++++---- - 5 files changed, 24 insertions(+), 34 deletions(-) - -diff --git a/mlir/lib/CAPI/CMakeLists.txt b/mlir/lib/CAPI/CMakeLists.txt -index 393b49ecb43f..5545de691f69 100644 ---- a/mlir/lib/CAPI/CMakeLists.txt -+++ b/mlir/lib/CAPI/CMakeLists.txt -@@ -10,16 +10,12 @@ endfunction() - add_subdirectory(Debug) - add_subdirectory(Dialect) - add_subdirectory(Conversion) -+add_subdirectory(ExecutionEngine) - add_subdirectory(Interfaces) - add_subdirectory(IR) - add_subdirectory(Registration) - add_subdirectory(Transforms) - --# Only enable the ExecutionEngine if the native target is configured in. --if(TARGET ${LLVM_NATIVE_ARCH}) -- add_subdirectory(ExecutionEngine) --endif() -- - # Build the optional CAPI dylib. - if(MLIR_BUILD_MLIR_C_DYLIB) - message(STATUS "Building MLIR-C dylib") -@@ -37,4 +33,3 @@ if(MLIR_BUILD_MLIR_C_DYLIB) - endif() - endif() - endif() -- -diff --git a/mlir/lib/CMakeLists.txt b/mlir/lib/CMakeLists.txt -index 05bfbb47e28e..ec5c326d5d78 100644 ---- a/mlir/lib/CMakeLists.txt -+++ b/mlir/lib/CMakeLists.txt -@@ -4,6 +4,7 @@ add_flag_if_supported("-Werror=global-constructors" WERROR_GLOBAL_CONSTRUCTOR) - add_subdirectory(Analysis) - add_subdirectory(Conversion) - add_subdirectory(Dialect) -+add_subdirectory(ExecutionEngine) - add_subdirectory(IR) - add_subdirectory(Interfaces) - add_subdirectory(Parser) -diff --git a/mlir/python/CMakeLists.txt b/mlir/python/CMakeLists.txt -index 59ddd83fb8b0..9a92bb2b378d 100644 ---- a/mlir/python/CMakeLists.txt -+++ b/mlir/python/CMakeLists.txt -@@ -315,20 +315,17 @@ declare_mlir_python_extension(MLIRPythonExtension.Conversions - MLIRCAPIConversion - ) - --# Only enable the ExecutionEngine if the native target is configured in. --if(TARGET ${LLVM_NATIVE_ARCH}) -- declare_mlir_python_extension(MLIRPythonExtension.ExecutionEngine -- MODULE_NAME _mlirExecutionEngine -- ADD_TO_PARENT MLIRPythonSources.ExecutionEngine -- ROOT_DIR "${PYTHON_SOURCE_DIR}" -- SOURCES -- ExecutionEngineModule.cpp -- PRIVATE_LINK_LIBS -- LLVMSupport -- EMBED_CAPI_LINK_LIBS -- MLIRCAPIExecutionEngine -- ) --endif() -+declare_mlir_python_extension(MLIRPythonExtension.ExecutionEngine -+ MODULE_NAME _mlirExecutionEngine -+ ADD_TO_PARENT MLIRPythonSources.ExecutionEngine -+ ROOT_DIR "${PYTHON_SOURCE_DIR}" -+ SOURCES -+ ExecutionEngineModule.cpp -+ PRIVATE_LINK_LIBS -+ LLVMSupport -+ EMBED_CAPI_LINK_LIBS -+ MLIRCAPIExecutionEngine -+) - - declare_mlir_python_extension(MLIRPythonExtension.GPUDialectPasses - MODULE_NAME _mlirGPUPasses -diff --git a/mlir/test/CAPI/CMakeLists.txt b/mlir/test/CAPI/CMakeLists.txt -index 9610df62457e..8228bbb7d26f 100644 ---- a/mlir/test/CAPI/CMakeLists.txt -+++ b/mlir/test/CAPI/CMakeLists.txt -@@ -19,16 +19,13 @@ function(_add_capi_test_executable name) - endif() - endfunction(_add_capi_test_executable) - --# Only enable the ExecutionEngine if the native target is configured in. --if(TARGET ${LLVM_NATIVE_ARCH}) -- _add_capi_test_executable(mlir-capi-execution-engine-test -- execution_engine.c -- LINK_LIBS PRIVATE -- MLIRCAPIConversion -- MLIRCAPIExecutionEngine -- MLIRCAPIRegistration -- ) --endif() -+_add_capi_test_executable(mlir-capi-execution-engine-test -+ execution_engine.c -+LINK_LIBS PRIVATE -+ MLIRCAPIConversion -+ MLIRCAPIExecutionEngine -+ MLIRCAPIRegistration -+) - - _add_capi_test_executable(mlir-capi-ir-test - ir.c -diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt -index 8e44a9c37cf1..415f0bb50cec 100644 ---- a/mlir/test/CMakeLists.txt -+++ b/mlir/test/CMakeLists.txt -@@ -75,6 +75,7 @@ configure_lit_site_cfg( - - set(MLIR_TEST_DEPENDS - FileCheck count not split-file -+ mlir-capi-execution-engine-test - mlir-capi-ir-test - mlir-capi-llvm-test - mlir-capi-pass-test -@@ -88,6 +89,9 @@ set(MLIR_TEST_DEPENDS - mlir-reduce - mlir-tblgen - mlir-translate -+ mlir_runner_utils -+ mlir_c_runner_utils -+ mlir_async_runtime - ) - - # The native target may not be enabled, in this case we won't -@@ -97,10 +101,6 @@ if(TARGET ${LLVM_NATIVE_ARCH}) - list(APPEND MLIR_TEST_DEPENDS - mlir-cpu-runner - llc -- mlir_async_runtime -- mlir-capi-execution-engine-test -- mlir_c_runner_utils -- mlir_runner_utils - ) - endif() - --- -2.35.0 - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ec25301..771a93e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6 patches: # https://reviews.llvm.org/D99470 - - 0001-Support-cross-compiling-standalone-MLIR.patch + - patches/0001-Support-cross-compiling-standalone-MLIR.patch build: number: 0 diff --git a/recipe/0001-Support-cross-compiling-standalone-MLIR.patch b/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch similarity index 100% rename from recipe/0001-Support-cross-compiling-standalone-MLIR.patch rename to recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch From f7da62243eaeac2249d2ee69c432a5b339ac90b9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 6 Feb 2023 17:45:40 +1100 Subject: [PATCH 15/31] bump to 16.0.0.rc1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 771a93e..e17b038 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "15.0.7" %} +{% set version = "16.0.0.rc1" %} {% set major_version = version.split(".")[0] %} package: @@ -7,7 +7,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6 + sha256: 8399db003b223ce33e3d7a5ee9df8dc3574cedffa5d9be4783660643f8402900 patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch From 6345b1b337fe25b2f4a4096ca62287d78af0fc1a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 6 Feb 2023 17:46:01 +1100 Subject: [PATCH 16/31] rebase patch --- ...1-Support-cross-compiling-standalone-MLIR.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch b/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch index 3a68c91..13a214a 100644 --- a/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch +++ b/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch @@ -1,4 +1,4 @@ -From a43d733a668d9cba02eeb79a49cbdaed17e3749a Mon Sep 17 00:00:00 2001 +From 23936ca8ed236eec1201051962900334c4455ab3 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 6 Apr 2021 13:36:08 +0200 Subject: [PATCH] Support cross compiling standalone MLIR @@ -8,18 +8,18 @@ Subject: [PATCH] Support cross compiling standalone MLIR 1 file changed, 13 insertions(+) diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt -index 088aec88f..9ba5afcbf 100644 +index ab690b16a4..f00c819b25 100644 --- a/mlir/CMakeLists.txt +++ b/mlir/CMakeLists.txt -@@ -30,6 +30,7 @@ if(MLIR_STANDALONE_BUILD) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY - "${CMAKE_CURRENT_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") +@@ -42,6 +42,7 @@ if(MLIR_STANDALONE_BUILD) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin") + + set(LLVM_LIT_ARGS "-sv" CACHE STRING "Default options for lit") + set(MLIR_BUILT_STANDALONE 1) endif() set(MLIR_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH -@@ -155,6 +156,18 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) +@@ -163,6 +164,18 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories( "include") include_directories( ${MLIR_INCLUDE_DIR}) @@ -39,5 +39,5 @@ index 088aec88f..9ba5afcbf 100644 # MLIR_TABLEGEN_EXE in PARENT_SCOPE which gets lost if that folder is included # from another directory like tools -- -2.38.0 +2.38.1.windows.1 From 2ef9f8351276a015718b024d66db308cdde06ffe Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 8 Feb 2023 10:27:44 +1100 Subject: [PATCH 17/31] set CMAKE_CXX_STANDARD=17 as code expects --- recipe/meta.yaml | 1 + ...port-cross-compiling-standalone-MLIR.patch | 2 +- ..._CXX_STANDARD-in-mlir-CMakeLists.txt.patch | 24 +++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 recipe/patches/0002-set-CMAKE_CXX_STANDARD-in-mlir-CMakeLists.txt.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e17b038..542f9af 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,6 +11,7 @@ source: patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch + - patches/0002-set-CMAKE_CXX_STANDARD-in-mlir-CMakeLists.txt.patch build: number: 0 diff --git a/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch b/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch index 13a214a..3b2ef7f 100644 --- a/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch +++ b/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch @@ -1,7 +1,7 @@ From 23936ca8ed236eec1201051962900334c4455ab3 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 6 Apr 2021 13:36:08 +0200 -Subject: [PATCH] Support cross compiling standalone MLIR +Subject: [PATCH 1/2] Support cross compiling standalone MLIR --- mlir/CMakeLists.txt | 13 +++++++++++++ diff --git a/recipe/patches/0002-set-CMAKE_CXX_STANDARD-in-mlir-CMakeLists.txt.patch b/recipe/patches/0002-set-CMAKE_CXX_STANDARD-in-mlir-CMakeLists.txt.patch new file mode 100644 index 0000000..a5443e6 --- /dev/null +++ b/recipe/patches/0002-set-CMAKE_CXX_STANDARD-in-mlir-CMakeLists.txt.patch @@ -0,0 +1,24 @@ +From dfb4333dc655f48a0467a6472d8566d3ff8fbc64 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Wed, 8 Feb 2023 10:24:58 +1100 +Subject: [PATCH 2/2] set CMAKE_CXX_STANDARD in mlir/CMakeLists.txt + +--- + mlir/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt +index f00c819b25..4594b8830e 100644 +--- a/mlir/CMakeLists.txt ++++ b/mlir/CMakeLists.txt +@@ -22,6 +22,7 @@ endif() + + # Must go below project(..) + include(GNUInstallDirs) ++set(CMAKE_CXX_STANDARD 17) + + if(MLIR_STANDALONE_BUILD) + find_package(LLVM CONFIG REQUIRED) +-- +2.38.1.windows.1 + From 571e97d7dd9793874300cc33fd9a432ea8d92e6e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 10 Feb 2023 10:07:21 +1100 Subject: [PATCH 18/31] bump to 16.0.0.rc2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 542f9af..e2da497 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.0.rc1" %} +{% set version = "16.0.0.rc2" %} {% set major_version = version.split(".")[0] %} package: @@ -7,7 +7,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 8399db003b223ce33e3d7a5ee9df8dc3574cedffa5d9be4783660643f8402900 + sha256: 2ae53e4d9cdc46e660359a5311f276bd4cb39c310345de951c580a09b4f34861 patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch From 37e08a57343d69cd55b6cc4b411ea1455c818ee7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 25 Feb 2023 09:20:26 +1100 Subject: [PATCH 19/31] bump to 16.0.0.rc3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e2da497..ad20957 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.0.rc2" %} +{% set version = "16.0.0.rc3" %} {% set major_version = version.split(".")[0] %} package: @@ -7,7 +7,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 2ae53e4d9cdc46e660359a5311f276bd4cb39c310345de951c580a09b4f34861 + sha256: 8fa9792a1a04f78d023b87c5e5bd25010d5f73a5c0ae1830e897d85821ee9325 patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch From 6b989d49f3945f18e72cd681862e1e13e8b784e5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 25 Feb 2023 09:20:41 +1100 Subject: [PATCH 20/31] remove patch that was backported This reverts commit 2ef9f8351276a015718b024d66db308cdde06ffe. --- recipe/meta.yaml | 1 - ...port-cross-compiling-standalone-MLIR.patch | 2 +- ..._CXX_STANDARD-in-mlir-CMakeLists.txt.patch | 24 ------------------- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 recipe/patches/0002-set-CMAKE_CXX_STANDARD-in-mlir-CMakeLists.txt.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ad20957..0647dd1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,6 @@ source: patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch - - patches/0002-set-CMAKE_CXX_STANDARD-in-mlir-CMakeLists.txt.patch build: number: 0 diff --git a/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch b/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch index 3b2ef7f..13a214a 100644 --- a/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch +++ b/recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch @@ -1,7 +1,7 @@ From 23936ca8ed236eec1201051962900334c4455ab3 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 6 Apr 2021 13:36:08 +0200 -Subject: [PATCH 1/2] Support cross compiling standalone MLIR +Subject: [PATCH] Support cross compiling standalone MLIR --- mlir/CMakeLists.txt | 13 +++++++++++++ diff --git a/recipe/patches/0002-set-CMAKE_CXX_STANDARD-in-mlir-CMakeLists.txt.patch b/recipe/patches/0002-set-CMAKE_CXX_STANDARD-in-mlir-CMakeLists.txt.patch deleted file mode 100644 index a5443e6..0000000 --- a/recipe/patches/0002-set-CMAKE_CXX_STANDARD-in-mlir-CMakeLists.txt.patch +++ /dev/null @@ -1,24 +0,0 @@ -From dfb4333dc655f48a0467a6472d8566d3ff8fbc64 Mon Sep 17 00:00:00 2001 -From: "H. Vetinari" -Date: Wed, 8 Feb 2023 10:24:58 +1100 -Subject: [PATCH 2/2] set CMAKE_CXX_STANDARD in mlir/CMakeLists.txt - ---- - mlir/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt -index f00c819b25..4594b8830e 100644 ---- a/mlir/CMakeLists.txt -+++ b/mlir/CMakeLists.txt -@@ -22,6 +22,7 @@ endif() - - # Must go below project(..) - include(GNUInstallDirs) -+set(CMAKE_CXX_STANDARD 17) - - if(MLIR_STANDALONE_BUILD) - find_package(LLVM CONFIG REQUIRED) --- -2.38.1.windows.1 - From 14d91166d76706ae48935fd2fec5c71c946f4f7b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 25 Feb 2023 09:24:49 +1100 Subject: [PATCH 21/31] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and conda-forge-pinning 2023.02.24.11.04.05 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a192c0b..8a96a72 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: @@ -36,7 +36,7 @@ jobs: - script: | call activate base - 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 + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a6..a6b09f6 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 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # 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 b3abaeb..bb00584 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index 2df0584..e3c89d7 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About mlir -========== +About mlir-feedstock +==================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/mlir-feedstock/blob/main/LICENSE.txt) Home: http://llvm.org/ Package license: Apache-2.0 WITH LLVM-exception -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/mlir-feedstock/blob/main/LICENSE.txt) - Summary: Multi-Level IR Compiler Framework Current build status @@ -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-libmlir15-green.svg)](https://anaconda.org/conda-forge/libmlir15) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libmlir15.svg)](https://anaconda.org/conda-forge/libmlir15) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libmlir15.svg)](https://anaconda.org/conda-forge/libmlir15) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libmlir15.svg)](https://anaconda.org/conda-forge/libmlir15) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libmlir16-green.svg)](https://anaconda.org/conda-forge/libmlir16) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libmlir16.svg)](https://anaconda.org/conda-forge/libmlir16) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libmlir16.svg)](https://anaconda.org/conda-forge/libmlir16) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libmlir16.svg)](https://anaconda.org/conda-forge/libmlir16) | | [![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 conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libmlir, libmlir15, mlir` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `libmlir, libmlir16, mlir` can be installed with `conda`: ``` -conda install libmlir libmlir15 mlir +conda install libmlir libmlir16 mlir ``` or with `mamba`: ``` -mamba install libmlir libmlir15 mlir +mamba install libmlir libmlir16 mlir ``` It is possible to list all of the versions of `libmlir` available on your platform with `conda`: From 382992ebb1ec66a5f6911fe2c57a51fd866d2ff1 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 25 Feb 2023 10:15:56 +1100 Subject: [PATCH 22/31] go back to win-2019 image --- .azure-pipelines/azure-pipelines-win.yml | 2 +- conda-forge.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a96a72..c5a2a24 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2022 + vmImage: windows-2019 strategy: matrix: win_64_: diff --git a/conda-forge.yml b/conda-forge.yml index 21a3a63..9a93157 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,7 @@ +azure: + settings_win: + pool: + vmImage: windows-2019 build_platform: {osx_arm64: osx_64, linux_ppc64le: linux_64, linux_aarch64: linux_64} conda_forge_output_validation: true test_on_native_only: true From 5ddfdb01de9c895cdb39e0d1e4fbd7cf5615c511 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 4 Mar 2023 11:33:34 +1100 Subject: [PATCH 23/31] switch to same llvm_rc label as rest of stack --- recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index ff88665..b94531b 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -4,6 +4,6 @@ cxx_compiler: # [osx and arm64] - clang_bootstrap # [osx and arm64] channel_targets: - - conda-forge mlir_rc + - conda-forge llvm_rc channel_sources: - conda-forge/label/llvm_rc,conda-forge From 5a87059c2d4a55f093e9fe91f68204f1c4a83fff Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 4 Mar 2023 11:34:37 +1100 Subject: [PATCH 24/31] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and conda-forge-pinning 2023.03.03.18.50.53 --- .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 +- .ci_support/win_64_.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index d2c3fa6..07b75b7 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -3,7 +3,7 @@ cdt_name: channel_sources: - conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge mlir_rc +- 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 af24dd3..4a9563d 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -7,7 +7,7 @@ cdt_name: channel_sources: - conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge mlir_rc +- 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 5c1bf8f..b97c8d9 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -3,7 +3,7 @@ cdt_name: channel_sources: - conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge mlir_rc +- 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 e820098..db877c0 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: channel_sources: - conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge mlir_rc +- 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 d9d5db7..b61f6cd 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: channel_sources: - conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge mlir_rc +- 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 46dc4df..b6d189e 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,7 +1,7 @@ channel_sources: - conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge mlir_rc +- conda-forge llvm_rc cxx_compiler: - vs2019 target_platform: From 7bd2322938b787aa24b6e08fb9f13ace4a349fc6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 15 Mar 2023 18:45:48 +1100 Subject: [PATCH 25/31] bump to 16.0.0.rc4 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0647dd1..085c14a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.0.rc3" %} +{% set version = "16.0.0.rc4" %} {% set major_version = version.split(".")[0] %} package: @@ -7,7 +7,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 8fa9792a1a04f78d023b87c5e5bd25010d5f73a5c0ae1830e897d85821ee9325 + sha256: 36e723b0befd0874a799253f5cfac8b00fe5bbfec3020ccf7b4fdae566a7e089 patches: # https://reviews.llvm.org/D99470 - patches/0001-Support-cross-compiling-standalone-MLIR.patch From 514918c65d0d4804b60aa82cd504077d600e0f64 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 15 Mar 2023 22:13:20 +1100 Subject: [PATCH 26/31] Revert "go back to win-2019 image" This reverts commit 382992ebb1ec66a5f6911fe2c57a51fd866d2ff1. --- .azure-pipelines/azure-pipelines-win.yml | 2 +- conda-forge.yml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c5a2a24..8a96a72 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: diff --git a/conda-forge.yml b/conda-forge.yml index 9a93157..21a3a63 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,7 +1,3 @@ -azure: - settings_win: - pool: - vmImage: windows-2019 build_platform: {osx_arm64: osx_64, linux_ppc64le: linux_64, linux_aarch64: linux_64} conda_forge_output_validation: true test_on_native_only: true From facdfa073287d120e21a2140eb8a3587538193fd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 18 Mar 2023 00:28:59 +0000 Subject: [PATCH 27/31] updated v16.0.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b818475..d0a8f55 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "15.0.7" %} +{% set version = "16.0.0" %} {% set major_version = version.split(".")[0] %} package: @@ -7,7 +7,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6 + sha256: 9a56d906a2c81f16f06efc493a646d497c53c2f4f28f0cb1f3c8da7f74350254 patches: # https://reviews.llvm.org/D99470 - 0001-Support-cross-compiling-standalone-MLIR.patch From b8904b061199543ea1f15a07d1a3f83eaacbb0d9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 18 Mar 2023 00:29:22 +0000 Subject: [PATCH 28/31] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and conda-forge-pinning 2023.03.18.00.14.38 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 17 +++++++++-------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a192c0b..8a96a72 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: @@ -36,7 +36,7 @@ jobs: - script: | call activate base - 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 + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a6..a6b09f6 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 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # 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 b3abaeb..bb00584 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index 2df0584..504f6a8 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About mlir -========== +About mlir-feedstock +==================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/mlir-feedstock/blob/main/LICENSE.txt) Home: http://llvm.org/ Package license: Apache-2.0 WITH LLVM-exception -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/mlir-feedstock/blob/main/LICENSE.txt) - Summary: Multi-Level IR Compiler Framework Current build status @@ -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-libmlir15-green.svg)](https://anaconda.org/conda-forge/libmlir15) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libmlir15.svg)](https://anaconda.org/conda-forge/libmlir15) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libmlir15.svg)](https://anaconda.org/conda-forge/libmlir15) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libmlir15.svg)](https://anaconda.org/conda-forge/libmlir15) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libmlir16-green.svg)](https://anaconda.org/conda-forge/libmlir16) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libmlir16.svg)](https://anaconda.org/conda-forge/libmlir16) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libmlir16.svg)](https://anaconda.org/conda-forge/libmlir16) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libmlir16.svg)](https://anaconda.org/conda-forge/libmlir16) | | [![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 conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libmlir, libmlir15, mlir` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `libmlir, libmlir16, mlir` can be installed with `conda`: ``` -conda install libmlir libmlir15 mlir +conda install libmlir libmlir16 mlir ``` or with `mamba`: ``` -mamba install libmlir libmlir15 mlir +mamba install libmlir libmlir16 mlir ``` It is possible to list all of the versions of `libmlir` available on your platform with `conda`: @@ -199,6 +199,7 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== +* [@h-vetinari](https://github.com/h-vetinari/) * [@isuruf](https://github.com/isuruf/) * [@kaushikcfd](https://github.com/kaushikcfd/) * [@xhochy](https://github.com/xhochy/) From 8608755210cf92b7566b53688c5f50c9d3e4ac6f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 18 Mar 2023 11:57:10 +1100 Subject: [PATCH 29/31] 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 b94531b..27fcede 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,8 +2,3 @@ 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 b010b49b616bc859e622fa56dc85e2113442a2c8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 18 Mar 2023 11:58:02 +1100 Subject: [PATCH 30/31] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and conda-forge-pinning 2023.03.18.00.14.38 --- .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 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 07b75b7..1c855f2 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,9 +1,9 @@ cdt_name: - cos6 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 4a9563d..6886bf7 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -5,9 +5,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 b97c8d9..2872f31 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,9 +1,9 @@ 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 db877c0..b5d8270 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,9 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index b61f6cd..648ff37 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,9 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '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 b6d189e..a3fcf8a 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,7 +1,7 @@ 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: From 4de7873e27006973ff16fbe0cfe563ab87310e3f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 19 Mar 2023 17:03:26 -0500 Subject: [PATCH 31/31] Fix cross compilation --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 824be28..b3d7edb 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -9,7 +9,7 @@ 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});-DZLIB_ROOT=${BUILD_PREFIX}" + 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}" else rm -rf $BUILD_PREFIX/bin/llvm-tblgen fi