Skip to content
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.

Sign up for GitHub

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 26 commits into from
Jun 16, 2022
Merged

Fix macos m1 arm wheel #306

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e0b4975
Add IsingXY
multiphaseCFD Jun 14, 2022
c0dfaf7
Auto update version
chaeyeunpark Jun 14, 2022
9913ca2
Trigger CI
multiphaseCFD Jun 14, 2022
edf3662
Trigger CI
multiphaseCFD Jun 14, 2022
b7f513f
Trigger CI
multiphaseCFD Jun 14, 2022
819fee1
Trigger CI
multiphaseCFD Jun 14, 2022
a2a70d8
Trigger CI
multiphaseCFD Jun 14, 2022
d9d3a69
Trigger CI
multiphaseCFD Jun 14, 2022
edb2663
Merge branch 'origin/add_isingxy' of https://github.com/PennyLaneAI/p…
multiphaseCFD Jun 14, 2022
96b8477
Trigger CI
multiphaseCFD Jun 14, 2022
c318004
Trigger CI
multiphaseCFD Jun 14, 2022
7ca37a0
make format
multiphaseCFD Jun 14, 2022
c0e034d
make format
multiphaseCFD Jun 14, 2022
be294fc
Delete .DS_Store
multiphaseCFD Jun 14, 2022
0581e8c
Delete .DS_Store
multiphaseCFD Jun 14, 2022
ff42ee6
Delete .DS_store
multiphaseCFD Jun 14, 2022
54fe738
Delete .DS_Store
multiphaseCFD Jun 14, 2022
1d24bb2
Delete .DS_Store
multiphaseCFD Jun 14, 2022
8d9f709
Trigger CI
multiphaseCFD Jun 14, 2022
13aac5b
fix MacOS ARM64 wheels
multiphaseCFD Jun 15, 2022
19f4fa4
Merge https://github.com/PennyLaneAI/pennylane-lightning into fix_mac…
multiphaseCFD Jun 15, 2022
63a1472
Auto update version
chaeyeunpark Jun 15, 2022
ab06ad6
comment line 66 of wheel_macros_arm64.yml
multiphaseCFD Jun 15, 2022
b0bd4c2
Merge branch 'v0.24_rc0' into fix_macos_m1_arm_wheel
mlxd Jun 16, 2022
cb5a2e5
uncomment line 66
multiphaseCFD Jun 16, 2022
9fcafb2
Remove space at the end of line 89
multiphaseCFD Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/wheel_macos_arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
env:
CIBW_BUILD: 'cp37-* cp38-* cp39-* cp310-*'

ARCHS: 'arm64'

# MacOS specific build settings
CIBW_BEFORE_ALL_MACOS: |
brew uninstall --force oclint
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ doc/code/
*.so
cpptests
*.o

.DS_Store
.cache/*
.vscode/*
.ycm_extra_conf.py
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
Version number (major.minor.patch[-label])
"""

__version__ = "0.24.0-dev15"
__version__ = "0.24.0-dev16"
7 changes: 6 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
configure_args += ["-DENABLE_OPENMP=OFF"]
configure_args += ["-DENABLE_OPENMP=OFF"]

Copy link
Member Author

Choose a reason for hiding this comment

The 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
Expand Down