Repository navigation
Build and test conda packages and wheels - #400
jharlow-intel wants to merge 2 commits into
Conversation
There was a problem hiding this comment.
🔵 Needs a closer look
Full-version builds and the external Jenkins handoff remain unverified and need maintainer validation.
1 open issue
What changed in this PR
Adds GitHub Actions build and test support for mkl_fft’s conda-forge packages, preparing the repository for Intel Python CI’s future Jenkins integration.
Changes:
- Derives Linux and Windows build matrices from recipe Python variants, limiting pull requests to the two newest regular versions.
- Adds package-building and isolated testing scripts, with pytest JUnit reporting.
- Configures artifact naming, pins Miniforge, and documents the CI integration.
| File | Description |
|---|---|
conda-recipe-cf/conda_build_config.yaml |
Declares Python variants and NumPy 2. |
conda-recipe-cf/AGENTS.md |
Documents the recipe’s matrix role. |
ci/test.py |
Tests the installed package and writes JUnit results. |
ci/README.md |
Explains CI operation and local usage. |
ci/matrix.py |
Derives platform and Python build matrices. |
ci/hooks.py |
Installs artifacts into isolated test environments. |
ci/config.yml |
Defines workflow, artifact names, and test requirements. |
ci/build.py |
Builds and collects packages for a selected Python version. |
AGENTS.md |
Adds the Intel Python CI directory reference. |
.github/workflows/intel-ci.yml |
Orchestrates matrix generation, builds, and package tests. |
.github/AGENTS.md |
Documents the workflow and its matrix source. |
Review effort: Balanced
36f66c0 to
93e4302
Compare
vchamarthi
left a comment
There was a problem hiding this comment.
Scripts look good and match the other repos, and the 22 jobs are green.
The PR description is out of date though. It says the workflow builds conda-recipe-cf (it's deleted now, and conda-recipe/ is replaced by the cf recipe), Linux and Windows only (macOS and wheels are built too), and that Jenkins isn't on for mkl_fft (it's enabled in config/gh-ci.json, dry run). The test counts in it are old as well, the head run shows 2793 and 2787.
It also doesn't say conda-package.yml is deleted. That workflow was the only one building and testing against the Intel channel (software.repos.intel.com/python/conda), which is what the shipped Intel package links against, and nothing replaces it. Rest is inline.
|
|
||
| def require_scipy_fft(): | ||
| """Skips the test unless mkl_fft has its SciPy interface.""" | ||
| if scipy_fft is None: |
There was a problem hiding this comment.
When import mkl fails, the scipy-interface tests now skip instead of failing. So a conda cell where mkl-service is required in ci/config.yml but imports badly still goes green with about 240 fewer tests. You can already see it in the 3.15 wheel cells: 2551 passed and 54 skipped, against 2793 and 2 on Linux. Could ci/test.py check that the scipy interface loaded when mkl-service is in the requirements? Same pattern in test_basic.py and test_multithreading.py.
| try: | ||
| import mkl_fft.interfaces.scipy_fft as fft | ||
| except ImportError: | ||
| pytest.skip("This test file needs mkl-service", allow_module_level=True) |
There was a problem hiding this comment.
Same as in test_interfaces.py: this skip hides a broken mkl-service import.
| import mkl_fft.interfaces.scipy_fft as fft | ||
| except ImportError: | ||
| pytest.skip("This test file needs scipy", allow_module_level=True) | ||
| pytest.skip( |
| - python | ||
| - {{ pin_compatible('mkl') }} | ||
| - numpy >=1.26.4 | ||
| - numpy |
There was a problem hiding this comment.
Run requirement goes from numpy >=1.26.4 to a bare numpy, with ignore_run_exports: numpy. conda can now pair this with a numpy 1.x older than the numpy>=1.26.4 in pyproject.toml. Could we use numpy's run_exports instead of ignoring them?
|
|
||
| test: | ||
| name: Test ${{ matrix.name }} Python ${{ matrix.python }} | ||
| needs: [matrix, build] |
There was a problem hiding this comment.
If any build leg fails, macOS included, all the test legs are skipped and the run fails. Jenkins needs a green run, so a macOS-only failure would block a tag release even though Jenkins ignores macOS. Intended? Same on test-wheel at line 175.
| # macOS runs on Intel runners, as MKL has no Apple silicon build; Jenkins ignores it. | ||
| build: | ||
| name: ${{ matrix.name }} Python ${{ matrix.python }} | ||
| needs: matrix |
There was a problem hiding this comment.
conda-package-cf.yml and this workflow now both build conda-recipe on every PR, so the runner load is doubled.
| """ | ||
| Intel Python CI (gh-ci) test for mkl_fft. | ||
|
|
||
| GitHub Actions, through ci/hooks.py, and Intel's Jenkins both run this with one |
There was a problem hiding this comment.
This only talks about a conda package, but it tests the wheels too.
Adds a ci/ directory and .github/workflows/intel-ci.yml. The workflow builds conda-recipe/ with conda-build and the wheels with cibuildwheel, for every platform and Python version the recipe and pyproject.toml declare, and tests each package in a clean environment with ci/test.py. conda-recipe/ is now the only recipe, the conda-forge one that was conda-recipe-cf/; the Intel-channel recipe and conda-package.yml, which copied wheels out through WHEELS_OUTPUT_FOLDER, are removed. conda-package-cf.yml reports the same check names, so the required checks still run. conda_build_config.yaml now lists the Python versions, and numpy: '2', as conda-build otherwise defaults to 1.26. The wheels' run-time requirement on mkl comes from [tool.gh-ci] wheel-requires in pyproject.toml, which ci/build.py adds to each wheel: in [project] it would fail the recipe's pip check, as conda-forge's mkl has no pip metadata. The Agent guidance job, ci/guidance.py, fails a pull request that adds a broken link, path, script or identifier claim to an agent guidance file it changes. Claims that already fail, and untouched files, never fail it. dokimi is installed with the hashes in ci/guidance-requirements.txt. The wheels build against mkl-devel >=2026.2,<2027, the range they require at run time, and the Linux wheels are tagged manylinux_2_28 only, like the mkl wheel. ci/build.py keeps only the $ORIGIN entries of each ELF file's RPATH and RUNPATH in a wheel, as meson-python keeps the isolated build env's absolute lib directory, and refuses a file that would be left with none. ci/hooks.py tests each wheel in a venv made from conda-forge's Python, as pip users install it. Every python: entry in conda_build_config.yaml names its ABI, which ci/matrix.py requires, and every push and tag run gets a concurrency group of its own.
7b19f5e to
4a90189
Compare
conda-build reads x86 as any x86 CPU and has no osx64 selector, while rattler-build has x86 for 32-bit only and osx64 for Intel macOS, so ci/matrix.py now gives conda-build its own values for both and refuses a conda-build skip that uses osx64. ci/build.py keeps a search path entry only when it is $ORIGIN or a directory under it, names RPATH and RUNPATH entries apart, and rewrites the wheels in scratch, so a refused wheel never reaches --output.

Adds
ci/and.github/workflows/intel-ci.yml, which build the conda packages for Linux, Windows and Intel macOS and the wheels for Linux and Windows, on every declared Python, and test each in a clean environment.conda-recipe/is now the only recipe: the conda-forge one that wasconda-recipe-cf/. The Intel-channel recipe andconda-package.ymlare removed;conda-package-cf.ymlbuildsconda-recipe/and keeps its check names.python:list inconda_build_config.yaml, which also setsnumpy: '2', as conda-build otherwise falls back to NumPy 1.26. The wheels follow thepyproject.tomlclassifiers: 3.10 to 3.15 plus 3.14t and 3.15t.mkl >=2026.2,<2027through[tool.gh-ci] wheel-requires, whichci/build.pyadds to each wheel.meson.buildaddsLibraryto CMake's search path on Windows, where mkl-devel puts its CMake config.ci/test.pyrunspytest --pyargs mkl_ffton the installed package. The SciPy interface tests skip without SciPy or mkl-service, as on the 3.15 wheels, which get no mkl-service from PyPI yet.ci/benchmark.pyruns the asv suite inbenchmarks/against the installed package: one quick sample of each benchmark on a pull request, a full measurement on a tag.Agent guidancejob,ci/guidance.py, fails a pull request that adds a broken link, path, script or identifier claim to an agent guidance file it changes. dokimi is installed with the hashes inci/guidance-requirements.txt.Miniforge is pinned to 26.7.2-0, as 26.9.4-0 makes
setup-miniconda'sconda initfail on Windows runners.Overlap with #398. It changes
conda-recipe-cf/, which this moves toconda-recipe/, so whichever lands second needs a rebase.Validation: run 42099107198 built and tested the conda packages for 3.10 and 3.15 on Linux, Windows and macOS, and the wheels for 3.10 and 3.15 on Linux and Windows; all 22 jobs passed. Not run yet: the full matrix, which only
masterand tags build.