From: Isaac Dunham Date: Sun, 3 Aug 2014 22:06:30 +0000 (-0700) Subject: Fix link error on Linux/musl. X-Git-Tag: v0.2.11^2~4^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7eb81a84676bce20fcf1df3462639d0bc1b28f0;p=platform%2Fupstream%2Fopenblas.git Fix link error on Linux/musl. get_nprocs() is a GNU convenience function equivalent to POSIX2008 sysconf(_SC_NPROCESSORS_ONLN); the latter should be available in unistd.h on any current *nix. (OS X supports this call since 10.5, and FreeBSD currently supports it. But this commit does not change FreeBSD or OS X versions.) --- diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 58748ea..18a218c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -114,5 +114,8 @@ In chronological order: * carlkl * [2013-12-13] Fixed LAPACKE building bug on Windows +* Isaac Dunham + * [2014-08-03] Fixed link error on Linux/musl + * [Your name or handle] <[email or website]> * [Date] [Brief summary of your changes] diff --git a/driver/others/init.c b/driver/others/init.c index 9135385..50a1a23 100644 --- a/driver/others/init.c +++ b/driver/others/init.c @@ -865,7 +865,7 @@ void gotoblas_set_affinity2(int threads) {}; void gotoblas_affinity_reschedule(void) {}; -int get_num_procs(void) { return get_nprocs(); } +int get_num_procs(void) { return sysconf(_SC_NPROCESSORS_ONLN); } int get_num_nodes(void) { return 1; } diff --git a/driver/others/memory.c b/driver/others/memory.c index f44b37b..9fdb18f 100644 --- a/driver/others/memory.c +++ b/driver/others/memory.c @@ -162,7 +162,7 @@ int get_num_procs(void); #else int get_num_procs(void) { static int nums = 0; - if (!nums) nums = get_nprocs(); + if (!nums) nums = sysconf(_SC_NPROCESSORS_ONLN); return nums; } #endif