-
Notifications
You must be signed in to change notification settings - Fork 14
Move build system to meson-python
#113
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ndgrigorian
wants to merge
44
commits into
master
Choose a base branch
from
build-with-meson
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
44 commits
Select commit
Hold shift + click to select a range
04605fe
Moves the build system from setuptools to meson
ndgrigorian a8429b3
add cmake to build system dependencies
ndgrigorian dd8fb6c
use meson-python in builds
ndgrigorian e7b7b56
add pip build
ndgrigorian 2d1f4a4
add standard clang workflow
ndgrigorian 6b6bc71
add ninja to build system and meta.yamls
ndgrigorian 668fbb5
use pip install in build scripts
ndgrigorian 6f8d749
remove MKLROOT
ndgrigorian 02efc61
don't install mkl-service in pip and standard clang builds
ndgrigorian e2c6db2
add mkl_threading option
ndgrigorian d665264
use gnu_thread in Linux conda-forge builds
ndgrigorian 03930e6
add fix to pip builds
ndgrigorian 570f465
Merge remote-tracking branch 'origin/master' into build-with-meson
vlad-perevezentsev 9bf7d7e
Apply remarks from mkl-service PR for meson.build
vlad-perevezentsev 60adc5f
Apply remarks from mkl-service PR for conda-recipe
vlad-perevezentsev 72f9a2d
Update conda-recipe-cf
vlad-perevezentsev 7483cfb
Add missing python source file to meson.build
vlad-perevezentsev 74a8ae0
Clean up github workflows
vlad-perevezentsev 6819973
Remove unused env variables from build_pip.yml
vlad-perevezentsev 59da276
Add Building from source block to README.md
vlad-perevezentsev b98b4db
A small clean up
vlad-perevezentsev c925f2b
Remove redundant mkl from build-with-standard-clang dependencies
vlad-perevezentsev b60d962
Fix numpy install in GH CI workflows
vlad-perevezentsev a80ff59
add CI badges to README.md
vlad-perevezentsev 01d2179
Fix MKL detection with non-Intel clang++
vlad-perevezentsev 0d3b284
Merge remote-tracking branch 'origin/master' into build-with-meson
vlad-perevezentsev a90018c
Pass two separate RPATH entry for support macOS
vlad-perevezentsev 569a6e0
Require meson-python >=0.16.0 for PEP 639
vlad-perevezentsev 4184e3a
Add gh-113 to changelog
vlad-perevezentsev 03c3c77
Add mkl-devel to build-system requires
vlad-perevezentsev f16cab6
Use editable install in build-with-standard-clang
vlad-perevezentsev 979bfec
Remove redundant mkl from build_pip dependencies
vlad-perevezentsev 3980e9f
Remove redundant CFLAGS/LDFLAGS from conda build.sh
vlad-perevezentsev 33275d1
Switch MKL_LINK to sdl and remove meson.options
vlad-perevezentsev 0b68ab4
Add --no-deps to build_pip
vlad-perevezentsev 565d8b4
Clean up .gitignore for meson build
vlad-perevezentsev 6970a72
Update maintenance docs for meson build
vlad-perevezentsev e000f3a
Remove unused WHEELS_OUTPUT_FOLDER from conda-recipe-cf
vlad-perevezentsev bb303b3
Add numpy to ignore_run_exports in conda recipes
vlad-perevezentsev fa5e258
Merge remote-tracking branch 'origin/master' into build-with-meson
vlad-perevezentsev 952c133
Add OSX builds to conda-forge package workflow
vlad-perevezentsev 60d4a45
Add osx compilers to conda-forge build config
vlad-perevezentsev 5edd83e
Restore scripting@intel.com email in authors
vlad-perevezentsev 18c3566
Merge branch 'master' into build-with-meson
antonwolfy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| name: Build project with standard clang compiler | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: [master] | ||
|
|
||
| permissions: read-all | ||
|
|
||
| jobs: | ||
| build-with-standard-clang: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| matrix: | ||
| python: ["3.10", "3.11", "3.12", "3.13", "3.14"] | ||
| numpy_version: ["'numpy>=2'"] | ||
|
|
||
| env: | ||
| COMPILER_ROOT: /usr/bin | ||
|
|
||
| defaults: | ||
| run: | ||
| shell: bash -el {0} | ||
|
|
||
| steps: | ||
| - name: Cancel Previous Runs | ||
| uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0 | ||
| with: | ||
| access_token: ${{ github.token }} | ||
|
|
||
| - name: Install Dependencies | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install -y clang | ||
|
|
||
| - name: Setup Python | ||
| uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 | ||
| with: | ||
| python-version: ${{ matrix.python }} | ||
| architecture: x64 | ||
|
|
||
| - name: Checkout repo | ||
| uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Install mkl_random dependencies | ||
| run: | | ||
| pip install meson-python ninja cmake cython mkl-devel | ||
| pip install ${{ matrix.numpy_version }} | ||
|
|
||
| - name: Build mkl_random | ||
| run: | | ||
| export CC=${{ env.COMPILER_ROOT }}/clang | ||
| export CXX=${{ env.COMPILER_ROOT }}/clang++ | ||
| pip install -e . --no-build-isolation --no-deps --verbose | ||
|
|
||
| - name: Run mkl_random tests | ||
| run: | | ||
| pip install pytest | ||
| python -m pytest -sv --pyargs mkl_random | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: Editable build using pip and pre-release NumPy | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| pull_request: | ||
|
|
||
| permissions: read-all | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| defaults: | ||
| run: | ||
| shell: bash -el {0} | ||
|
|
||
| strategy: | ||
| matrix: | ||
| python: ["3.10", "3.11", "3.12", "3.13", "3.14"] | ||
| use_pre: ["", "--pre"] | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0 | ||
| with: | ||
| miniforge-version: latest | ||
| channels: conda-forge | ||
| activate-environment: test | ||
| python-version: ${{ matrix.python }} | ||
|
|
||
| - name: Install MKL | ||
| run: | | ||
| conda install mkl-devel | ||
|
|
||
| - name: Build with pip | ||
| run: | | ||
| pip install --no-cache-dir meson-python ninja cmake cython | ||
| pip install --no-cache-dir numpy ${{ matrix.use_pre }} | ||
| pip install -e . --no-build-isolation --no-deps --verbose | ||
| pip install --no-cache-dir pytest | ||
| pip list | ||
| python -m pytest -v mkl_random/tests |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,7 @@ | ||
| # CMake build and local install directory | ||
| # Meson build and local install directory | ||
| build/ | ||
| .mesonpy-* | ||
| mkl_random.egg-info/ | ||
|
|
||
| # Byte-compiled / optimized / DLL files | ||
| __pycache__/ | ||
|
|
||
| mkl_random/src/mklrand.c | ||
| mkl_random/mklrand.cpp | ||
| mkl_random/mklrand.cpython*.so |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,2 @@ | ||
| @rem Remember to source the compiler | ||
|
|
||
| set MKLROOT=%CONDA_PREFIX% | ||
|
|
||
| rem Build wheel package | ||
| if NOT "%WHEELS_OUTPUT_FOLDER%"=="" ( | ||
| %PYTHON% -m pip wheel --no-build-isolation --no-deps . | ||
| if errorlevel 1 exit 1 | ||
| copy mkl_random*.whl %WHEELS_OUTPUT_FOLDER% | ||
| if errorlevel 1 exit 1 | ||
| ) ELSE ( | ||
| rem Build conda package | ||
| %PYTHON% -m pip install --no-build-isolation --no-deps . | ||
| if errorlevel 1 exit 1 | ||
| ) | ||
| %PYTHON% -m pip install --no-build-isolation --no-deps . | ||
| if errorlevel 1 exit 1 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Need to update
.github/workflows/coverity.yml