summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kroeker <martin@ruby.chemie.uni-freiburg.de>2017-07-15 11:53:28 +0200
committerGitHub <noreply@github.com>2017-07-15 11:53:28 +0200
commitd12b75a6c480020c8b3375d98559f5e3e6b53c3d (patch)
treec1b71aaa6d0448962ca7584925a38b294fc027d1
parent7294fb1d9db59bc8e7b58bd4dd758003092f0886 (diff)
downloadopenblas-d12b75a6c480020c8b3375d98559f5e3e6b53c3d.tar.gz
openblas-d12b75a6c480020c8b3375d98559f5e3e6b53c3d.tar.bz2
openblas-d12b75a6c480020c8b3375d98559f5e3e6b53c3d.zip
Fixup braces lost in previous edit
-rw-r--r--driver/others/init.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/driver/others/init.c b/driver/others/init.c
index 1f07a24ac..221404ee1 100644
--- a/driver/others/init.c
+++ b/driver/others/init.c
@@ -778,11 +778,8 @@ static int initialized = 0;
void gotoblas_affinity_init(void) {
int cpu, num_avail;
-#ifndef USE_OPENMP
cpu_set_t cpu_mask;
-#endif
- int i;
-
+
if (initialized) return;
initialized = 1;
@@ -825,16 +822,18 @@ void gotoblas_affinity_init(void) {
common -> shmid = pshmid;
- if (common -> magic != SH_MAGIC)
+ if (common -> magic != SH_MAGIC) {
cpu_set_t *cpusetp;
int nums;
int ret;
+ int i;
#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) || !__GLIBC_PREREQ(2, 3)
@@ -855,7 +854,7 @@ void gotoblas_affinity_init(void) {
CPU_FREE(cpusetp);
#else
ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp);
- if (ret!=0) {
+ if (ret!=0) {
common->num_procs = nums;
} else {
#if !__GLIBC_PREREQ(2, 6)
@@ -863,7 +862,8 @@ void gotoblas_affinity_init(void) {
int n = 0;
for (i=0;i<nums;i++)
if (CPU_ISSET(i,cpusetp)) n++;
- common->num_procs = n;
+ common->num_procs = n;
+ }
#else
common->num_procs = CPU_COUNT(sizeof(cpu_set_t),cpusetp);
#endif
@@ -884,7 +884,7 @@ void gotoblas_affinity_init(void) {
if (common -> num_nodes > 1) numa_mapping();
common -> final_num_procs = 0;
- for(i = 0; i < common -> avail_count; i++) common -> final_num_procs += rcount(common -> avail[i]) + 1; //Make the max cpu number.
+ for(i = 0; i < common -> avail_count; i++) common -> final_num_procs += rcount(common -> avail[i]) + 1; //Make the max cpu number.
for (cpu = 0; cpu < common -> final_num_procs; cpu ++) common -> cpu_use[cpu] = 0;