diff options
19 files changed, 163 insertions, 164 deletions
diff --git a/benchmarks/Dockerfile b/benchmarks/Dockerfile index c67db52..e349648 100644 --- a/benchmarks/Dockerfile +++ b/benchmarks/Dockerfile @@ -39,11 +39,18 @@ RUN julia --eval 'using Pkg; Pkg.add("Plotly"); Pkg.add("Eirene"); using Eirene WORKDIR /benchmark -RUN curl -LO https://raw.githubusercontent.com/Ripser/ripser/dev/benchmarks/sphere_3_192/sphere_3_192_points.dat \ -&& curl -LO https://raw.githubusercontent.com/Ripser/ripser/dev/benchmarks/sphere_3_192/sphere_3_192.distance_matrix \ -&& curl -LO https://raw.githubusercontent.com/Ripser/ripser/dev/benchmarks/sphere_3_192/sphere_3_192.complex \ -\ -&& curl -LO https://github.com/n-otter/PH-roadmap/raw/master/data_sets/roadmap_datasets_distmat/fractal_9_5_2_random_edge_list.txt_0.19795_distmat.txt \ +COPY sphere_3_192_points.dat . +COPY sphere_3_192.complex . +COPY o3_1024.txt . +COPY o3_1024_1.8.dipha . +COPY o3_4096.txt . +# COPY o3_4096_1.4.dipha . +COPY clifford_torus_50000.points.txt . +# COPY dragon_2000.dipha . + + + +RUN curl -LO https://github.com/n-otter/PH-roadmap/raw/master/data_sets/roadmap_datasets_distmat/fractal_9_5_2_random_edge_list.txt_0.19795_distmat.txt \ && curl -LO https://github.com/n-otter/PH-roadmap/raw/master/data_sets/roadmap_datasets_distmat/dipha/fractal_9_5_2_random.bin \ \ && curl -LO https://github.com/n-otter/PH-roadmap/raw/master/data_sets/roadmap_datasets_point_cloud/dragon_vrip.ply.txt_2000_.txt \ @@ -53,12 +60,9 @@ RUN curl -LO https://raw.githubusercontent.com/Ripser/ripser/dev/benchmarks/sphe && curl -LO https://github.com/n-otter/PH-roadmap/raw/master/data_sets/roadmap_datasets_point_cloud/random_point_cloud_50_16_.txt \ && curl -LO https://github.com/n-otter/PH-roadmap/raw/master/data_sets/roadmap_datasets_distmat/dipha/random_50_16.bin -COPY o3_1024.txt . -COPY o3_4096.txt . -COPY clifford_torus_50000.points.txt . - RUN (echo "OFF\n2000 0 0" && cat dragon_vrip.ply.txt_2000_.txt) >dragon_vrip.ply.txt_2000_.off \ && (echo "OFF\n50 0 0" && cat random_point_cloud_50_16_.txt) >random_point_cloud_50_16_.off \ +&& (echo "OFF\n1024 0 0" && cat sphere_3_192_points.dat) > sphere_3_192.off \ && (echo "OFF\n1024 0 0" && cat o3_1024.txt) >o3_1024.off \ && (echo "OFF\n4096 0 0" && cat o3_4096.txt) >o3_4096.off \ && (echo "nOFF\n4 50000 0 0" && cat clifford_torus_50000.points.txt) >clifford_torus_50000.points.off @@ -69,12 +73,13 @@ FROM benchmark-setup as benchmark-ripser WORKDIR /ripser RUN git clone https://github.com/Ripser/ripser.git \ && cd ripser \ +&& git checkout dev \ && make ENV PATH="${PATH}:/ripser/ripser" WORKDIR /benchmark -RUN time -v -o sphere_3_192.ripser.txt ripser sphere_3_192.distance_matrix --dim 2 +RUN time -v -o sphere_3_192.ripser.txt ripser sphere_3_192_points.dat --format point-cloud --dim 2 RUN time -v -o o3_1024.ripser.txt ripser o3_1024.txt --format point-cloud --dim 3 --threshold 1.8 --ratio 2 RUN time -v -o o3_4096.ripser.txt ripser o3_4096.txt --format point-cloud --dim 3 --threshold 1.4 --ratio 2 RUN time -v -o clifford_torus_50000.ripser.txt ripser clifford_torus_50000.points.txt --format point-cloud --dim 2 --threshold .15 --ratio 2 @@ -92,7 +97,7 @@ RUN git pull && git checkout benchmarks/disable-emergent-pairs \ && make WORKDIR /benchmark -RUN time -v -o sphere_3_192.ripser-no-emergent.txt ripser sphere_3_192.distance_matrix --dim 2 +RUN time -v -o sphere_3_192.ripser-no-emergent.txt ripser sphere_3_192_points.dat --format point-cloud --dim 2 RUN time -v -o random.ripser-no-emergent.txt ripser random_point_cloud_50_16_.txt --format point-cloud --dim 7 RUN time -v -o fractal-r.ripser-no-emergent.txt ripser fractal_9_5_2_random_edge_list.txt_0.19795_distmat.txt --dim 2 RUN time -v -o dragon-2.ripser-no-emergent.txt ripser dragon_vrip.ply.txt_2000_.txt --format point-cloud --dim 1 @@ -109,7 +114,7 @@ RUN git pull && git checkout benchmarks/store-reduced-matrix \ && make WORKDIR /benchmark -RUN time -v -o sphere_3_192.ripser-store-reduced.txt ripser sphere_3_192.distance_matrix --dim 2 +RUN time -v -o sphere_3_192.ripser-store-reduced.txt ripser sphere_3_192_points.dat --format point-cloud --dim 2 RUN time -v -o random.ripser-store-reduced.txt ripser random_point_cloud_50_16_.txt --format point-cloud --dim 7 # RUN time -v -o fractal-r.ripser-store-reduced.txt ripser fractal_9_5_2_random_edge_list.txt_0.19795_distmat.txt --dim 2 # RUN time -v -o dragon-2.ripser-store-reduced.txt ripser dragon_vrip.ply.txt_2000_.txt --format point-cloud --dim 1 @@ -126,7 +131,7 @@ RUN git pull && git checkout benchmarks/use-reduced-matrix \ && make WORKDIR /benchmark -RUN time -v -o sphere_3_192.ripser-use-reduced.txt ripser sphere_3_192.distance_matrix --dim 2 +RUN time -v -o sphere_3_192.ripser-use-reduced.txt ripser sphere_3_192_points.dat --format point-cloud --dim 2 RUN time -v -o random.ripser-use-reduced.txt ripser random_point_cloud_50_16_.txt --format point-cloud --dim 7 # RUN time -v -o fractal-r.ripser-use-reduced.txt ripser fractal_9_5_2_random_edge_list.txt_0.19795_distmat.txt --dim 2 # RUN time -v -o dragon-2.ripser-use-reduced.txt ripser dragon_vrip.ply.txt_2000_.txt --format point-cloud --dim 1 @@ -154,7 +159,7 @@ FROM benchmark-setup as benchmark-gudhi # RUN time -v -o sphere_3_192.gudhi.txt rips_distance_matrix_persistence -d3 -p2 sphere_3_192.distance_matrix WORKDIR /benchmark -RUN time -v -o sphere_3_192.gudhi.txt gudhi-rips-distance-matrix-persistence -d3 -p2 sphere_3_192.distance_matrix >sphere_3_192.gudhi.out.txt +RUN time -v -o sphere_3_192.gudhi.txt gudhi-rips-persistence -d3 -p2 sphere_3_192.off >sphere_3_192.gudhi.out.txt # RUN time -v -o fractal-r.gudhi.txt gudhi-rips-distance-matrix-persistence -d3 -p2 fractal_9_5_2_random_edge_list.txt_0.19795_distmat.txt >fractal-r.gudhi.out.txt RUN time -v -o o3_1024.gudhi.txt gudhi-rips-persistence -d4 -p2 -r 1.8 o3_1024.off >o3_1024.gudhi.out.txt RUN time -v -o o3_4096.gudhi.txt gudhi-rips-persistence -d4 -p2 -r 1.4 o3_4096.off >o3_4096.gudhi.out.txt @@ -176,14 +181,8 @@ ENV PATH="${PATH}:/dipha/dipha/build" WORKDIR /benchmark RUN time -v -o sphere_3_192.dipha.txt dipha --dual --benchmark --upper_dim 3 sphere_3_192.complex sphere_3_192.dipha.diagram - -COPY o3_1024_1.8.dipha . RUN time -v -o o3_1024.dipha.txt dipha --dual --benchmark --upper_dim 4 o3_1024_1.8.dipha o3_1024_1.8.dipha.diagram - -# COPY o3_4096_1.4.dipha . # RUN time -v -o o3_4096.dipha.txt dipha --dual --benchmark --upper_dim 4 o3_4096_1.4.dipha o3_4096_1.4.dipha.diagram - -# COPY dragon_2000.dipha . # RUN time -v -o dragon-2.dipha.txt dipha --dual --benchmark --upper_dim 2 dragon_2000.dipha dragon_2000.dipha.diagram @@ -251,7 +250,7 @@ WORKDIR /eirene WORKDIR /benchmark RUN time -v -o sphere_3_192.eirene.txt \ - julia --eval 'maxdim = 2; using Eirene; using DelimitedFiles; eirene([0 1; 1 0]); println(@elapsed (d = readdlm("sphere_3_192.distance_matrix"); result = eirene(d, record="none", maxdim=maxdim))); for i in 0:maxdim print("dim $(i): "); show(stdout, "text/plain", (barcode(result , dim = i))); println(); end' >sphere_3_192.eirene.out.txt + julia --eval 'maxdim = 2; using Eirene; using DelimitedFiles; eirene([0 1; 1 0]); println(@elapsed (d = transpose(readdlm("sphere_3_192_points.dat")); result = eirene(d, model="pc", record="none", maxdim=maxdim))); for i in 0:maxdim print("dim $(i): "); show(stdout, "text/plain", (barcode(result , dim = i))); println(); end' >sphere_3_192.eirene.out.txt RUN time -v -o o3_1024.eirene.txt \ julia --eval 'maxdim = 3; maxrad = 1.8; using Eirene; using DelimitedFiles; eirene([0 1; 1 0]); println(@elapsed (d = transpose(readdlm("o3_1024.txt")); result = eirene(d, model="pc", record="none", maxdim=maxdim, maxrad=maxrad))); for i in 0:maxdim print("dim $(i): "); show(stdout, "text/plain", (barcode(result , dim = i))); println(); end' > o3_1024.eirene.out.txt diff --git a/benchmarks/output/clifford_torus_50000.ripser.txt b/benchmarks/output/clifford_torus_50000.ripser.txt index 9ebc28c..756f7ae 100644 --- a/benchmarks/output/clifford_torus_50000.ripser.txt +++ b/benchmarks/output/clifford_torus_50000.ripser.txt @@ -1,18 +1,18 @@ Command being timed: "ripser clifford_torus_50000.points.txt --format point-cloud --dim 2 --threshold .15 --ratio 2" - User time (seconds): 145.33 - System time (seconds): 6.04 + User time (seconds): 129.19 + System time (seconds): 12.06 Percent of CPU this job got: 99% - Elapsed (wall clock) time (h:mm:ss or m:ss): 2:31.42 + Elapsed (wall clock) time (h:mm:ss or m:ss): 2:21.35 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 8395796 + Maximum resident set size (kbytes): 8593448 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 4756610 - Voluntary context switches: 2 - Involuntary context switches: 2349 + Minor (reclaiming a frame) page faults: 4911670 + Voluntary context switches: 7 + Involuntary context switches: 1506 Swaps: 0 File system inputs: 0 File system outputs: 0 diff --git a/benchmarks/output/dragon-2.ripser-no-emergent.txt b/benchmarks/output/dragon-2.ripser-no-emergent.txt index a8cbec8..2693a67 100644 --- a/benchmarks/output/dragon-2.ripser-no-emergent.txt +++ b/benchmarks/output/dragon-2.ripser-no-emergent.txt @@ -1,20 +1,20 @@ Command being timed: "ripser dragon_vrip.ply.txt_2000_.txt --format point-cloud --dim 1" - User time (seconds): 42.24 - System time (seconds): 0.33 + User time (seconds): 40.30 + System time (seconds): 0.32 Percent of CPU this job got: 99% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:42.65 + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:40.66 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 257928 + Maximum resident set size (kbytes): 257872 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 150725 - Voluntary context switches: 3 - Involuntary context switches: 663 + Minor (reclaiming a frame) page faults: 150721 + Voluntary context switches: 1 + Involuntary context switches: 462 Swaps: 0 - File system inputs: 112 + File system inputs: 0 File system outputs: 0 Socket messages sent: 0 Socket messages received: 0 diff --git a/benchmarks/output/dragon-2.ripser.txt b/benchmarks/output/dragon-2.ripser.txt index ded1e98..2777c29 100644 --- a/benchmarks/output/dragon-2.ripser.txt +++ b/benchmarks/output/dragon-2.ripser.txt @@ -1,18 +1,18 @@ Command being timed: "ripser dragon_vrip.ply.txt_2000_.txt --format point-cloud --dim 1" - User time (seconds): 1.96 - System time (seconds): 0.30 - Percent of CPU this job got: 96% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:02.34 + User time (seconds): 1.94 + System time (seconds): 0.21 + Percent of CPU this job got: 97% + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:02.19 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 236292 + Maximum resident set size (kbytes): 257860 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 141390 + Minor (reclaiming a frame) page faults: 150721 Voluntary context switches: 1 - Involuntary context switches: 653 + Involuntary context switches: 253 Swaps: 0 File system inputs: 0 File system outputs: 0 diff --git a/benchmarks/output/fractal-r.ripser.txt b/benchmarks/output/fractal-r.ripser.txt index 0967e1b..f245ae3 100644 --- a/benchmarks/output/fractal-r.ripser.txt +++ b/benchmarks/output/fractal-r.ripser.txt @@ -1,18 +1,18 @@ Command being timed: "ripser fractal_9_5_2_random_edge_list.txt_0.19795_distmat.txt --dim 2" - User time (seconds): 14.30 - System time (seconds): 0.96 - Percent of CPU this job got: 99% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:15.36 + User time (seconds): 13.98 + System time (seconds): 1.01 + Percent of CPU this job got: 98% + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:15.16 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 1541228 + Maximum resident set size (kbytes): 1803484 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 694669 - Voluntary context switches: 2 - Involuntary context switches: 766 + Minor (reclaiming a frame) page faults: 768895 + Voluntary context switches: 1 + Involuntary context switches: 1041 Swaps: 0 File system inputs: 0 File system outputs: 0 diff --git a/benchmarks/output/o3_1024.gudhi.txt b/benchmarks/output/o3_1024.gudhi.txt index 4d1717c..27f1c3e 100644 --- a/benchmarks/output/o3_1024.gudhi.txt +++ b/benchmarks/output/o3_1024.gudhi.txt @@ -1,21 +1,21 @@ Command being timed: "gudhi-rips-persistence -d4 -p2 -r 1.8 o3_1024.off" - User time (seconds): 14.32 - System time (seconds): 0.21 - Percent of CPU this job got: 184% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:07.89 + User time (seconds): 13.51 + System time (seconds): 0.17 + Percent of CPU this job got: 179% + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:07.63 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 624880 + Maximum resident set size (kbytes): 624828 Average resident set size (kbytes): 0 - Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 155461 - Voluntary context switches: 58 - Involuntary context switches: 923 + Major (requiring I/O) page faults: 1 + Minor (reclaiming a frame) page faults: 155463 + Voluntary context switches: 116 + Involuntary context switches: 1252 Swaps: 0 - File system inputs: 0 - File system outputs: 0 + File system inputs: 232 + File system outputs: 72 Socket messages sent: 0 Socket messages received: 0 Signals delivered: 0 diff --git a/benchmarks/output/o3_1024.ripser-no-emergent.txt b/benchmarks/output/o3_1024.ripser-no-emergent.txt index 23afcab..2c2f69a 100644 --- a/benchmarks/output/o3_1024.ripser-no-emergent.txt +++ b/benchmarks/output/o3_1024.ripser-no-emergent.txt @@ -1,20 +1,20 @@ Command being timed: "ripser o3_1024.txt --format point-cloud --dim 3 --threshold 1.8 --ratio 2" - User time (seconds): 5.70 + User time (seconds): 5.24 System time (seconds): 0.10 Percent of CPU this job got: 100% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:05.78 + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:05.32 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 178796 + Maximum resident set size (kbytes): 178804 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 60267 - Voluntary context switches: 2 - Involuntary context switches: 65 + Minor (reclaiming a frame) page faults: 60265 + Voluntary context switches: 1 + Involuntary context switches: 48 Swaps: 0 - File system inputs: 360 + File system inputs: 0 File system outputs: 0 Socket messages sent: 0 Socket messages received: 0 diff --git a/benchmarks/output/o3_1024.ripser-store-reduced.txt b/benchmarks/output/o3_1024.ripser-store-reduced.txt index 4490795..17938c6 100644 --- a/benchmarks/output/o3_1024.ripser-store-reduced.txt +++ b/benchmarks/output/o3_1024.ripser-store-reduced.txt @@ -1,20 +1,20 @@ Command being timed: "ripser o3_1024.txt --format point-cloud --dim 3 --threshold 1.8 --ratio 2" - User time (seconds): 7.01 - System time (seconds): 0.65 - Percent of CPU this job got: 96% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:07.91 + User time (seconds): 6.63 + System time (seconds): 0.60 + Percent of CPU this job got: 99% + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:07.23 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 1239880 + Maximum resident set size (kbytes): 1239884 Average resident set size (kbytes): 0 - Major (requiring I/O) page faults: 16 + Major (requiring I/O) page faults: 0 Minor (reclaiming a frame) page faults: 514673 - Voluntary context switches: 36 - Involuntary context switches: 172 + Voluntary context switches: 1 + Involuntary context switches: 65 Swaps: 0 - File system inputs: 6080 + File system inputs: 0 File system outputs: 0 Socket messages sent: 0 Socket messages received: 0 diff --git a/benchmarks/output/o3_1024.ripser-use-reduced.txt b/benchmarks/output/o3_1024.ripser-use-reduced.txt index a32bccc..c93a2c0 100644 --- a/benchmarks/output/o3_1024.ripser-use-reduced.txt +++ b/benchmarks/output/o3_1024.ripser-use-reduced.txt @@ -1,18 +1,18 @@ Command being timed: "ripser o3_1024.txt --format point-cloud --dim 3 --threshold 1.8 --ratio 2" - User time (seconds): 6.47 - System time (seconds): 0.63 - Percent of CPU this job got: 100% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:07.09 + User time (seconds): 6.37 + System time (seconds): 0.56 + Percent of CPU this job got: 99% + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:06.94 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 1239440 + Maximum resident set size (kbytes): 1239568 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 514605 + Minor (reclaiming a frame) page faults: 514607 Voluntary context switches: 1 - Involuntary context switches: 110 + Involuntary context switches: 111 Swaps: 0 File system inputs: 0 File system outputs: 0 diff --git a/benchmarks/output/o3_1024.ripser.txt b/benchmarks/output/o3_1024.ripser.txt index f68f3bb..5ea9706 100644 --- a/benchmarks/output/o3_1024.ripser.txt +++ b/benchmarks/output/o3_1024.ripser.txt @@ -1,18 +1,18 @@ Command being timed: "ripser o3_1024.txt --format point-cloud --dim 3 --threshold 1.8 --ratio 2" - User time (seconds): 2.31 - System time (seconds): 0.08 + User time (seconds): 2.25 + System time (seconds): 0.07 Percent of CPU this job got: 99% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:02.40 + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:02.33 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 151020 + Maximum resident set size (kbytes): 178836 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 55722 + Minor (reclaiming a frame) page faults: 60268 Voluntary context switches: 1 - Involuntary context switches: 38 + Involuntary context switches: 34 Swaps: 0 File system inputs: 0 File system outputs: 0 diff --git a/benchmarks/output/o3_4096.ripser-no-emergent.txt b/benchmarks/output/o3_4096.ripser-no-emergent.txt index 22a69ca..4b1ff37 100644 --- a/benchmarks/output/o3_4096.ripser-no-emergent.txt +++ b/benchmarks/output/o3_4096.ripser-no-emergent.txt @@ -1,20 +1,20 @@ Command being timed: "ripser o3_4096.txt --format point-cloud --dim 3 --threshold 1.4 --ratio 2" - User time (seconds): 175.62 - System time (seconds): 2.88 - Percent of CPU this job got: 99% - Elapsed (wall clock) time (h:mm:ss or m:ss): 2:58.57 + User time (seconds): 174.88 + System time (seconds): 2.05 + Percent of CPU this job got: 100% + Elapsed (wall clock) time (h:mm:ss or m:ss): 2:56.88 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 3861264 + Maximum resident set size (kbytes): 3861344 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 1672009 - Voluntary context switches: 4 - Involuntary context switches: 2399 + Minor (reclaiming a frame) page faults: 1672013 + Voluntary context switches: 1 + Involuntary context switches: 594 Swaps: 0 - File system inputs: 1424 + File system inputs: 0 File system outputs: 0 Socket messages sent: 0 Socket messages received: 0 diff --git a/benchmarks/output/o3_4096.ripser.txt b/benchmarks/output/o3_4096.ripser.txt index b5b59a4..2a5d61e 100644 --- a/benchmarks/output/o3_4096.ripser.txt +++ b/benchmarks/output/o3_4096.ripser.txt @@ -1,18 +1,18 @@ Command being timed: "ripser o3_4096.txt --format point-cloud --dim 3 --threshold 1.4 --ratio 2" - User time (seconds): 62.27 - System time (seconds): 2.03 - Percent of CPU this job got: 100% - Elapsed (wall clock) time (h:mm:ss or m:ss): 1:04.28 + User time (seconds): 60.51 + System time (seconds): 2.02 + Percent of CPU this job got: 99% + Elapsed (wall clock) time (h:mm:ss or m:ss): 1:02.54 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 3260212 + Maximum resident set size (kbytes): 3861300 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 1503830 - Voluntary context switches: 1 - Involuntary context switches: 201 + Minor (reclaiming a frame) page faults: 1672012 + Voluntary context switches: 2 + Involuntary context switches: 434 Swaps: 0 File system inputs: 0 File system outputs: 0 diff --git a/benchmarks/output/random.ripser-no-emergent.txt b/benchmarks/output/random.ripser-no-emergent.txt index 52edb6c..cfdb8fc 100644 --- a/benchmarks/output/random.ripser-no-emergent.txt +++ b/benchmarks/output/random.ripser-no-emergent.txt @@ -1,20 +1,20 @@ Command being timed: "ripser random_point_cloud_50_16_.txt --format point-cloud --dim 7" - User time (seconds): 14.35 - System time (seconds): 0.32 - Percent of CPU this job got: 99% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:14.71 + User time (seconds): 13.82 + System time (seconds): 0.22 + Percent of CPU this job got: 100% + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:14.02 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 339044 + Maximum resident set size (kbytes): 339084 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 Minor (reclaiming a frame) page faults: 150128 Voluntary context switches: 2 - Involuntary context switches: 145 + Involuntary context switches: 102 Swaps: 0 - File system inputs: 16 + File system inputs: 0 File system outputs: 0 Socket messages sent: 0 Socket messages received: 0 diff --git a/benchmarks/output/random.ripser-store-reduced.txt b/benchmarks/output/random.ripser-store-reduced.txt index 2dcff71..efeb5b5 100644 --- a/benchmarks/output/random.ripser-store-reduced.txt +++ b/benchmarks/output/random.ripser-store-reduced.txt @@ -1,18 +1,18 @@ Command being timed: "ripser random_point_cloud_50_16_.txt --format point-cloud --dim 7" - User time (seconds): 16.32 - System time (seconds): 1.20 - Percent of CPU this job got: 100% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:17.51 + User time (seconds): 15.99 + System time (seconds): 0.92 + Percent of CPU this job got: 99% + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:16.92 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 1366712 + Maximum resident set size (kbytes): 1366796 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 964016 + Minor (reclaiming a frame) page faults: 961778 Voluntary context switches: 1 - Involuntary context switches: 240 + Involuntary context switches: 242 Swaps: 0 File system inputs: 0 File system outputs: 0 diff --git a/benchmarks/output/random.ripser.txt b/benchmarks/output/random.ripser.txt index 273de0a..ac9822c 100644 --- a/benchmarks/output/random.ripser.txt +++ b/benchmarks/output/random.ripser.txt @@ -1,18 +1,18 @@ Command being timed: "ripser random_point_cloud_50_16_.txt --format point-cloud --dim 7" - User time (seconds): 6.64 - System time (seconds): 0.13 + User time (seconds): 6.25 + System time (seconds): 0.18 Percent of CPU this job got: 99% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:06.78 + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:06.43 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 312896 + Maximum resident set size (kbytes): 339084 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 138254 + Minor (reclaiming a frame) page faults: 150127 Voluntary context switches: 1 - Involuntary context switches: 113 + Involuntary context switches: 62 Swaps: 0 File system inputs: 0 File system outputs: 0 diff --git a/benchmarks/output/sphere_3_192.ripser-no-emergent.txt b/benchmarks/output/sphere_3_192.ripser-no-emergent.txt index c4768dd..37134ce 100644 --- a/benchmarks/output/sphere_3_192.ripser-no-emergent.txt +++ b/benchmarks/output/sphere_3_192.ripser-no-emergent.txt @@ -1,20 +1,20 @@ - Command being timed: "ripser sphere_3_192.distance_matrix --dim 2" - User time (seconds): 5.86 - System time (seconds): 0.12 + Command being timed: "ripser sphere_3_192_points.dat --format point-cloud --dim 2" + User time (seconds): 5.49 + System time (seconds): 0.06 Percent of CPU this job got: 99% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:06.01 + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:05.56 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 201080 + Maximum resident set size (kbytes): 201136 Average resident set size (kbytes): 0 - Major (requiring I/O) page faults: 9 - Minor (reclaiming a frame) page faults: 66914 - Voluntary context switches: 14 - Involuntary context switches: 25 + Major (requiring I/O) page faults: 0 + Minor (reclaiming a frame) page faults: 66913 + Voluntary context switches: 1 + Involuntary context switches: 62 Swaps: 0 - File system inputs: 3336 + File system inputs: 0 File system outputs: 0 Socket messages sent: 0 Socket messages received: 0 diff --git a/benchmarks/output/sphere_3_192.ripser-store-reduced.txt b/benchmarks/output/sphere_3_192.ripser-store-reduced.txt index 7e61790..22e6702 100644 --- a/benchmarks/output/sphere_3_192.ripser-store-reduced.txt +++ b/benchmarks/output/sphere_3_192.ripser-store-reduced.txt @@ -1,18 +1,18 @@ - Command being timed: "ripser sphere_3_192.distance_matrix --dim 2" - User time (seconds): 13.90 - System time (seconds): 1.98 + Command being timed: "ripser sphere_3_192_points.dat --format point-cloud --dim 2" + User time (seconds): 13.80 + System time (seconds): 1.77 Percent of CPU this job got: 99% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:15.92 + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:15.57 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 4288252 + Maximum resident set size (kbytes): 4288268 Average resident set size (kbytes): 0 Major (requiring I/O) page faults: 0 - Minor (reclaiming a frame) page faults: 1860889 + Minor (reclaiming a frame) page faults: 1860885 Voluntary context switches: 1 - Involuntary context switches: 227 + Involuntary context switches: 240 Swaps: 0 File system inputs: 0 File system outputs: 0 diff --git a/benchmarks/output/sphere_3_192.ripser-use-reduced.txt b/benchmarks/output/sphere_3_192.ripser-use-reduced.txt index 8574e96..66d80ac 100644 --- a/benchmarks/output/sphere_3_192.ripser-use-reduced.txt +++ b/benchmarks/output/sphere_3_192.ripser-use-reduced.txt @@ -1,20 +1,20 @@ - Command being timed: "ripser sphere_3_192.distance_matrix --dim 2" - User time (seconds): 14.19 - System time (seconds): 2.55 + Command being timed: "ripser sphere_3_192_points.dat --format point-cloud --dim 2" + User time (seconds): 13.58 + System time (seconds): 1.76 Percent of CPU this job got: 99% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:16.78 + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:15.34 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 4288300 + Maximum resident set size (kbytes): 4288276 Average resident set size (kbytes): 0 - Major (requiring I/O) page faults: 1 + Major (requiring I/O) page faults: 0 Minor (reclaiming a frame) page faults: 1865102 - Voluntary context switches: 6 - Involuntary context switches: 91 + Voluntary context switches: 1 + Involuntary context switches: 193 Swaps: 0 - File system inputs: 1576 + File system inputs: 0 File system outputs: 0 Socket messages sent: 0 Socket messages received: 0 diff --git a/benchmarks/output/sphere_3_192.ripser.txt b/benchmarks/output/sphere_3_192.ripser.txt index 29b2d3e..d6f9446 100644 --- a/benchmarks/output/sphere_3_192.ripser.txt +++ b/benchmarks/output/sphere_3_192.ripser.txt @@ -1,20 +1,20 @@ - Command being timed: "ripser sphere_3_192.distance_matrix --dim 2" + Command being timed: "ripser sphere_3_192_points.dat --format point-cloud --dim 2" User time (seconds): 1.04 - System time (seconds): 0.10 - Percent of CPU this job got: 98% - Elapsed (wall clock) time (h:mm:ss or m:ss): 0:01.15 + System time (seconds): 0.04 + Percent of CPU this job got: 99% + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:01.08 Average shared text size (kbytes): 0 Average unshared data size (kbytes): 0 Average stack size (kbytes): 0 Average total size (kbytes): 0 - Maximum resident set size (kbytes): 185128 + Maximum resident set size (kbytes): 201136 Average resident set size (kbytes): 0 - Major (requiring I/O) page faults: 1 - Minor (reclaiming a frame) page faults: 62823 - Voluntary context switches: 2 - Involuntary context switches: 28 + Major (requiring I/O) page faults: 0 + Minor (reclaiming a frame) page faults: 66924 + Voluntary context switches: 1 + Involuntary context switches: 57 Swaps: 0 - File system inputs: 40 + File system inputs: 0 File system outputs: 0 Socket messages sent: 0 Socket messages received: 0 |