Skip to content

Commit 9daba62

Browse files
committed
build benchmark files in gitignored directory
1 parent 261a3a6 commit 9daba62

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

.gitignore

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
svm.o
2-
js-interfaces.o
31
node_modules
42
dist
5-
demo-dist
3+
demo-dist
4+
benchmark/**/bin

benchmark/bin.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,16 @@ async function run(mode, time, benchmark) {
6161
else if(mode === 'native') {
6262
let str = '';
6363
const prom = new Promise((resolve, reject) => {
64-
const dir = benchmark.split('/')[0];
65-
const cmd = `${__dirname}/${benchmark}`;
64+
const [dir, exec] = benchmark.split('/');
65+
const cmd = `${__dirname}/${dir}/bin/${exec}`;
6666
const args = [`${__dirname}/${dir}/data.txt`, time];
67+
console.log(cmd);
6768
const child = spawn(cmd, args);
6869
child.on('close', function() {
6970
resolve();
7071
});
7172
child.on('error', function() {
72-
reject(new Error(`Could not execute ${cmd} ${arg}`));
73+
reject(new Error(`Could not execute ${cmd} ${args}`));
7374
});
7475
child.stdout.on('data', data => str += data);
7576
child.stdout.pipe(process.stdout);

benchmark/iris/Makefile

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
CXX ?= g++
22
CFLAGS = -Wall -Wconversion -O3 -fPIC
33

4-
all: cross-validation grid-search
4+
all: mkdir bin/cross-validation bin/grid-search
55

6-
svm.o: ../../libsvm/svm.cpp ../../libsvm/svm.h
7-
$(CXX) $(CFLAGS) -c ../../libsvm/svm.cpp
6+
mkdir:
7+
mkdir -p bin
88

9+
bin/svm.o: ../../libsvm/svm.cpp ../../libsvm/svm.h
10+
$(CXX) $(CFLAGS) -c ../../libsvm/svm.cpp -o bin/svm.o
911

10-
util.o: util.h util.cpp
11-
$(CXX) $(CFLAGS) -c util.cpp -o util.o
1212

13-
js-interfaces.o: ../../js-interfaces.c
14-
$(CXX) $(CFLAGS) -c ../../js-interfaces.c -o js-interfaces.o
13+
bin/util.o: util.h util.cpp
14+
$(CXX) $(CFLAGS) -c util.cpp -o bin/util.o
1515

16-
grid-search: js-interfaces.o grid-search.cpp util.o svm.o
17-
$(CXX) $(CFLAGS) grid-search.cpp util.o svm.o js-interfaces.o -o grid-search -lm
16+
bin/js-interfaces.o: ../../js-interfaces.c
17+
$(CXX) $(CFLAGS) -c ../../js-interfaces.c -o bin/js-interfaces.o
18+
19+
bin/grid-search: bin/js-interfaces.o grid-search.cpp bin/util.o bin/svm.o
20+
$(CXX) $(CFLAGS) grid-search.cpp bin/util.o bin/svm.o bin/js-interfaces.o -o bin/grid-search -lm
1821

19-
cross-validation: js-interfaces.o cross-validation.cpp util.o svm.o
20-
$(CXX) $(CFLAGS) cross-validation.cpp util.o svm.o js-interfaces.o -o cross-validation -lm
22+
bin/cross-validation: bin/js-interfaces.o cross-validation.cpp bin/util.o bin/svm.o
23+
$(CXX) $(CFLAGS) cross-validation.cpp bin/util.o bin/svm.o bin/js-interfaces.o -o bin/cross-validation -lm
2124

2225
clean:
23-
rm *.o grid-search cross-validation
26+
rm -r bin/*

0 commit comments

Comments
 (0)