changes

syhlalala · Jan 11, 2018 · 03b6d86 · 03b6d86
1 parent 8199ae1
commit 03b6d86
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/index/run_index.sh b/index/run_index.sh
@@ -7,12 +7,20 @@ NC='\033[0m' # No Color
 
 export THREADS=`nproc --all`
 
+head="numactl -i all"
+if (hash numactl ls 2>/dev/null) 
+then 
+    head="numactl -i all" 
+else 
+    head="" 
+fi
+
 printf "${GREEN}test inverted indices${NC}"
 echo "(Results in Table 5, with smaller inputs)"
 make
 printf "${BLUE}parallel run${NC}\n"
 export CILK_NWORKERS=$THREADS
-numactl -i all ./index -f "wiki_small.txt" -q 100000 | tee res.txt
+$head ./index -f "wiki_small.txt" -q 100000 | tee res.txt
 echo
 printf "${BLUE}sequential run${NC}\n"
 export CILK_NWORKERS=1

diff --git a/interval/run_interval.sh b/interval/run_interval.sh
@@ -7,13 +7,21 @@ NC='\033[0m' # No Color
 
 export THREADS=`nproc --all`
 
+head="numactl -i all"
+if (hash numactl ls 2>/dev/null) 
+then 
+    head="numactl -i all" 
+else 
+    head="" 
+fi
+
 printf "${GREEN}test interval tree${NC}\n"
 printf "(Results in Table 4, first two rows)\n"
 make
 
 printf "${BLUE}parallel run${NC}\n"
 export CILK_NWORKERS=$THREADS
-numactl -i all ./interval_tree 100000000 100000000 7 |tee res.txt
+$head ./interval_tree 100000000 100000000 7 |tee res.txt
 
 echo
 printf "${BLUE}sequential run${NC}\n"

diff --git a/range_query/run_range.sh b/range_query/run_range.sh
@@ -7,14 +7,22 @@ NC='\033[0m' # No Color
 
 export THREADS=`nproc --all`
 
+head="numactl -i all"
+if (hash numactl ls 2>/dev/null) 
+then 
+    head="numactl -i all" 
+else 
+    head="" 
+fi
+
 N=100000000
 printf "${GREEN}test range queries${NC}\n"
 echo "(Results in Table 4, row 3-5)"
 make
 printf "${RED}Query-sum:${NC}\n"
 printf "${BLUE}Parallel run${NC}\n"
 export CILK_NWORKERS=$THREADS
-numactl -i all ./rt_test -n "$N" -q 1000000 -w 1000000000 -t 1 |tee res.txt
+$head ./rt_test -n "$N" -q 1000000 -w 1000000000 -t 1 |tee res.txt
 echo
 printf "${BLUE}Sequential run${NC}\n"
 export CILK_NWORKERS=1
@@ -24,7 +32,7 @@ echo
 printf "${RED}Query-all:${NC}\n"
 printf "${BLUE}Parallel run${NC}\n"
 export CILK_NWORKERS=$THREADS
-numactl -i all ./rt_test -n "$N" -q 1000 -w 200000000 -t 0  |tee -a res.txt
+$head ./rt_test -n "$N" -q 1000 -w 200000000 -t 0  |tee -a res.txt
 echo
 printf "${BLUE}Sequential run${NC}\n"
 export CILK_NWORKERS=1