Add macOS and aarch64 platform branches#97
Merged
Conversation
Detect __APPLE__ for OS string and __aarch64__/__arm64__ for arch string and bits, mirroring fmpy, fmi-library, and FMI4j. Without this, on Apple Silicon both axes fall through to defaults (linux + 32) and the loader looks for binaries/linux32/*.so instead of binaries/darwin64/*.dylib. Reported as robbr48#96.
Without this, test FMUs are written to binaries/linux64 (FMI 1/2) or binaries/x86_64-linux (FMI 3) on macOS, while the patched fmi4c reader correctly looks under binaries/darwin64 / aarch64-darwin. With this commit and the reader fix applied, all 6 ctest cases pass on macOS 26.4.1 arm64 (Apple M5): Test #1: fmi1cs ........... Passed 1.05 sec Test robbr48#2: fmi1me ........... Passed 0.36 sec Test robbr48#3: fmi2cs ........... Passed 0.44 sec Test robbr48#4: fmi2me ........... Passed 0.46 sec Test robbr48#5: fmi3cs ........... Passed 0.42 sec Test robbr48#6: fmi3me ........... Passed 0.33 sec 100% tests passed, 0 tests failed out of 6
slitvinov
force-pushed
the
experimental-macos-arm64
branch
from
8fba5c0 to
6153abb
Compare
Contributor
|
hi, I'm packaging openmodelica for conda, I confirm this fixes OMSimulator |
Owner
|
Looks great! But I would really prefer to keep "on: [pull_request]" rather than workflow_dispatch. Was this change accidental? |
Contributor
|
yes, the "ci" commits look unrelated |
slitvinov
force-pushed
the
experimental-macos-arm64
branch
from
3cad7fb to
6153abb
Compare
Contributor
Author
|
Thanks @jschueller, dropped the ci noise. |
Contributor
|
is there a new release planned ? |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #96.
Detect
__APPLE__for OS string and__aarch64__/__arm64__for arch string and bits, mirroring what fmpy, fmi-library, FMI4j, and Reference-FMUs already do. Without this, on Apple Silicon both axes fall through to the defaults (linux+32) and the loader looks forbinaries/linux32/*.soinstead ofbinaries/darwin64/*.dylib.Verified by rebuilding OMSimulator (which vendors fmi4c) on macOS arm64 and running it on a ChuaCircuit FMU built by omc: simulates to completion and writes the result file. Repro steps and full analysis in #96.