Skip to content

CI Use Meson 1.5 in no-OpenMP build#29839

Merged
ogrisel merged 3 commits intoscikit-learn:mainfrom
lesteve:meson-1.5-no-openmp-ci
Sep 13, 2024
Merged

CI Use Meson 1.5 in no-OpenMP build#29839
ogrisel merged 3 commits intoscikit-learn:mainfrom
lesteve:meson-1.5-no-openmp-ci

Conversation

@lesteve
Copy link
Copy Markdown
Member

@lesteve lesteve commented Sep 13, 2024 •
edited
Loading

Fix #29546.

cc @jeremiedbb.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Sep 13, 2024 •
edited
Loading

✔️ Linting Passed

All linting checks passed. Your pull request is in excellent shape! ☀️

Generated for commit: d46e2e4. Link to the linter CI: here

@lesteve
Copy link
Copy Markdown
Member Author

lesteve commented Sep 13, 2024

OpenMP is not detected as it should, see build log

Run-time dependency OpenMP for c found: NO (tried system)

@jeremiedbb
Copy link
Copy Markdown
Member

jeremiedbb commented Sep 13, 2024

In the no openmp build:

Built with OpenMP: False

threadpoolctl info:
       user_api: blas
   internal_api: mkl
    num_threads: 4
         prefix: libmkl_rt
       filepath: /usr/local/miniconda/envs/testvenv/lib/libmkl_rt.2.dylib
        version: 2023.1-Product
threading_layer: intel

       user_api: openmp
   internal_api: openmp
    num_threads: 4
         prefix: libiomp
       filepath: /usr/local/miniconda/envs/testvenv/lib/libiomp5.dylib
        version: None

Looks good. The libiomp comes from mkl and not from openmp calls within scikit-learn.

jeremiedbb
jeremiedbb approved these changes Sep 13, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@jeremiedbb jeremiedbb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jeremiedbb
Copy link
Copy Markdown
Member

jeremiedbb commented Sep 13, 2024

An alternative that we discussed is to have a meson flag to disable linking against openmp explicitely, but this looks good enough.

@ogrisel ogrisel merged commit 173103a into scikit-learn:main Sep 13, 2024
@lesteve lesteve deleted the meson-1.5-no-openmp-ci branch September 13, 2024 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ogrisel ogrisel ogrisel approved these changes

@jeremiedbb jeremiedbb jeremiedbb approved these changes

Assignees

No one assigned

Labels

Build / CI

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CI Investigate timeout in no-OpenMP build with Meson 1.5

3 participants

@lesteve @jeremiedbb @ogrisel