getting rid of dependence on libnuma

BenLangmead · 55f9f1a85935b7a66edf09ec2646ca5252335fc0 · BenLangmead committed Mar 24, 2016 · Mar 24, 2016 · 55f9f1a
1 parent 3d513f6
commit 55f9f1a85935b7a66edf09ec2646ca5252335fc0
Unified Split

Showing with 0 additions and 23 deletions.

+0 −1 Makefile

+0 −1 cohort.hpp

+0 −18 cpu_numa_info.cpp

+0 −3 cpu_numa_info.h
diff --git a/Makefile b/Makefile
@@ -130,7 +130,6 @@ OTHER_CPPS = ccnt_lut.cpp ref_read.cpp alphabet.cpp shmem.cpp \
              edit.cpp ebwt.cpp
 
 ifeq (1,$(WITH_COHORTLOCK))
-	LIBS += -lnuma
 	override EXTRA_FLAGS += -DWITH_COHORTLOCK=1
 	OTHER_CPPS += cohort.cpp cpu_numa_info.cpp
 endif
diff --git a/cohort.hpp b/cohort.hpp
@@ -3,7 +3,6 @@
 #ifndef COHORT_H_
 #define COHORT_H_
 
-#include <numa.h>
 #include <iostream>
 #include <cstdio>
 #include <assert.h>
diff --git a/cpu_numa_info.cpp b/cpu_numa_info.cpp
@@ -1,23 +1,5 @@
 #include "cpu_numa_info.h"
 
-//adapted from http://stackoverflow.com/questions/7259363/measuring-numa-non-uniform-memory-access-no-observable-asymmetry-why
-int bind_to_node(int thread_idx)
-{
-	//int numcpus = numa_num_task_cpus()
-	//bitmask* bm = numa_bitmask_alloc(numcpus);
-	int num_nodes = numa_max_possible_node();
-	int numa_node = thread_idx % num_nodes;
-	bitmask* nm = numa_allocate_nodemask();
-	numa_bitmask_setbit(nm,numa_node);
-	//void numa_bind(struct bitmask *nodemask); sets node AND memory
-	//this one only sets node (not memeory)
-	//numa_run_on_node_mask(struct bitmask *nodemask);	
-	numa_run_on_node_mask(nm);
-	numa_free_nodemask(nm);
-	return numa_node;
-	//numa_bitmask_free(bm);	
-}
-
 /// Based on http://stackoverflow.com/questions/16862620/numa-get-current-node-core
 void get_cpu_and_node_(int& cpu, int& node) {
 	unsigned long a,d,c;
diff --git a/cpu_numa_info.h b/cpu_numa_info.h
@@ -1,9 +1,6 @@
 #ifndef CPU_AND_NODE_H_
 #define CPU_AND_NODE_H_
 
-#include <numa.h>
-
 extern void get_cpu_and_node_(int& cpu, int& node);
-extern int bind_to_node(int thread_idx);
 
 #endif