openblas: update to 0.3.6.

This commit is contained in:
Johannes 2019-05-01 22:18:16 +02:00 committed by Johannes
parent 1b650b999b
commit 5e73fdad2a
3 changed files with 2 additions and 112 deletions

View file

@ -1,60 +0,0 @@
--- driver/others/init.c.orig
+++ driver/others/init.c
@@ -857,56 +857,13 @@
common -> shmid = pshmid;
if (common -> magic != SH_MAGIC) {
- cpu_set_t *cpusetp;
- int nums;
- int ret;
-
#ifdef DEBUG
fprintf(stderr, "Shared Memory Initialization.\n");
#endif
//returns the number of processors which are currently online
- nums = sysconf(_SC_NPROCESSORS_CONF);
-
-#if !defined(__GLIBC_PREREQ)
- common->num_procs = nums;
-#else
-
-#if !__GLIBC_PREREQ(2, 3)
- common->num_procs = nums;
-#elif __GLIBC_PREREQ(2, 7)
- cpusetp = CPU_ALLOC(nums);
- if (cpusetp == NULL) {
- common->num_procs = nums;
- } else {
- size_t size;
- size = CPU_ALLOC_SIZE(nums);
- ret = sched_getaffinity(0,size,cpusetp);
- if (ret!=0)
- common->num_procs = nums;
- else
- common->num_procs = CPU_COUNT_S(size,cpusetp);
- }
- CPU_FREE(cpusetp);
-#else
- ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp);
- if (ret!=0) {
- common->num_procs = nums;
- } else {
-#if !__GLIBC_PREREQ(2, 6)
- int i;
- int n = 0;
- for (i=0;i<nums;i++)
- if (CPU_ISSET(i,cpusetp)) n++;
- common->num_procs = n;
- }
-#else
- common->num_procs = CPU_COUNT(sizeof(cpu_set_t),cpusetp);
- }
-#endif
-
-#endif
+ common -> num_procs = sysconf(_SC_NPROCESSORS_CONF);
#endif
if(common -> num_procs > MAX_CPUS) {
fprintf(stderr, "\nOpenBLAS Warning : The number of CPU/Cores(%d) is beyond the limit(%d). Terminated.\n", common->num_procs, MAX_CPUS);

View file

@ -1,50 +0,0 @@
--- driver/others/memory.c.orig
+++ driver/others/memory.c
@@ -185,47 +185,8 @@
#else
int get_num_procs(void) {
static int nums = 0;
-cpu_set_t *cpusetp;
-size_t size;
-int ret;
-int i,n;
-
if (!nums) nums = sysconf(_SC_NPROCESSORS_CONF);
-#if !defined(OS_LINUX)
return nums;
-#endif
-
-#if !defined(__GLIBC_PREREQ)
- return nums;
-#else
- #if !__GLIBC_PREREQ(2, 3)
- return nums;
- #endif
-
- #if !__GLIBC_PREREQ(2, 7)
- ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp);
- if (ret!=0) return nums;
- n=0;
- #if !__GLIBC_PREREQ(2, 6)
- for (i=0;i<nums;i++)
- if (CPU_ISSET(i,cpusetp)) n++;
- nums=n;
- #else
- nums = CPU_COUNT(sizeof(cpu_set_t),cpusetp);
- #endif
- return nums;
- #else
- cpusetp = CPU_ALLOC(nums);
- if (cpusetp == NULL) return nums;
- size = CPU_ALLOC_SIZE(nums);
- ret = sched_getaffinity(0,size,cpusetp);
- if (ret!=0) return nums;
- ret = CPU_COUNT_S(size,cpusetp);
- if (ret > 0 && ret < nums) nums = ret;
- CPU_FREE(cpusetp);
- return nums;
- #endif
-#endif
}
#endif
#endif

View file

@ -1,6 +1,6 @@
# Template file for 'openblas'
pkgname=openblas
version=0.3.5
version=0.3.6
revision=1
wrksrc="OpenBLAS-${version}"
build_style=gnu-makefile
@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://www.openblas.net/"
changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt"
distfiles="https://github.com/xianyi/${pkgname}/archive/v${version}.tar.gz"
checksum=0950c14bd77c90a6427e26210d6dab422271bc86f9fc69126725833ecdaa0e85
checksum=e64c8fe083832ffbc1459ab6c72f71d53afd3b36e8497c922a15a06b72e9002f
case "${XBPS_TARGET_MACHINE}" in
armv5*) make_build_args+=" TARGET=ARMV5" ;;