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

Merge pull request #3680 from martin-frbg/issue3636-2 

Guard against sysconf(__SC_NPROCESSORS_CONF) returning zero at runtime
This commit is contained in:
Martin Kroeker 2022-07-07 11:38:24 +02:00 committed by GitHub
parent 4cfd6f110a 69148ae795
commit 7918ba11c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
driver/others/init.c
View File

@ -877,21 +877,21 @@ void gotoblas_affinity_init(void) {
nums = sysconf(_SC_NPROCESSORS_CONF); nums = sysconf(_SC_NPROCESSORS_CONF);
#if !defined(__GLIBC_PREREQ) #if !defined(__GLIBC_PREREQ)
common->num_procs = nums; common->num_procs = nums >0 ? nums : 2;
#else #else
#if !__GLIBC_PREREQ(2, 3) #if !__GLIBC_PREREQ(2, 3)
common->num_procs = nums; common->num_procs = nums >0 ? nums : 2;
#elif __GLIBC_PREREQ(2, 7) #elif __GLIBC_PREREQ(2, 7)
cpusetp = CPU_ALLOC(nums); cpusetp = CPU_ALLOC(nums>0? nums:1024);
if (cpusetp == NULL) { if (cpusetp == NULL) {
common->num_procs = nums; common->num_procs = nums>0 ? nums: 2;
} else { } else {
size_t size; size_t size;
size = CPU_ALLOC_SIZE(nums); size = CPU_ALLOC_SIZE(nums>0? nums: 1024);
ret = sched_getaffinity(0,size,cpusetp); ret = sched_getaffinity(0,size,cpusetp);
if (ret!=0) if (ret!=0)
common->num_procs = nums; common->num_procs = nums >0 ? nums : 1;
else else
common->num_procs = CPU_COUNT_S(size,cpusetp); common->num_procs = CPU_COUNT_S(size,cpusetp);
} }
@ -899,12 +899,12 @@ void gotoblas_affinity_init(void) {
#else #else
ret = sched_getaffinity(0,sizeof(cpu_set_t), &cpuset); ret = sched_getaffinity(0,sizeof(cpu_set_t), &cpuset);
if (ret!=0) { if (ret!=0) {
common->num_procs = nums; common->num_procs = nums >0 ? nums : 2;
} else { } else {
#if !__GLIBC_PREREQ(2, 6) #if !__GLIBC_PREREQ(2, 6)
int i; int i;
int n = 0; int n = 0;
for (i=0;i<nums;i++) for (i=0;i<(nums >0 ?nums:1024) ;i++)
if (CPU_ISSET(i,&cpuset)) n++; if (CPU_ISSET(i,&cpuset)) n++;
common->num_procs = n; common->num_procs = n;
} }
@ -1022,7 +1022,7 @@ void gotoblas_set_affinity2(int threads) {};
void gotoblas_affinity_reschedule(void) {}; void gotoblas_affinity_reschedule(void) {};
int get_num_procs(void) { return sysconf(_SC_NPROCESSORS_CONF); } int get_num_procs(void) { int num = sysconf(_SC_NPROCESSORS_CONF); return (nums >0 ? nums : 2); }
int get_num_nodes(void) { return 1; } int get_num_nodes(void) { return 1; }

46
driver/others/memory.c
View File

@ -252,23 +252,23 @@ int get_num_procs(void) {
ret = omp_get_num_places(); ret = omp_get_num_places();
if (ret >0 ) nums = ret; if (ret >0 ) nums = ret;
#endif #endif
return nums; return (nums > 0 ? nums : 2);
#endif #endif
#if !defined(OS_LINUX) #if !defined(OS_LINUX)
return nums; return (nums > 0 ? nums : 2);
#endif #endif
#if !defined(__GLIBC_PREREQ) #if !defined(__GLIBC_PREREQ)
return nums; return (nums > 0 ? nums :2);
#else #else
#if !__GLIBC_PREREQ(2, 3) #if !__GLIBC_PREREQ(2, 3)
return nums; return (nums > 0 ? nums :2);
#endif #endif
#if !__GLIBC_PREREQ(2, 7) #if !__GLIBC_PREREQ(2, 7)
ret = sched_getaffinity(0,sizeof(cpuset), &cpuset); ret = sched_getaffinity(0,sizeof(cpuset), &cpuset);
if (ret!=0) return nums; if (ret!=0) return (nums > 0 ? nums :2);
n=0; n=0;
#if !__GLIBC_PREREQ(2, 6) #if !__GLIBC_PREREQ(2, 6)
for (i=0;i<nums;i++) for (i=0;i<nums;i++)
@ -277,31 +277,31 @@ int get_num_procs(void) {
#else #else
nums = CPU_COUNT(sizeof(cpuset),&cpuset); nums = CPU_COUNT(sizeof(cpuset),&cpuset);
#endif #endif
return nums; return (nums > 0 ? nums :2);
#else #else
if (nums >= CPU_SETSIZE) { if (nums >= CPU_SETSIZE) {
cpusetp = CPU_ALLOC(nums); cpusetp = CPU_ALLOC(nums);
if (cpusetp == NULL) { if (cpusetp == NULL) {
return nums; return (nums > 0 ? nums :2);
} }
size = CPU_ALLOC_SIZE(nums); size = CPU_ALLOC_SIZE(nums);
ret = sched_getaffinity(0,size,cpusetp); ret = sched_getaffinity(0,size,cpusetp);
if (ret!=0) { if (ret!=0) {
CPU_FREE(cpusetp); CPU_FREE(cpusetp);
return nums; return (nums > 0 ? nums :2);
} }
ret = CPU_COUNT_S(size,cpusetp); ret = CPU_COUNT_S(size,cpusetp);
if (ret > 0 && ret < nums) nums = ret; if (ret > 0 && ret < nums) nums = ret;
CPU_FREE(cpusetp); CPU_FREE(cpusetp);
return nums; return (nums > 0 ? nums :2);
} else { } else {
ret = sched_getaffinity(0,sizeof(cpuset),&cpuset); ret = sched_getaffinity(0,sizeof(cpuset),&cpuset);
if (ret!=0) { if (ret!=0) {
return nums; return (nums > 0 ? nums :2);
} }
ret = CPU_COUNT(&cpuset); ret = CPU_COUNT(&cpuset);
if (ret > 0 && ret < nums) nums = ret; if (ret > 0 && ret < nums) nums = ret;
return nums; return (nums > 0 ? nums :2);
} }
#endif #endif
#endif #endif
@ -1823,56 +1823,56 @@ int get_num_procs(void) {
ret = omp_get_num_places(); ret = omp_get_num_places();
if (ret >0 ) nums = ret; if (ret >0 ) nums = ret;
#endif #endif
return nums; return (nums > 0 ? nums :2);
#endif #endif
#if !defined(OS_LINUX) #if !defined(OS_LINUX)
return nums; return (nums > 0 ? nums :2);
#endif #endif
#if !defined(__GLIBC_PREREQ) #if !defined(__GLIBC_PREREQ)
return nums; return (nums > 0 ? nums :2);
#else #else
#if !__GLIBC_PREREQ(2, 3) #if !__GLIBC_PREREQ(2, 3)
return nums; return (nums > 0 ? nums :2);
#endif #endif
#if !__GLIBC_PREREQ(2, 7) #if !__GLIBC_PREREQ(2, 7)
ret = sched_getaffinity(0,sizeof(cpuset), &cpuset); ret = sched_getaffinity(0,sizeof(cpuset), &cpuset);
if (ret!=0) return nums; if (ret!=0) return (nums > 0 ? nums :2);
n=0; n=0;
#if !__GLIBC_PREREQ(2, 6) #if !__GLIBC_PREREQ(2, 6)
for (i=0;i<nums;i++) for (i=0;i<(nums > 0 ? nums :2);i++)
if (CPU_ISSET(i,&cpuset)) n++; if (CPU_ISSET(i,&cpuset)) n++;
nums=n; nums=n;
#else #else
nums = CPU_COUNT(sizeof(cpuset),&cpuset); nums = CPU_COUNT(sizeof(cpuset),&cpuset);
#endif #endif
return nums; return (nums > 0 ? nums :2);
#else #else
if (nums >= CPU_SETSIZE) { if (nums >= CPU_SETSIZE) {
cpusetp = CPU_ALLOC(nums); cpusetp = CPU_ALLOC(nums);
if (cpusetp == NULL) { if (cpusetp == NULL) {
return nums; return (nums > 0 ? nums :2);
} }
size = CPU_ALLOC_SIZE(nums); size = CPU_ALLOC_SIZE(nums);
ret = sched_getaffinity(0,size,cpusetp); ret = sched_getaffinity(0,size,cpusetp);
if (ret!=0) { if (ret!=0) {
CPU_FREE(cpusetp); CPU_FREE(cpusetp);
return nums; return (nums > 0 ? nums :2);
} }
ret = CPU_COUNT_S(size,cpusetp); ret = CPU_COUNT_S(size,cpusetp);
if (ret > 0 && ret < nums) nums = ret; if (ret > 0 && ret < nums) nums = ret;
CPU_FREE(cpusetp); CPU_FREE(cpusetp);
return nums; return (nums > 0 ? nums :2);
} else { } else {
ret = sched_getaffinity(0,sizeof(cpuset),&cpuset); ret = sched_getaffinity(0,sizeof(cpuset),&cpuset);
if (ret!=0) { if (ret!=0) {
return nums; return (nums > 0 ? nums :2);
} }
ret = CPU_COUNT(&cpuset); ret = CPU_COUNT(&cpuset);
if (ret > 0 && ret < nums) nums = ret; if (ret > 0 && ret < nums) nums = ret;
return nums; return (nums > 0 ? nums :2);
} }
#endif #endif
#endif #endif