Skip to content

Numpy recipe #112

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

Merged
merged 4 commits into from
May 10, 2013
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 distribute.sh
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function push_arm() {
#export OFLAG="-Os"
#export OFLAG="-O2"

export CFLAGS="-mandroid $OFLAG -fomit-frame-pointer --sysroot $NDKPLATFORM"
export CFLAGS="-DANDROID -mandroid $OFLAG -fomit-frame-pointer --sysroot $NDKPLATFORM"
if [ "X$ARCH" == "Xarmeabi-v7a" ]; then
CFLAGS+=" -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -mthumb"
fi
Expand Down
64 changes: 64 additions & 0 deletions recipes/numpy/patches/fix-numpy.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
diff -x build -x '*.pyc' -x '*.swp' -Naur numpy-1.7.1.orig/numpy/core/src/multiarray/numpyos.c numpy-1.7.1/numpy/core/src/multiarray/numpyos.c
--- numpy-1.7.1.orig/numpy/core/src/multiarray/numpyos.c 2013-04-07 07:04:05.000000000 +0200
+++ numpy-1.7.1/numpy/core/src/multiarray/numpyos.c 2013-05-03 10:57:35.812501674 +0200
@@ -170,8 +170,7 @@
static void
_change_decimal_from_locale_to_dot(char* buffer)
{
- struct lconv *locale_data = localeconv();
- const char *decimal_point = locale_data->decimal_point;
+ const char *decimal_point = ".";

if (decimal_point[0] != '.' || decimal_point[1] != 0) {
size_t decimal_point_len = strlen(decimal_point);
@@ -455,8 +454,7 @@
NPY_NO_EXPORT double
NumPyOS_ascii_strtod(const char *s, char** endptr)
{
- struct lconv *locale_data = localeconv();
- const char *decimal_point = locale_data->decimal_point;
+ const char *decimal_point = ".";
size_t decimal_point_len = strlen(decimal_point);

char buffer[FLOAT_FORMATBUFLEN+1];
diff -x build -x '*.pyc' -x '*.swp' -Naur numpy-1.7.1.orig/numpy/core/src/private/npy_config.h numpy-1.7.1/numpy/core/src/private/npy_config.h
--- numpy-1.7.1.orig/numpy/core/src/private/npy_config.h 2013-04-07 07:04:05.000000000 +0200
+++ numpy-1.7.1/numpy/core/src/private/npy_config.h 2013-05-03 10:57:35.812501674 +0200
@@ -41,4 +41,12 @@
#define SIZEOF_PY_INTPTR_T 4
#endif
#endif
+
+/* Android only
+ */
+#ifdef ANDROID
+#undef HAVE_LDEXPL
+#undef HAVE_FREXPL
+#endif
+
#endif
diff -x build -x '*.pyc' -x '*.swp' -Naur numpy-1.7.1.orig/numpy/testing/__init__.py numpy-1.7.1/numpy/testing/__init__.py
--- numpy-1.7.1.orig/numpy/testing/__init__.py 2013-04-07 07:04:05.000000000 +0200
+++ numpy-1.7.1/numpy/testing/__init__.py 2013-05-03 11:09:29.316488099 +0200
@@ -1,15 +1,7 @@
-"""Common test support for all numpy test scripts.
-
-This single module should provide all the common functionality for numpy tests
-in a single location, so that test scripts can just import it and work right
-away.
-"""
-
-from unittest import TestCase
-
-import decorators as dec
-from utils import *
-from numpytest import *
-from nosetester import NoseTester as Tester
-from nosetester import run_module_suite
+# fake tester, android don't have unittest
+class Tester(object):
+ def test(self, *args, **kwargs):
+ pass
+ def bench(self, *args, **kwargs):
+ pass
test = Tester().test
40 changes: 40 additions & 0 deletions recipes/numpy/recipe.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/bash

VERSION_numpy=1.7.1
URL_numpy=http://pypi.python.org/packages/source/n/numpy/numpy-$VERSION_numpy.tar.gz
DEPS_numpy=(python)
MD5_numpy=0ab72b3b83528a7ae79c6df9042d61c6
BUILD_numpy=$BUILD_PATH/numpy/$(get_directory $URL_numpy)
RECIPE_numpy=$RECIPES_PATH/numpy

function prebuild_numpy() {
cd $BUILD_numpy

if [ -f .patched ]; then
return
fi

try patch -p1 < $RECIPE_numpy/patches/fix-numpy.patch
touch .patched
}

function build_numpy() {

if [ -d "$BUILD_PATH/python-install/lib/python2.7/site-packages/numpy" ]; then
return
fi

cd $BUILD_numpy

push_arm

try $BUILD_PATH/python-install/bin/python.host setup.py build_ext -v
try find build/lib.* -name "*.o" -exec $STRIP {} \;
try $BUILD_PATH/python-install/bin/python.host setup.py install -O2

pop_arm
}

function postbuild_numpy() {
true
}