Skip to content

[baseline][blas] Don't pick intel-mkl#30421

Merged
vicroms merged 2 commits intomicrosoft:masterfrom
dg0yt:mkl
Mar 27, 2023
Merged

[baseline][blas] Don't pick intel-mkl#30421
vicroms merged 2 commits intomicrosoft:masterfrom
dg0yt:mkl

Conversation

@dg0yt
Copy link
Copy Markdown
Contributor

@dg0yt dg0yt commented Mar 25, 2023

Immediate fix to baseline regressions from find_package(BLAS) picking port intel-mkl's BLAS, eventually burned into downstream ports' exported config if using BLAS_LIBRARIES or LAPACK_LIBRARIES.
Cf. #29437 (comment) and #30363.
Before the change, after vcpkg install intel-mkl:

-- Found BLAS: /home/kpa/Projekte/vcpkg/vcpkg/installed/x64-linux/lib/intel64/libmkl_gf_lp64.a;/home/kpa/Projekte/vcpkg/vcpkg/installed/x64-linux/lib/intel64/libmkl_gnu_thread.a;/home/kpa/Projekte/vcpkg/vcpkg/installed/x64-linux/lib/intel64/libmkl_core.a;/usr/lib/gcc/x86_64-linux-gnu/7/libgomp.so;-lpthread;-lm;-ldl

With this PR:

-- Found BLAS: /home/kpa/Projekte/vcpkg/vcpkg/installed/x64-linux/debug/lib/libopenblas.a

The new wrapper still respects the user's choice of setting env MKLROOT.

The ultimate fix is probably #24327. CC @Neumann-A

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@dg0yt dg0yt changed the title [blas] Don't pick intel-mkl [baseline][blas] Don't pick intel-mkl Mar 25, 2023
Neumann-A
Neumann-A reviewed Mar 25, 2023
View reviewed changes
@talregev talregev mentioned this pull request Mar 26, 2023
Closed
10 tasks
@Cheney-W Cheney-W added category:port-bug The issue is with a library, which is something the port should already support info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. labels Mar 27, 2023
@Neumann-A
Copy link
Copy Markdown
Contributor

Neumann-A commented Mar 27, 2023

The ultimate fix is probably #24327. CC @Neumann-A

If you want that fix you probably need to close this before it gets merged. Otherwise there is no pressure to merge #24327 the "ultimate fix".

@dg0yt
Copy link
Copy Markdown
Contributor Author

dg0yt commented Mar 27, 2023 •
edited
Loading

I want a hotfix for the regressions caused by blas picking the new intel-mkl (this PR) because it is blocking many unrelated PRs.
I mentioned #24327 to underline that my PR should not be understood as a permanent solution.

@vicroms vicroms merged commit 982a49e into microsoft:master Mar 27, 2023
@dg0yt dg0yt deleted the mkl branch March 27, 2023 19:32
This was referenced Mar 27, 2023
Closed
Closed
@lrineau lrineau mentioned this pull request Mar 31, 2023
Merged
11 tasks
@dg0yt dg0yt mentioned this pull request Apr 11, 2023
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@Neumann-A Neumann-A Neumann-A left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@Cheney-W Cheney-W

Labels

category:port-bug The issue is with a library, which is something the port should already support info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dg0yt @Neumann-A @vicroms @Cheney-W