diff --git a/divide-conquer/logs/bubble-sort/mpi-1-1000000-1000000-1.txt b/divide-conquer/logs/bubble-sort/mpi-1-1000000-1000000-1.txt deleted file mode 100644 index 8df4648208ba01e6caae3f1fff75fff235c04e65..0000000000000000000000000000000000000000 --- a/divide-conquer/logs/bubble-sort/mpi-1-1000000-1000000-1.txt +++ /dev/null @@ -1,3 +0,0 @@ -/home/claudio.scheer/opt/mpic++-9.3.0/bin/mpic++ sort-mpi.cpp -o sort-mpi.o -std=c++17 -/home/claudio.scheer/opt/mpic++-9.3.0/bin/mpirun -np 1 --oversubscribe ./sort-mpi.o 1000000 1000000 -Time load dataset (s): 0.0792907 diff --git a/divide-conquer/logs/bubble-sort/mpi-3-1000000-500000-2.txt b/divide-conquer/logs/bubble-sort/mpi-3-1000000-500000-2.txt new file mode 100644 index 0000000000000000000000000000000000000000..48ac85b6af1040a115dd65dbd4ea27152614d5d5 --- /dev/null +++ b/divide-conquer/logs/bubble-sort/mpi-3-1000000-500000-2.txt @@ -0,0 +1,5 @@ +/home/claudio.scheer/opt/mpic++-9.3.0/bin/mpic++ sort-mpi.cpp -o sort-mpi.o -std=c++17 +/home/claudio.scheer/opt/mpic++-9.3.0/bin/mpirun -np 3 --oversubscribe ./sort-mpi.o 1000000 500000 +Time load dataset (s): 0.0531567 +Vector size: 1000000 +Time sort (s): 2563.98 diff --git a/divide-conquer/logs/bubble-sort/mpi-3-1000000-500000-3.txt b/divide-conquer/logs/bubble-sort/mpi-3-1000000-500000-3.txt new file mode 100644 index 0000000000000000000000000000000000000000..1d44b36a9034c257cb09ca42a2db4baf89056bb0 --- /dev/null +++ b/divide-conquer/logs/bubble-sort/mpi-3-1000000-500000-3.txt @@ -0,0 +1,5 @@ +/home/claudio.scheer/opt/mpic++-9.3.0/bin/mpic++ sort-mpi.cpp -o sort-mpi.o -std=c++17 +/home/claudio.scheer/opt/mpic++-9.3.0/bin/mpirun -np 3 --oversubscribe ./sort-mpi.o 1000000 500000 +Time load dataset (s): 0.0531567 +Vector size: 1000000 +Time sort (s): 2565.8 diff --git a/divide-conquer/logs/bubble-sort/sequential-1000000-1.txt b/divide-conquer/logs/bubble-sort/sequential-1000000-1.txt index 0004c530776aa1a393072c1a32e3c56d096ba9a5..852514aa05f83d4b29f94dfd9e42ab3e0ee85ea2 100644 --- a/divide-conquer/logs/bubble-sort/sequential-1000000-1.txt +++ b/divide-conquer/logs/bubble-sort/sequential-1000000-1.txt @@ -1,4 +1,4 @@ g++ sort-seq.cpp -o sort-seq.o -std=c++17 ./sort-seq.o 1000000 Time load dataset (s): 0.0576179 -Time sort (s): 11768 +Time sort (s): 11768.0 diff --git a/divide-conquer/logs/bubble-sort/sequential-1000000-2.txt b/divide-conquer/logs/bubble-sort/sequential-1000000-2.txt index 0004c530776aa1a393072c1a32e3c56d096ba9a5..d44e3243fa6ecd691d108493d8b4095503748a4d 100644 --- a/divide-conquer/logs/bubble-sort/sequential-1000000-2.txt +++ b/divide-conquer/logs/bubble-sort/sequential-1000000-2.txt @@ -1,4 +1,4 @@ g++ sort-seq.cpp -o sort-seq.o -std=c++17 ./sort-seq.o 1000000 Time load dataset (s): 0.0576179 -Time sort (s): 11768 +Time sort (s): 11769.2 diff --git a/divide-conquer/logs/bubble-sort/sequential-1000000-3.txt b/divide-conquer/logs/bubble-sort/sequential-1000000-3.txt new file mode 100644 index 0000000000000000000000000000000000000000..722b6f72833930aa35db31d28e9ddd8dc59e560f --- /dev/null +++ b/divide-conquer/logs/bubble-sort/sequential-1000000-3.txt @@ -0,0 +1,4 @@ +g++ sort-seq.cpp -o sort-seq.o -std=c++17 +./sort-seq.o 1000000 +Time load dataset (s): 0.0576179 +Time sort (s): 11771.0 diff --git a/divide-conquer/logs/scripts/bubble-sort-speedup-efficiency.pdf b/divide-conquer/logs/scripts/bubble-sort-speedup-efficiency.pdf index 6bb0008cde618d62dce9a31722abdf6704649af1..b2f40ab01fb45aa6fce2046faff39dc94aa4da78 100644 Binary files a/divide-conquer/logs/scripts/bubble-sort-speedup-efficiency.pdf and b/divide-conquer/logs/scripts/bubble-sort-speedup-efficiency.pdf differ diff --git a/divide-conquer/logs/scripts/bubble-sort-time.pdf b/divide-conquer/logs/scripts/bubble-sort-time.pdf index de57d5cbf06a0e23ab8f25c02693f0094cc86bd2..10b2177983c43b1f0f1e0cde7a08b9e9720c2eff 100644 Binary files a/divide-conquer/logs/scripts/bubble-sort-time.pdf and b/divide-conquer/logs/scripts/bubble-sort-time.pdf differ diff --git a/divide-conquer/logs/scripts/bubble-sort.dat b/divide-conquer/logs/scripts/bubble-sort.dat index 66e0d324dfde7dcc5da07c092ddd1abaa9fdf6f4..d1e5419533c284734a4c2e6b6908ebffee28294b 100644 --- a/divide-conquer/logs/scripts/bubble-sort.dat +++ b/divide-conquer/logs/scripts/bubble-sort.dat @@ -1,8 +1,8 @@ np Sequential Sequential_std MPI MPI_std Speedup Efficiency -seq. 11768.0 0.0 0 0 0 0 -3 0 0 2565.5 0.0 4.58702007 1.52900669 -7 0 0 666.4903333333333 0.5230680856468495 17.65667018 2.52238145 -15 0 0 226.66899999999998 8.59252663656041 51.91711261 3.46114084 -31 0 0 87.18553333333334 1.2608209609439223 134.97652133 4.35408133 -63 0 0 46.3264 0.9041037882898169 254.02362367 4.03212101 -127 0 0 22.938299999999998 0.11188601342437693 513.02842843 4.03959392 +seq. 11769.4 1.232882800593756 0 0 0 0 +3 0 0 2565.0933333333332 0.7967154796761688 4.58829308 1.52943102 +7 0 0 666.4903333333333 0.5230680856468495 17.65877074 2.52268153 +15 0 0 226.66899999999998 8.59252663656041 51.92328902 3.46155260 +31 0 0 87.18553333333334 1.2608209609439223 134.99257904 4.35459932 +63 0 0 46.3264 0.9041037882898169 254.05384402 4.03260069 +127 0 0 22.938299999999998 0.11188601342437693 513.08946172 4.04007450 diff --git a/divide-conquer/logs/scripts/create-dataset.sh b/divide-conquer/logs/scripts/create-dataset.sh index 7e8ecd3128c6098ad3f6566929b3bd97b382420a..cb4f801c2cbd6dff6a2bc1b0c9c9a98e3a79211f 100755 --- a/divide-conquer/logs/scripts/create-dataset.sh +++ b/divide-conquer/logs/scripts/create-dataset.sh @@ -14,7 +14,7 @@ rm $bubble_sort_dat_path echo "np Sequential Sequential_std MPI MPI_std Speedup Efficiency" >> $bubble_sort_dat_path file=$script_dir/../bubble-sort/sequential-$vector_size-*.txt -total_time=$(cat $file | grep -P "Time\ssort\s\(s\):" | grep -Po "[0-9]+" | get_mean_std) +total_time=$(cat $file | grep -P "Time\ssort\s\(s\):" | grep -Po "[0-9]+[.][0-9]+" | get_mean_std) sequential_time=$(echo $total_time | awk '{ print $1 }') row="seq. " for element in $total_time; do diff --git a/divide-conquer/report/report.fdb_latexmk b/divide-conquer/report/report.fdb_latexmk index e78ab3ce9de98629e816e2df83bb3bc8bc22b92d..644893ae22206ba4730feea69d87cc99d5c81056 100644 --- a/divide-conquer/report/report.fdb_latexmk +++ b/divide-conquer/report/report.fdb_latexmk @@ -1,9 +1,9 @@ # Fdb version 3 -["pdflatex"] 1604645412 "report.tex" "report.pdf" "report" 1604645412 +["pdflatex"] 1604666090 "report.tex" "report.pdf" "report" 1604666090 "../bubble-sort/dataset-generator.cpp" 1603426573 347 6e162865f2c8dc78af9b6568092c0daf "" "../bubble-sort/sort-mpi.cpp" 1604628231 4425 5ff82e34c06ca950a71c9e31d54af6b4 "" "../bubble-sort/sort-seq.cpp" 1604628202 1625 7eca82e4ea87ca579f7d8bad510ea544 "" - "../logs/scripts/bubble-sort-speedup-efficiency.pdf" 1604641544 13197 80c16f30b46c353fda056e60b4d55e2c "" + "../logs/scripts/bubble-sort-speedup-efficiency.pdf" 1604666088 13199 6f518a970bb2ac6dbc07dabf5fdd0360 "" "/etc/texmf/web2c/texmf.cnf" 1603895883 475 c0e671620eb5563b2130f56340a5fde8 "" "/usr/share/texlive/texmf-dist/fonts/map/fontname/texfonts.map" 1577235249 3524 cb3e574dea2d1052e39280babc910dc8 "" "/usr/share/texlive/texmf-dist/fonts/tfm/public/amsfonts/cmextra/cmex7.tfm" 1246382020 1004 54797486969f23fa377b128694d548df "" @@ -72,9 +72,9 @@ "/usr/share/texmf/web2c/texmf.cnf" 1581979058 38841 ce3692aa899bb693b90b87eaa5d4d84e "" "/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map" 1603895931 4770781 1ed1abab22da9c3e2cc82e4db562318b "" "/var/lib/texmf/web2c/pdftex/pdflatex.fmt" 1603895966 8259436 092d7d86d32a30c1fc083e2e412679e8 "" - "report.aux" 1604645412 582 deb9c1fac00cb243c8e3505591a55aaa "pdflatex" - "report.tex" 1604645410 4778 5d97f84855ab6ba5c656689fa5a739f9 "" + "report.aux" 1604666090 582 deb9c1fac00cb243c8e3505591a55aaa "pdflatex" + "report.tex" 1604645441 4778 5d97f84855ab6ba5c656689fa5a739f9 "" (generated) "report.log" - "report.pdf" "report.aux" + "report.pdf" diff --git a/divide-conquer/report/report.log b/divide-conquer/report/report.log index 54cd98e4354485d465c369a1a953b6f73b1b6ce3..f24a137f36a7bf1c8a1a689531eb5b9e2d5a2df1 100644 --- a/divide-conquer/report/report.log +++ b/divide-conquer/report/report.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.14159265-2.6-1.40.20 (TeX Live 2019/Debian) (preloaded format=pdflatex 2020.10.28) 6 NOV 2020 03:50 +This is pdfTeX, Version 3.14159265-2.6-1.40.20 (TeX Live 2019/Debian) (preloaded format=pdflatex 2020.10.28) 6 NOV 2020 09:34 entering extended mode restricted \write18 enabled. file:line:error style messages enabled. @@ -347,7 +347,7 @@ Here is how much of TeX's memory you used: 1141 hyphenation exceptions out of 8191 39i,6n,69p,576b,1798s stack positions out of 5000i,500n,10000p,200000b,80000s -Output written on report.pdf (5 pages, 142255 bytes). +Output written on report.pdf (5 pages, 142259 bytes). PDF statistics: 80 PDF objects out of 1000 (max. 8388607) 56 compressed objects within 1 object stream diff --git a/divide-conquer/report/report.pdf b/divide-conquer/report/report.pdf index 1140a9cfadca63551bb856307f79f6c0cb512ca1..2d3fc7ac836eb13766a14b8b7e0ab76ec9c4d41b 100644 Binary files a/divide-conquer/report/report.pdf and b/divide-conquer/report/report.pdf differ