floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix errors in cpu enumeration with glibc 2.6 

for #2114
This commit is contained in:
Martin Kroeker 2019-05-07 13:34:52 +02:00 committed by GitHub
parent 91943b7325
commit a6a8cc2b7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
driver/others/init.c
View File

@ -765,7 +765,7 @@ int gotoblas_set_affinity(int pos) {
int mynode = 1; int mynode = 1;
/* if number of threads is larger than inital condition */ /* if number of threads is larger than initial condition */
if (pos < 0) { if (pos < 0) {
sched_setaffinity(0, sizeof(cpu_orig_mask), &cpu_orig_mask[0]); sched_setaffinity(0, sizeof(cpu_orig_mask), &cpu_orig_mask[0]);
return 0; return 0;
@ -857,7 +857,14 @@ void gotoblas_affinity_init(void) {
common -> shmid = pshmid; common -> shmid = pshmid;
if (common -> magic != SH_MAGIC) { if (common -> magic != SH_MAGIC) {
#if defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 7)
cpu_set_t *cpusetp; cpu_set_t *cpusetp;
#else
cpu_set_t cpuset;
#endif
#endif
int nums; int nums;
int ret; int ret;
@ -890,7 +897,7 @@ void gotoblas_affinity_init(void) {
} }
CPU_FREE(cpusetp); CPU_FREE(cpusetp);
#else #else
ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp); ret = sched_getaffinity(0,sizeof(cpu_set_t), &cpuset);
if (ret!=0) { if (ret!=0) {
common->num_procs = nums; common->num_procs = nums;
} else { } else {
@ -898,11 +905,11 @@ void gotoblas_affinity_init(void) {
int i; int i;
int n = 0; int n = 0;
for (i=0;i<nums;i++) for (i=0;i<nums;i++)
if (CPU_ISSET(i,cpusetp)) n++; if (CPU_ISSET(i,&cpuset)) n++;
common->num_procs = n; common->num_procs = n;
} }
#else #else
common->num_procs = CPU_COUNT(sizeof(cpu_set_t),cpusetp); common->num_procs = CPU_COUNT(&cpuset);
} }
#endif #endif