From 8db8f47803f4503d6fdcd2bd2c4092e85d68d81c Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Mon, 21 Mar 2022 18:57:39 +0000 Subject: Remove SVG files and generate them on server --- Makefile | 11 +- notes/5c6faa9f-2ae4-4dda-83a6-00f283ce2ea3.org | 250 ++++++------- .../5a22847d-9bd6-46e9-9e2c-1291d3f8c7b9.svg | 413 -------------------- .../a95a49aa-9aa3-4e83-b3e0-767756736ec1.svg | 415 --------------------- packages.el | 1 + publish.el | 7 + 6 files changed, 142 insertions(+), 955 deletions(-) delete mode 100644 notes/static/5a22847d-9bd6-46e9-9e2c-1291d3f8c7b9.svg delete mode 100644 notes/static/a95a49aa-9aa3-4e83-b3e0-767756736ec1.svg diff --git a/Makefile b/Makefile index 56032a2..46bf935 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,19 @@ all: install-deps build upload +notes/static: + mkdir -p $@ + install-deps: emacs --batch --load packages.el -build: +build: | notes/static emacs --batch --load publish.el --funcall org-publish-all upload: rsync --rsh="ssh -o StrictHostKeyChecking=no" -av public/ "notes@leika.ymhg.org:/var/www/notes" -.PHONY: all build install-deps upload +clean: + rm -rf notes/static + rm -rf public + +.PHONY: all build install-deps upload clean diff --git a/notes/5c6faa9f-2ae4-4dda-83a6-00f283ce2ea3.org b/notes/5c6faa9f-2ae4-4dda-83a6-00f283ce2ea3.org index 3f63518..26ced2a 100644 --- a/notes/5c6faa9f-2ae4-4dda-83a6-00f283ce2ea3.org +++ b/notes/5c6faa9f-2ae4-4dda-83a6-00f283ce2ea3.org @@ -1,131 +1,6 @@ #+title: Vericert Scheduling Results #+html_head_extra: -* Plots -:PROPERTIES: -:CUSTOM_ID: plots -:END: - -#+begin_src gnuplot :var data=vericert-processed-size :file ./static/5a22847d-9bd6-46e9-9e2c-1291d3f8c7b9.svg -reset - -red = "#e07a5f" -blue = "#81b29a" - -set style data histogram -set style fill solid - -set log y -set yrange [1:3] -set ytics 0.5 nologscale -set ylabel "Design size relative to Vericert" - -set xtics rotate nomirror - -set title "Vericert size comparison" -plot data using 2:xtic(1) title "list" linecolor rgb red, \ - data using 3 title "hyper" linecolor rgb blue -#+end_src - -#+RESULTS: -[[file:./static/5a22847d-9bd6-46e9-9e2c-1291d3f8c7b9.svg]] - -#+begin_src gnuplot :var data=vericert-processed-speed :file ./static/a95a49aa-9aa3-4e83-b3e0-767756736ec1.svg -reset - -red = "#3d405b" -blue = "#f2cc8f" - -set style data histogram -set style fill solid - -set log y -set yrange [0.05:1.2] -set ytics 0.01,0.1,1 -set ylabel "Execution time relative to Vericert" - -set xtics rotate nomirror - -set title "Vericert speed comparison" -plot data using 2:xtic(1) title "list" linecolor rgb red, \ - data using 3 title "hyper" linecolor rgb blue -#+end_src - -#+RESULTS: -[[file:./static/a95a49aa-9aa3-4e83-b3e0-767756736ec1.svg]] - -* Processing - -#+name: vericert-processed-size -#+caption: Design size relative to Vericert. -| benchmark | vericert-list | vericert-hyper | -|----------------+---------------+----------------| -| 2mm | 1.8148148 | 1.5555556 | -| 3mm | 1.6247906 | 1.5311760 | -| adi | 1.6864583 | 1.3051189 | -| atas | 1.4228029 | 1.1908549 | -| bicg | 1.3006993 | 1.1137725 | -| cholesky | 2.2895054 | 1.7804878 | -| covariance | 1.0145719 | 0.98584071 | -| doitgen | 1.8436019 | 1.7212389 | -| durbin | 1.2598291 | 0.94487179 | -| fdtd-2d | 1.8102625 | 1.5752856 | -| floyd-warshall | 1.2016129 | 0.90211907 | -| gemm | 1.3737624 | 1.1948332 | -| gemver | 1.3281991 | 1.2497213 | -| gesummv | 1.3213333 | 1.0667384 | -| heat-3d | 1.7933579 | 1.7587455 | -| jacobi-1d | 1.6877323 | 1.3841463 | -| jacobi-2d | 1.5256849 | 1.3707692 | -| lu | 2.1350365 | 1.6447985 | -| ludcmp | 2.2989324 | 1.7845304 | -| mvt | 1.7512847 | 1.3708769 | -| nussinov | 1.4447717 | 1.1678571 | -| seidel-2d | 1.6851852 | 1.6545455 | -| symm | 1.7689694 | 1.4516729 | -| syr2k | 1.5592255 | 1.3608350 | -| syrk | 1.3641882 | 1.2148649 | -| trisolv | 1.3314607 | 1.3699422 | -| trmm | 1.5706714 | 1.2772989 | -#+tblfm: $1='(identity remote(raw-vericert,@@#$1)) -#+tblfm: $2=(remote(raw-vericert,@@#$2))/(remote(raw-vericert-list,@@#$2)) -#+tblfm: $3=(remote(raw-vericert,@@#$2))/(remote(raw-vericert-hyper,@@#$2)) - -#+name: vericert-processed-speed -#+caption: Execution time relative to Vericert. -| benchmark | vericert-list | vericert-hyper | -|----------------+---------------+----------------| -| 2mm | 0.10964074 | 0.11388448 | -| 3mm | 0.11272619 | 0.11380653 | -| adi | 0.11254961 | 0.11188351 | -| atas | 0.25071807 | 0.25060733 | -| bicg | 0.25128535 | 0.25837004 | -| cholesky | 0.10709267 | 0.10837778 | -| covariance | 0.23328600 | 0.23503192 | -| doitgen | 0.10006043 | 0.10025617 | -| durbin | 0.91718661 | 0.88748628 | -| fdtd-2d | 0.25191744 | 0.24256082 | -| floyd-warshall | 0.24512275 | 0.24528405 | -| gemm | 0.24217108 | 0.23782250 | -| gemver | 0.080719653 | 0.082348805 | -| gesummv | 0.11018493 | 0.11693428 | -| heat-3d | 0.26189422 | 0.26387960 | -| jacobi-1d | 1.0273277 | 0.99205979 | -| jacobi-2d | 0.24812968 | 0.24891972 | -| lu | 0.10784972 | 0.10553413 | -| ludcmp | 0.10642397 | 0.11109796 | -| mvt | 0.096198062 | 0.099829570 | -| nussinov | 0.23680025 | 0.24543956 | -| seidel-2d | 0.25317479 | 0.24189279 | -| symm | 0.23900415 | 0.24417126 | -| syr2k | 0.23700960 | 0.24042125 | -| syrk | 0.24829032 | 0.24812610 | -| trisolv | 0.11345693 | 0.11485735 | -| trmm | 0.25103069 | 0.24199603 | -#+tblfm: $1='(identity remote(raw-vericert,@@#$1)) -#+tblfm: $2=(remote(raw-vericert,@@#$3) * remote(raw-vericert,@@#$4))/(remote(raw-vericert-list,@@#$3) * remote(raw-vericert-list,@@#$4)) -#+tblfm: $3=(remote(raw-vericert,@@#$3) * remote(raw-vericert,@@#$4))/(remote(raw-vericert-hyper,@@#$3) * remote(raw-vericert-hyper,@@#$4)) - * Raw results #+name: raw-vericert @@ -223,3 +98,128 @@ plot data using 2:xtic(1) title "list" linecolor rgb red, \ | syrk | 740 | 16 | 4.536 | 180421 | | trisolv | 346 | 16 | 9.884 | 16849 | | trmm | 696 | 8 | 4.529 | 87568 | + +* Processing + +#+name: vericert-processed-size +#+caption: Design size relative to Vericert. +| benchmark | vericert-list | vericert-hyper | +|----------------+---------------+----------------| +| 2mm | 1.8148148 | 1.5555556 | +| 3mm | 1.6247906 | 1.5311760 | +| adi | 1.6864583 | 1.3051189 | +| atas | 1.4228029 | 1.1908549 | +| bicg | 1.3006993 | 1.1137725 | +| cholesky | 2.2895054 | 1.7804878 | +| covariance | 1.0145719 | 0.98584071 | +| doitgen | 1.8436019 | 1.7212389 | +| durbin | 1.2598291 | 0.94487179 | +| fdtd-2d | 1.8102625 | 1.5752856 | +| floyd-warshall | 1.2016129 | 0.90211907 | +| gemm | 1.3737624 | 1.1948332 | +| gemver | 1.3281991 | 1.2497213 | +| gesummv | 1.3213333 | 1.0667384 | +| heat-3d | 1.7933579 | 1.7587455 | +| jacobi-1d | 1.6877323 | 1.3841463 | +| jacobi-2d | 1.5256849 | 1.3707692 | +| lu | 2.1350365 | 1.6447985 | +| ludcmp | 2.2989324 | 1.7845304 | +| mvt | 1.7512847 | 1.3708769 | +| nussinov | 1.4447717 | 1.1678571 | +| seidel-2d | 1.6851852 | 1.6545455 | +| symm | 1.7689694 | 1.4516729 | +| syr2k | 1.5592255 | 1.3608350 | +| syrk | 1.3641882 | 1.2148649 | +| trisolv | 1.3314607 | 1.3699422 | +| trmm | 1.5706714 | 1.2772989 | +#+tblfm: $1='(identity remote(raw-vericert,@@#$1)) +#+tblfm: $2=(remote(raw-vericert,@@#$2))/(remote(raw-vericert-list,@@#$2)) +#+tblfm: $3=(remote(raw-vericert,@@#$2))/(remote(raw-vericert-hyper,@@#$2)) + +#+name: vericert-processed-speed +#+caption: Execution time relative to Vericert. +| benchmark | vericert-list | vericert-hyper | +|----------------+---------------+----------------| +| 2mm | 0.10964074 | 0.11388448 | +| 3mm | 0.11272619 | 0.11380653 | +| adi | 0.11254961 | 0.11188351 | +| atas | 0.25071807 | 0.25060733 | +| bicg | 0.25128535 | 0.25837004 | +| cholesky | 0.10709267 | 0.10837778 | +| covariance | 0.23328600 | 0.23503192 | +| doitgen | 0.10006043 | 0.10025617 | +| durbin | 0.91718661 | 0.88748628 | +| fdtd-2d | 0.25191744 | 0.24256082 | +| floyd-warshall | 0.24512275 | 0.24528405 | +| gemm | 0.24217108 | 0.23782250 | +| gemver | 0.080719653 | 0.082348805 | +| gesummv | 0.11018493 | 0.11693428 | +| heat-3d | 0.26189422 | 0.26387960 | +| jacobi-1d | 1.0273277 | 0.99205979 | +| jacobi-2d | 0.24812968 | 0.24891972 | +| lu | 0.10784972 | 0.10553413 | +| ludcmp | 0.10642397 | 0.11109796 | +| mvt | 0.096198062 | 0.099829570 | +| nussinov | 0.23680025 | 0.24543956 | +| seidel-2d | 0.25317479 | 0.24189279 | +| symm | 0.23900415 | 0.24417126 | +| syr2k | 0.23700960 | 0.24042125 | +| syrk | 0.24829032 | 0.24812610 | +| trisolv | 0.11345693 | 0.11485735 | +| trmm | 0.25103069 | 0.24199603 | +#+tblfm: $1='(identity remote(raw-vericert,@@#$1)) +#+tblfm: $2=(remote(raw-vericert,@@#$3) * remote(raw-vericert,@@#$4))/(remote(raw-vericert-list,@@#$3) * remote(raw-vericert-list,@@#$4)) +#+tblfm: $3=(remote(raw-vericert,@@#$3) * remote(raw-vericert,@@#$4))/(remote(raw-vericert-hyper,@@#$3) * remote(raw-vericert-hyper,@@#$4)) + +* Plots +:PROPERTIES: +:CUSTOM_ID: plots +:END: + +#+begin_src gnuplot :var data=vericert-processed-size :file ./static/5a22847d-9bd6-46e9-9e2c-1291d3f8c7b9.svg :exports results +reset + +red = "#e07a5f" +blue = "#81b29a" + +set style data histogram +set style fill solid + +set log y +set yrange [1:3] +set ytics 0.5 nologscale +set ylabel "Design size relative to Vericert" + +set xtics rotate nomirror + +set title "Vericert size comparison" +plot data using 2:xtic(1) title "list" linecolor rgb red, \ + data using 3 title "hyper" linecolor rgb blue +#+end_src + +#+RESULTS: +[[file:./static/5a22847d-9bd6-46e9-9e2c-1291d3f8c7b9.svg]] + +#+begin_src gnuplot :var data=vericert-processed-speed :file ./static/a95a49aa-9aa3-4e83-b3e0-767756736ec1.svg :exports results +reset + +red = "#3d405b" +blue = "#f2cc8f" + +set style data histogram +set style fill solid + +set log y +set yrange [0.05:1.2] +set ytics 0.01,0.1,1 +set ylabel "Execution time relative to Vericert" + +set xtics rotate nomirror + +set title "Vericert speed comparison" +plot data using 2:xtic(1) title "list" linecolor rgb red, \ + data using 3 title "hyper" linecolor rgb blue +#+end_src + +#+RESULTS: +[[file:./static/a95a49aa-9aa3-4e83-b3e0-767756736ec1.svg]] diff --git a/notes/static/5a22847d-9bd6-46e9-9e2c-1291d3f8c7b9.svg b/notes/static/5a22847d-9bd6-46e9-9e2c-1291d3f8c7b9.svg deleted file mode 100644 index 08e7526..0000000 --- a/notes/static/5a22847d-9bd6-46e9-9e2c-1291d3f8c7b9.svg +++ /dev/null @@ -1,413 +0,0 @@ - - - -Gnuplot -Produced by GNUPLOT 5.4 patchlevel 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - 1.5 - - - - - 2 - - - - - 2.5 - - - - - 3 - - - - - 2mm - - - - - 3mm - - - - - adi - - - - - atas - - - - - bicg - - - - - cholesky - - - - - covariance - - - - - doitgen - - - - - durbin - - - - - fdtd-2d - - - - - floyd-warshall - - - - - gemm - - - - - gemver - - - - - gesummv - - - - - heat-3d - - - - - jacobi-1d - - - - - jacobi-2d - - - - - lu - - - - - ludcmp - - - - - mvt - - - - - nussinov - - - - - seidel-2d - - - - - symm - - - - - syr2k - - - - - syrk - - - - - trisolv - - - - - trmm - - - - - - - - - Design size relative to Vericert - - - - - list - - - list - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - hyper - - - hyper - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Vericert size comparison - - - - - - - diff --git a/notes/static/a95a49aa-9aa3-4e83-b3e0-767756736ec1.svg b/notes/static/a95a49aa-9aa3-4e83-b3e0-767756736ec1.svg deleted file mode 100644 index 1cec1bd..0000000 --- a/notes/static/a95a49aa-9aa3-4e83-b3e0-767756736ec1.svg +++ /dev/null @@ -1,415 +0,0 @@ - - - -Gnuplot -Produced by GNUPLOT 5.4 patchlevel 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.1 - - - - - 1 - - - - - 2mm - - - - - 3mm - - - - - adi - - - - - atas - - - - - bicg - - - - - cholesky - - - - - covariance - - - - - doitgen - - - - - durbin - - - - - fdtd-2d - - - - - floyd-warshall - - - - - gemm - - - - - gemver - - - - - gesummv - - - - - heat-3d - - - - - jacobi-1d - - - - - jacobi-2d - - - - - lu - - - - - ludcmp - - - - - mvt - - - - - nussinov - - - - - seidel-2d - - - - - symm - - - - - syr2k - - - - - syrk - - - - - trisolv - - - - - trmm - - - - - - - - - Execution time relative to Vericert - - - - - list - - - list - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - hyper - - - hyper - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Vericert speed comparison - - - - - - - diff --git a/packages.el b/packages.el index 04ebec4..7bf1eed 100644 --- a/packages.el +++ b/packages.el @@ -10,3 +10,4 @@ (package-install 'org-transclusion) (package-install 'htmlize) (package-install 'gnuplot) +(package-install 'gnuplot-mode) diff --git a/publish.el b/publish.el index edc53da..1666c3e 100644 --- a/publish.el +++ b/publish.el @@ -8,6 +8,13 @@ (require 'oc) (require 'oc-basic) (require 'cl-lib) +(require 'gnuplot) +(require 'gnuplot-mode) +(require 'ob) +(require 'ob-gnuplot) + +(org-babel-do-load-languages + 'org-babel-load-languages '((gnuplot . t))) (setq org-html-coding-system 'utf-8-unix) -- cgit