GEMV: move ifndef T out of NUMA block; set membind only once

2 files changed, 10 insertions, 8 deletions

diff --git a/GEMV/baselines/cpu/gemv_openmp.c b/GEMV/baselines/cpu/gemv_openmp.c
index ed7b794..798f7de 100644
--- a/GEMV/baselines/cpu/gemv_openmp.c
+++ b/GEMV/baselines/cpu/gemv_openmp.c
@@ -2,14 +2,14 @@
 #include <stdio.h>
 #include "../../support/timer.h"
 
-#if NUMA
-#include <numaif.h>
-#include <numa.h>
-
 #ifndef T
 #define T double
 #endif
 
+#if NUMA
+#include <numaif.h>
+#include <numa.h>
+
 struct bitmask* bitmask_in;
 struct bitmask* bitmask_out;
 
@@ -70,6 +70,12 @@ int main(int argc, char *argv[])
 
     allocate_dense(rows, cols, &A);
 
+#if NUMA
+    if (bitmask_in) {
+        numa_free_nodemask(bitmask_in);
+    }
+#endif
+
     make_hilbert_mat(rows,cols, &A);
 
 #if NUMA
diff --git a/GEMV/baselines/cpu/gemv_utils.h b/GEMV/baselines/cpu/gemv_utils.h
index 30e4701..de55f19 100644
--- a/GEMV/baselines/cpu/gemv_utils.h
+++ b/GEMV/baselines/cpu/gemv_utils.h
@@ -1,10 +1,6 @@
 void allocate_dense(size_t rows,size_t  cols, T*** dense) {
 
 #if NUMA
-    if (bitmask_in) {
-        numa_set_membind(bitmask_in);
-        numa_free_nodemask(bitmask_in);
-    }
   *dense = numa_alloc(sizeof(void*)*rows);
   **dense = numa_alloc(sizeof(T)*rows*cols);
 #else