Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Conversation

@swernli
Copy link
Collaborator

@swernli swernli commented Jan 20, 2022

By adding the macOS libomp headers alongside the checked in binary, we are able to compile directly against that folder without using brew install libomp. Combining this with using install_name_tool to update the install id in the library itself, it ensures the built simulator library will search for the dependency using the current rpath settings, which now includes the current folder of the binary itself.

This should resolve microsoft/iqsharp#568, and corresponding change to the qdk repo to remove explicit installation of libomp on macOS will confirm.

Comment on lines +5 to +6
# Skip explicit install for testing purposes
# brew install libomp
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI, I'm OK leaving these comment as is.

@swernli swernli enabled auto-merge (squash) January 20, 2022 08:38
@swernli swernli merged commit d6ec661 into main Jan 20, 2022
vxfield added a commit that referenced this pull request Jan 20, 2022
* Fix capitalization in xref links (#902)

xref links in https://docs.microsoft.com/en-us/qsharp/api/qsharp/microsoft.quantum.diagnostics.assertqubitwithintolerance and https://docs.microsoft.com/en-us/qsharp/api/qsharp/microsoft.quantum.diagnostics.assertqubit don't render as links. I believe docgen doesn't recognize API links if they are given in lowercase, it needs proper capitalization in xref.

Co-authored-by: XField <[email protected]>

* Update macOS build scripts for libomp dependency (#906)

* Link against checked in libomp.dylib

* Try another explicit link strategy

* Show contents of osx folder

* Try another linker strategy

* go back to old linker pattern

* try other syntax

* Try checked in openmp headers

* try getting more info from otool

* Try adapting libomp rpath on mac

* Ensure libomp lands in drops folder

* Additional copy of libomp

* Add explanatory comments

* Use @loader_path instead of @executable_path

Co-authored-by: Mariia Mykhailova <[email protected]>
Co-authored-by: Stefan J. Wernli <[email protected]>
vxfield added a commit that referenced this pull request Jan 21, 2022
* Update .NET Azure Quantum SDK version

* Temporarily adjusting broken links

* Update xfield/update-net-sdk (#907)

* Fix capitalization in xref links (#902)

xref links in https://docs.microsoft.com/en-us/qsharp/api/qsharp/microsoft.quantum.diagnostics.assertqubitwithintolerance and https://docs.microsoft.com/en-us/qsharp/api/qsharp/microsoft.quantum.diagnostics.assertqubit don't render as links. I believe docgen doesn't recognize API links if they are given in lowercase, it needs proper capitalization in xref.

Co-authored-by: XField <[email protected]>

* Update macOS build scripts for libomp dependency (#906)

* Link against checked in libomp.dylib

* Try another explicit link strategy

* Show contents of osx folder

* Try another linker strategy

* go back to old linker pattern

* try other syntax

* Try checked in openmp headers

* try getting more info from otool

* Try adapting libomp rpath on mac

* Ensure libomp lands in drops folder

* Additional copy of libomp

* Add explanatory comments

* Use @loader_path instead of @executable_path

Co-authored-by: Mariia Mykhailova <[email protected]>
Co-authored-by: Stefan J. Wernli <[email protected]>

* Added `libomp` instructions. (#901)

Co-authored-by: Mariia Mykhailova <[email protected]>
Co-authored-by: Stefan J. Wernli <[email protected]>
Co-authored-by: Robin Kuzmin <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CI broken for conda packages on macOS

3 participants