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.

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

[Powsybl] Support aarch64 macos build for powsybl.jl #9897

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

obrix
Copy link
Contributor

@obrix obrix commented Nov 29, 2024

Support aarch64 macos build for powsybl.jl

Signed-off-by: Bertrand Rix <[email protected]>
@obrix obrix marked this pull request as draft November 29, 2024 14:59
@obrix obrix changed the title Support aarch64 macos build for powsybl.jl [Powsybl] Support aarch64 macos build for powsybl.jl Nov 29, 2024
Signed-off-by: Bertrand Rix <[email protected]>
Signed-off-by: Bertrand Rix <[email protected]>
@@ -70,7 +73,7 @@ install_license $WORKSPACE/srcdir/powsybl.jl/LICENSE.md
include("../../L/libjulia/common.jl")
platforms = vcat(libjulia_platforms.(julia_versions)...)

filter!(p -> arch(p) == "x86_64" && os(p) ∈ ("windows", "linux", "macos"), platforms)
filter!(p -> arch(p) == "x86_64" && os(p) ∈ ("windows", "linux", "macos") || arch(p) == "aarch64" && occursin(os(p), "macos"), platforms)
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
filter!(p -> arch(p) == "x86_64" && os(p) ("windows", "linux", "macos") || arch(p) == "aarch64" && occursin(os(p), "macos"), platforms)
filter!(p -> arch(p) == "x86_64" && os(p) ("windows", "linux", "macos") || arch(p) == "aarch64" && Sys.isapple(p), platforms)

I think you're missing some parentheses to correctly group the conditions?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for isapple. For parenthesis I think it is okay logically ? A && B || C && D should be evaluated as ( x86_64 && 3os ) || (aarch64 && macos)

obrix added 3 commits December 2, 2024 09:59
Signed-off-by: Bertrand Rix <[email protected]>
Signed-off-by: Bertrand Rix <[email protected]>
Signed-off-by: Bertrand Rix <[email protected]>
@@ -70,7 +73,7 @@ install_license $WORKSPACE/srcdir/powsybl.jl/LICENSE.md
include("../../L/libjulia/common.jl")
platforms = vcat(libjulia_platforms.(julia_versions)...)

filter!(p -> arch(p) == "x86_64" && os(p) ∈ ("windows", "linux", "macos"), platforms)
filter!(p -> arch(p) == "x86_64" && os(p) ∈ ("windows", "linux", "macos") || arch(p) == "aarch64" && Sys.isapple(p), platforms)
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
filter!(p -> arch(p) == "x86_64" && os(p) ("windows", "linux", "macos") || arch(p) == "aarch64" && Sys.isapple(p), platforms)
# Only build for x86_64 platforms and Apple aarch64
filter!(p -> (arch(p) == "x86_64" && os(p) ("windows", "linux", "macos")) || (arch(p) == "aarch64" && Sys.isapple(p)), platforms)

For clarity, I think this is what you want.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants