summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Bauer <mail@ulrich-bauer.org>2017-03-20 16:07:33 +0100
committerUlrich Bauer <mail@ulrich-bauer.org>2017-03-20 16:23:40 +0100
commit92536895274a4632eaff452c56227caa2e3e0e66 (patch)
treeac67dd88679a828dc80b77b11a3dc52e7c6baa0a
parenta5ada276181dadded36a8cb19d83466d1f098278 (diff)
benchmark using sparsehash
-rw-r--r--Makefile10
-rw-r--r--benchmarks/sphere_3_192/ripser.dim_1.out.txt10
-rw-r--r--benchmarks/sphere_3_192/ripser.dim_2.out.txt8
3 files changed, 14 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 893d776..90543db 100644
--- a/Makefile
+++ b/Makefile
@@ -5,19 +5,19 @@ all: ripser ripser-coeff ripser-reduction ripser-coeff-reduction ripser-debug
ripser: ripser.cpp
- c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG
+ c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D USE_GOOGLE_HASHMAP
ripser-coeff: ripser.cpp
- c++ -std=c++11 ripser.cpp -o ripser-coeff -Ofast -D NDEBUG -D USE_COEFFICIENTS
+ c++ -std=c++11 ripser.cpp -o ripser-coeff -Ofast -D NDEBUG -D USE_GOOGLE_HASHMAP -D USE_COEFFICIENTS
ripser-reduction: ripser.cpp
- c++ -std=c++11 ripser.cpp -o ripser-reduction -Ofast -D NDEBUG -D ASSEMBLE_REDUCTION_MATRIX
+ c++ -std=c++11 ripser.cpp -o ripser-reduction -Ofast -D NDEBUG -D USE_GOOGLE_HASHMAP -D ASSEMBLE_REDUCTION_MATRIX
ripser-coeff-reduction: ripser.cpp
- c++ -std=c++11 ripser.cpp -o ripser-coeff-reduction -Ofast -D NDEBUG -D USE_COEFFICIENTS -D ASSEMBLE_REDUCTION_MATRIX
+ c++ -std=c++11 ripser.cpp -o ripser-coeff-reduction -Ofast -D NDEBUG -D USE_GOOGLE_HASHMAP -D USE_COEFFICIENTS -D ASSEMBLE_REDUCTION_MATRIX
ripser-debug: ripser.cpp
- c++ -std=c++11 ripser.cpp -o ripser-debug -g
+ c++ -std=c++11 ripser.cpp -o ripser-debug -g -D USE_GOOGLE_HASHMAP
clean:
diff --git a/benchmarks/sphere_3_192/ripser.dim_1.out.txt b/benchmarks/sphere_3_192/ripser.dim_1.out.txt
index f7f631f..4ef9cb2 100644
--- a/benchmarks/sphere_3_192/ripser.dim_1.out.txt
+++ b/benchmarks/sphere_3_192/ripser.dim_1.out.txt
@@ -247,12 +247,12 @@ persistence intervals in dim 1:
[0.24546,0.248903)
[0.240869,0.288747)
[0.189652,0.197515)
- 0.03 real 0.02 user 0.00 sys
- 3379200 maximum resident set size
+ 0.02 real 0.02 user 0.00 sys
+ 2682880 maximum resident set size
0 average shared memory size
0 average unshared data size
0 average unshared stack size
- 844 page reclaims
+ 674 page reclaims
0 page faults
0 swaps
0 block input operations
@@ -260,5 +260,5 @@ persistence intervals in dim 1:
0 messages sent
0 messages received
0 signals received
- 4 voluntary context switches
- 21 involuntary context switches
+ 5 voluntary context switches
+ 4 involuntary context switches
diff --git a/benchmarks/sphere_3_192/ripser.dim_2.out.txt b/benchmarks/sphere_3_192/ripser.dim_2.out.txt
index b3283e7..7ba2de6 100644
--- a/benchmarks/sphere_3_192/ripser.dim_2.out.txt
+++ b/benchmarks/sphere_3_192/ripser.dim_2.out.txt
@@ -249,12 +249,12 @@ persistence intervals in dim 1:
[0.189652,0.197515)
persistence intervals in dim 2:
[0.720484,1.65562)
- 1.17 real 1.08 user 0.08 sys
- 182210560 maximum resident set size
+ 1.17 real 1.10 user 0.06 sys
+ 151293952 maximum resident set size
0 average shared memory size
0 average unshared data size
0 average unshared stack size
- 44505 page reclaims
+ 36957 page reclaims
0 page faults
0 swaps
0 block input operations
@@ -263,4 +263,4 @@ persistence intervals in dim 2:
0 messages received
0 signals received
2 voluntary context switches
- 69 involuntary context switches
+ 49 involuntary context switches