-
Notifications
You must be signed in to change notification settings - Fork 42
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
Fix macos m1 arm wheel #306
Merged
Merged
Changes from 23 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
e0b4975
Add IsingXY
multiphaseCFD c0dfaf7
Auto update version
chaeyeunpark 9913ca2
Trigger CI
multiphaseCFD edf3662
Trigger CI
multiphaseCFD b7f513f
Trigger CI
multiphaseCFD 819fee1
Trigger CI
multiphaseCFD a2a70d8
Trigger CI
multiphaseCFD d9d3a69
Trigger CI
multiphaseCFD edb2663
Merge branch 'origin/add_isingxy' of https://github.com/PennyLaneAI/p…
multiphaseCFD 96b8477
Trigger CI
multiphaseCFD c318004
Trigger CI
multiphaseCFD 7ca37a0
make format
multiphaseCFD c0e034d
make format
multiphaseCFD be294fc
Delete .DS_Store
multiphaseCFD 0581e8c
Delete .DS_Store
multiphaseCFD ff42ee6
Delete .DS_store
multiphaseCFD 54fe738
Delete .DS_Store
multiphaseCFD 1d24bb2
Delete .DS_Store
multiphaseCFD 8d9f709
Trigger CI
multiphaseCFD 13aac5b
fix MacOS ARM64 wheels
multiphaseCFD 19f4fa4
Merge https://github.com/PennyLaneAI/pennylane-lightning into fix_mac…
multiphaseCFD 63a1472
Auto update version
chaeyeunpark ab06ad6
comment line 66 of wheel_macros_arm64.yml
multiphaseCFD b0bd4c2
Merge branch 'v0.24_rc0' into fix_macos_m1_arm_wheel
mlxd cb5a2e5
uncomment line 66
multiphaseCFD 9fcafb2
Remove space at the end of line 89
multiphaseCFD 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 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 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 |
---|---|---|
|
@@ -19,7 +19,7 @@ doc/code/ | |
*.so | ||
cpptests | ||
*.o | ||
|
||
.DS_Store | ||
.cache/* | ||
.vscode/* | ||
.ycm_extra_conf.py | ||
|
This file contains 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 |
---|---|---|
|
@@ -16,4 +16,4 @@ | |
Version number (major.minor.patch[-label]) | ||
""" | ||
|
||
__version__ = "0.24.0-dev15" | ||
__version__ = "0.24.0-dev16" |
This file contains 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 | ||||
---|---|---|---|---|---|---|
|
@@ -77,11 +77,16 @@ def build_extension(self, ext: CMakeExtension): | |||||
|
||||||
# Add more platform dependent options | ||||||
if platform.system() == "Darwin": | ||||||
#To support ARM64 | ||||||
if os.getenv('ARCHS') == "arm64": | ||||||
configure_args += ["-DCMAKE_CXX_FLAGS='-target arm64-apple-macos11'"] | ||||||
else: | ||||||
configure_args += [] | ||||||
# Disable OpenMP in M1 Macs | ||||||
if os.environ.get("USE_OMP"): | ||||||
configure_args += [] | ||||||
else: | ||||||
configure_args += ["-DENABLE_OPENMP=OFF"] | ||||||
configure_args += ["-DENABLE_OPENMP=OFF"] | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks @mlxd , done! |
||||||
elif platform.system() == "Linux": | ||||||
if platform.machine() == "x86_64": | ||||||
configure_args += ["-DENABLE_AVX=ON"] # Enable AVX if x64 on Linux | ||||||
|
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.
I think we are good, so this can be uncommented.
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.
done!