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

Bumps numpy version to 1.22.3, cython version to 0.29.28 and fixes numpy build on macOS #2575

Merged
merged 1 commit into from
Apr 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion pythonforandroid/recipes/cython/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class CythonRecipe(CompiledComponentsPythonRecipe):

version = '0.29.15'
version = '0.29.28'
url = 'https://github.com/cython/cython/archive/{version}.tar.gz'
site_packages_name = 'cython'
depends = ['setuptools']
Expand Down
23 changes: 17 additions & 6 deletions pythonforandroid/recipes/numpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,30 @@

class NumpyRecipe(CompiledComponentsPythonRecipe):

version = '1.18.1'
version = '1.22.3'
url = 'https://pypi.python.org/packages/source/n/numpy/numpy-{version}.zip'
site_packages_name = 'numpy'
depends = ['setuptools', 'cython']
install_in_hostpython = True
call_hostpython_via_targetpython = False

patches = [
join('patches', 'hostnumpy-xlocale.patch'),
join('patches', 'remove-default-paths.patch'),
join('patches', 'add_libm_explicitly_to_build.patch'),
join('patches', 'compiler_cxx_fix.patch'),
]
join("patches", "remove-default-paths.patch"),
join("patches", "add_libm_explicitly_to_build.patch"),
]

def get_recipe_env(self, arch=None, with_flags_in_cc=True):
env = super().get_recipe_env(arch, with_flags_in_cc)

# _PYTHON_HOST_PLATFORM declares that we're cross-compiling
# and avoids issues when building on macOS for Android targets.
env["_PYTHON_HOST_PLATFORM"] = arch.command_prefix

# NPY_DISABLE_SVML=1 allows numpy to build for non-AVX512 CPUs
# See: https://github.com/numpy/numpy/issues/21196
env["NPY_DISABLE_SVML"] = "1"

return env

def _build_compiled_components(self, arch):
info('Building compiled components in {}'.format(self.name))
Expand Down
20 changes: 0 additions & 20 deletions pythonforandroid/recipes/numpy/patches/compiler_cxx_fix.patch

This file was deleted.

13 changes: 0 additions & 13 deletions pythonforandroid/recipes/numpy/patches/hostnumpy-xlocale.patch

This file was deleted.