Skip to content

Add support for pre-ACCELERATE_NEW_LAPACK Accelerate on iOS. #25

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

Open
freakboy3742 wants to merge 1 commit into
base: main-numpymeson-1.11
Choose a base branch
from
Open

Add support for pre-ACCELERATE_NEW_LAPACK Accelerate on iOS. #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 27 additions & 7 deletions mesonbuild/dependencies/blas_lapack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,10 @@ def __init__(self, name: str, environment: 'Environment', kwargs: 'DependencyObj
super().__init__(name, environment, kwargs)
self.feature_since = ('1.3.0', '')
self.parse_modules(kwargs)
# In addition to checking the LP64/ILP64 interface, we need to
# differentiate between the original Accelerate, and the
# ACCELERATE_NEW_LAPACK variant.
self.use_new_lapack = True

for_machine = MachineChoice.BUILD if kwargs.get('native', False) else MachineChoice.HOST
if (
Expand All @@ -791,21 +795,33 @@ def check_macOS_recent_enough(self) -> bool:
return mesonlib.version_compare(sdk_version, '>=13.3')

def check_iOS_recent_enough(self) -> bool:
# The ILP64 interface is only available as part of
# ACCELERATE_NEW_LAPACK, which requires iOS 16.4 and later.
if self.interface == "ilp64":
required_version = ">=16.4"
else:
required_version = ">=13.0"

# platform.ios_ver() is only available since Python 3.13; use getattr
# so this type-checks across Python versions.
ios_ver = getattr(platform, 'ios_ver', None)
if ios_ver is None:
return False
ios_version = ios_ver().system
deploy_target = os.environ.get('IPHONEOS_DEPLOYMENT_TARGET', ios_version)
if not mesonlib.version_compare(deploy_target, '>=16.4'):

deploy_target = os.environ.get('IPHONEOS_DEPLOYMENT_TARGET', ios_ver().release)

if not mesonlib.version_compare(deploy_target, required_version):
return False

# We also need the SDK to be >=16.4
# If we're targeting iOS < 16.4, we can't use ACCELERATE_NEW_LAPACK
if mesonlib.version_compare(deploy_target, "<16.4"):
self.use_new_lapack = False

# We also need the SDK to be the right version
sdk = "iphonesimulator" if ios_ver().is_simulator else "iphoneos"
cmd = ['xcrun', '-sdk', sdk, '--show-sdk-version']
sdk_version = subprocess.run(cmd, capture_output=True, check=True, encoding='utf-8').stdout.strip()
return mesonlib.version_compare(sdk_version, '>=16.4')
return mesonlib.version_compare(sdk_version, required_version)

def detect(self, kwargs: 'DependencyObjectKWs') -> None:
from .framework import ExtraFrameworkDependency
Expand All @@ -814,15 +830,19 @@ def detect(self, kwargs: 'DependencyObjectKWs') -> None:
if self.is_found:
self.compile_args = dep.compile_args
self.link_args = dep.link_args
self.compile_args += ['-DACCELERATE_NEW_LAPACK']
if self.use_new_lapack:
self.compile_args += ['-DACCELERATE_NEW_LAPACK']
if self.interface == 'ilp64':
self.compile_args += ['-DACCELERATE_LAPACK_ILP64']

# We won't check symbols here, because Accelerate is built in a consistent fashion
# with known symbol mangling, unlike OpenBLAS or Netlib BLAS/LAPACK.

def get_symbol_suffix(self) -> str:
return '$NEWLAPACK' if self.interface == 'lp64' else '$NEWLAPACK$ILP64'
if self.use_new_lapack:
return '$NEWLAPACK' if self.interface == 'lp64' else '$NEWLAPACK$ILP64'
else:
return ''


class MKLMixin(_BLASLAPACKMixinBase):
Expand Down