diff --git a/README.md b/README.md
index 9cd2312d512e18e74aa7b79a4cca6fd259df96fd..86e467e295b8adcbefedf7d0b05df9cb4435887f 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Převod html dokumentace do md formátu (version 0.4) - BETA
+Převod html dokumentace do md formátu (version 0.45) - BETA
===========================================================
VĂ˝sledkem projektu by mÄ›l bĂ˝t skript pro staĹľenĂ a pĹ™evod stávajĂcĂ dokumentace na docs.it4i.cz do md formátu
@@ -23,7 +23,7 @@ Pro svou práci si naklonujete Gitem repozitář do svĂ©ho pracovnĂho adresář
>**Změny v nové verzi**
> * oprava odkazu na obrázky a vylepšenĂ© filtrovánĂ
> * přehled o počtu souboru a stavu převodu
-> * optimalizace, zaÄŤlenÄ›nĂ testovacĂch funkcĂ do hlavnĂ vÄ›tve programu
+> * formátovánà tabulek - některé typy
### Funkce skriptu
diff --git a/html_md.sh b/html_md.sh
index f8ab0f1affbb801280ae5e43d69b7103832ce1b7..c3424f2143dc2d1dbf86cdb420443c20c4f0e5e8 100755
--- a/html_md.sh
+++ b/html_md.sh
@@ -2,18 +2,47 @@
### DOWNLOAD AND CONVERT DOCUMENTATION
# autor: kru0052
-# version: 0.4
-# change: repair bugs and optimalizations
-# bugs: bad formatting tables, bad links for other files, stayed a few html elements, formatting bugs...
+# version: 0.45
+# change: repair tables
+# bugs: bad links for other files, stayed a few html elements, formatting bugs...
###
if [ "$1" = "-t" ]; then
# testing new function
echo "Testing..."
+ printf "\t\tformatting tables...\n"
+ cat ./test > ./test.md;
+
+ while read x ; do
+ arg1=`echo "$x" | cut -d"&" -f1 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`;
+ arg2=`echo "$x" | cut -d"&" -f2 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`;
+
+ sed -e 's/'"$arg1"'/'"$arg2"'/' ./test.md > ./test.tmp;
+
+ sed -e :a -e '/\\$/N; s/\\\n//; ta' ./test.tmp > ./test.md;
+ #cat ./test.tmp > ./test.md;
+ done < ./source/tab
+
+
+
+fi
+if [ "$1" = "-t1" ]; then
+
+ count=$(find . -name "*.html" -type f | wc -l)
+
+ if [ $count -eq 151 ]; then
+ echo "true - $count";
+ else
+ echo "false - $count";
+
+ exit;
+fi
+
fi
if [ "$1" = "-w" ]; then
# download html pages
+ rm -rf docs.it4i.cz
wget -X pbspro-documentation,changelog,whats-new,portal_css,portal_javascripts,++resource++jquery-ui-themes,anselm-cluster-documentation/icon.jpg -R favicon.ico,pdf.png,logo.png,background.png,application.png,search_icon.png,png.png,sh.png,touch_icon.png,anselm-cluster-documentation/icon.jpg,*js,robots.txt,*xml,RSS,download_icon.png,pdf,*zip,*rar,@@*,anselm-cluster-documentation/icon.jpg.1 --mirror --convert-links --adjust-extension --page-requisites --no-parent https://docs.it4i.cz;
wget --directory-prefix=./docs.it4i.cz/ http://verif.cs.vsb.cz/aislinn/doc/report.png
@@ -62,6 +91,13 @@ if [ "$1" = "-c" ]; then
DOWN=$((LAST-END+2))
sed '1,'"$((HEAD-1))"'d' "$i" | sed -n -e :a -e '1,'"$DOWN"'!{P;N;D;};N;ba' > "${i%.*}TMP.html"
+
+ #while read x ; do
+ # arg1=`echo "$x" | cut -d"&" -f1 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`;
+ # arg2=`echo "$x" | cut -d"&" -f2 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`;
+
+ # sed -e 's/'"$arg1"'/'"$arg2"'/' "${i%.*}TMP.html" > "${i%.*}.html";
+ #done < ./source/tabHTML
# converted .html to .md
printf "\t\t.html -> .md\n"
@@ -70,7 +106,7 @@ if [ "$1" = "-c" ]; then
# second filtering html and css elements...
printf "\t\tsecond filtering html and css elements...\n"
- sed -e 's/``` /```/' "${i%.*}.md" | sed -e 's/ //' | sed -e 's/<\/div>//g' | sed '/^<div/d' | sed -e 's/<\/span>//' | sed -e 's/^\*\*//' | sed -e 's/\\//g' | sed -e 's/^: //g' | sed -e 's/^Obsah//g' > "${i%.*}TMP.md";
+ sed -e 's/``` /```/' "${i%.*}.md" | sed -e 's/<\/div>//g' | sed '/^<div/d' | sed -e 's/<\/span>//' | sed -e 's/^\*\*//' | sed -e 's/\\//g' | sed -e 's/^: //g' | sed -e 's/^Obsah//g' > "${i%.*}TMP.md";
while read x ; do
arg1=`echo "$x" | cut -d"&" -f1 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`;
arg2=`echo "$x" | cut -d"&" -f2 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`;
@@ -86,9 +122,19 @@ if [ "$1" = "-c" ]; then
arg2=`echo "$x" | cut -d"&" -f2 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`;
sed -e 's/'"$arg1"'/'"$arg2"'/' "${i%.*}TMP.md" > "${i%.*}.md";
- cat "${i%.*}.md" > "${i%.*}TMP.md";
+ cat -s "${i%.*}.md" > "${i%.*}TMP.md";
done < ./source/repairIMG
+ # repair tables
+ printf "\t\tformatting tables...\n"
+ #while read x ; do
+ # arg1=`echo "$x" | cut -d"&" -f1 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`;
+ # arg2=`echo "$x" | cut -d"&" -f2 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`;
+
+ # sed -e 's/'"$arg1"'/'"$arg2"'/' "${i%.*}TMP.md" > "${i%.*}.md";
+ # sed -e :a -e '/\\$/N; s/\\\n//; ta' "${i%.*}.md" > "${i%.*}TMP.md";
+ #done < ./source/tab
+
cat "${i%.*}TMP.md" > "${i%.*}.md";
# delete temporary files
@@ -108,35 +154,50 @@ if [ "$1" = "-c" ]; then
### create new folder and move converted files
# create folder info and view all files and folder
mkdir info;
- find ./docs.it4i.cz -name "*.png" -type f > ./info/list_image.txt;
- find ./docs.it4i.cz -name "*.jpg" -type f >> ./info/list_image.txt;
- find ./docs.it4i.cz -name "*.jpeg" -type f >> ./info/list_image.txt;
- find ./docs.it4i.cz -name "*.md" -type f> ./info/list_md.txt;
- find ./docs.it4i.cz -type d | sort > ./info/list_folder.txt
-
- rm -rf ./converted
-
- mkdir converted;
- (while read i;
- do
- mkdir "./converted/$i";
- done) < ./source/list_folder
-
- # move md files to new folders
- while read a b ; do
- cp "$a" "./converted/$b";
- done < <(paste ./info/list_md.txt ./source/list_md_mv)
+ echo "$(tput setaf 11)create folder info and file lists";
+ find ./docs.it4i.cz -name "*.png" -type f > ./info/list_image;
+ find ./docs.it4i.cz -name "*.jpg" -type f >> ./info/list_image;
+ find ./docs.it4i.cz -name "*.jpeg" -type f >> ./info/list_image;
+ find ./docs.it4i.cz -name "*.md" -type f> ./info/list_md;
+ find ./docs.it4i.cz -type d | sort > ./info/list_folder;
+
+ count=$(find . -name "*.md" -type f | wc -l)
+ if [ $count -eq 150 ]; then
+ rm -rf ./converted
+
+ mkdir converted;
+ (while read i;
+ do
+ mkdir "./converted/$i";
+ done) < ./source/list_folder
+
+ # move md files to new folders
+ echo "$(tput setaf 11)moved md files";
+ while read a b ; do
+ mv "$a" "./converted/$b";
+ done < <(paste ./info/list_md ./source/list_md_mv)
- # copy jpg and jpeg to new folders
- while read a b ; do
- cp "$a" "./converted/$b";
- done < <(paste ./info/list_image.txt ./source/list_image_mv.txt)
- cp ./docs.it4i.cz/salomon/salomon ./converted/docs.it4i.cz/salomon/salomon
- cp ./docs.it4i.cz/salomon/salomon-2 ./converted/docs.it4i.cz/salomon/salomon-2
- cp ./converted/docs.it4i.cz/salomon/resource-allocation-and-job-execution/fairshare_formula.png ./converted/docs.it4i.cz/anselm-cluster-documentation/resource-allocation-and-job-execution/fairshare_formula.png
- cp ./converted/docs.it4i.cz/salomon/resource-allocation-and-job-execution/job_sort_formula.png ./converted/docs.it4i.cz/anselm-cluster-documentation/resource-allocation-and-job-execution/job_sort_formula.png
- cp ./converted/docs.it4i.cz/salomon/software/debuggers/vtune-amplifier.png ./converted/docs.it4i.cz/anselm-cluster-documentation/software/debuggers/vtune-amplifier.png
- cp ./converted/docs.it4i.cz/salomon/software/debuggers/Snmekobrazovky20160708v12.33.35.png ./converted/docs.it4i.cz/anselm-cluster-documentation/software/debuggers/Snmekobrazovky20160708v12.33.35.png
- cp ./docs.it4i.cz/virtualization-job-workflow ./converted/docs.it4i.cz/anselm-cluster-documentation/software/
-
+ # copy jpg and jpeg to new folders
+ echo "$(tput setaf 11)copy image files";
+ while read a b ; do
+ cp "$a" "./converted/$b";
+ done < <(paste ./info/list_image ./source/list_image_mv)
+ cp ./docs.it4i.cz/salomon/salomon ./converted/docs.it4i.cz/salomon/salomon
+ cp ./docs.it4i.cz/salomon/salomon-2 ./converted/docs.it4i.cz/salomon/salomon-2
+ cp ./converted/docs.it4i.cz/salomon/resource-allocation-and-job-execution/fairshare_formula.png ./converted/docs.it4i.cz/anselm-cluster-documentation/resource-allocation-and-job-execution/fairshare_formula.png
+ cp ./converted/docs.it4i.cz/salomon/resource-allocation-and-job-execution/job_sort_formula.png ./converted/docs.it4i.cz/anselm-cluster-documentation/resource-allocation-and-job-execution/job_sort_formula.png
+ cp ./converted/docs.it4i.cz/salomon/software/debuggers/vtune-amplifier.png ./converted/docs.it4i.cz/anselm-cluster-documentation/software/debuggers/vtune-amplifier.png
+ cp ./converted/docs.it4i.cz/salomon/software/debuggers/Snmekobrazovky20160708v12.33.35.png ./converted/docs.it4i.cz/anselm-cluster-documentation/software/debuggers/Snmekobrazovky20160708v12.33.35.png
+ cp ./docs.it4i.cz/virtualization-job-workflow ./converted/docs.it4i.cz/anselm-cluster-documentation/software/
+
+ find ./converted -name "*.png" -type f > ./info/list_image_converted;
+ find ./converted -name "*.jpg" -type f >> ./info/list_image_converted;
+ find ./converted -name "*.jpeg" -type f >> ./info/list_image_converted;
+ find ./converted -name "*.md" -type f> ./info/list_md_converted;
+ find ./converted -type d | sort > ./info/list_folder_converted;
+
+ echo "$(tput setaf 11)COMPLETED...$(tput setaf 15)";
+ else
+ echo "$(tput setaf 9)Can not create a folder converted, because the number of MD files disagrees. The converted files remain in the folder docs.it4i.cz !!!!...$(tput setaf 15)";
+ fi
fi
diff --git a/source/list_folder b/source/list_folder
index 8852d0717b380f950aff65f91e7794447b61955c..78ea594919ec9eaa0b17fb4642da226409544daa 100644
--- a/source/list_folder
+++ b/source/list_folder
@@ -33,4 +33,3 @@
./docs.it4i.cz/salomon/software/mpi-1
./docs.it4i.cz/salomon/software/numerical-languages
./docs.it4i.cz/salomon/storage
-./docs.it4i.cz/salomon/uv-2000
diff --git a/source/list_image_mv b/source/list_image_mv
index d7335c8e1e85c6ffb1d218c89c6b212004ac7c73..dfceea15b76c3c930520d611bd32cd18eb7a84a1 100644
--- a/source/list_image_mv
+++ b/source/list_image_mv
@@ -67,7 +67,7 @@
./docs.it4i.cz/anselm-cluster-documentation/quality1.png
./docs.it4i.cz/anselm-cluster-documentation/software/omics-master-1/fig1.png
./docs.it4i.cz/salomon/software/debuggers/report.png
-./docs.it4i.cz/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vpnuiV.png
+./docs.it4i.cz/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/vpnuiV.png
./docs.it4i.cz/anselm-cluster-documentation/software/omics-master-1/fig4.png
./docs.it4i.cz/salomon/software/ansys/Fluent_Licence_2.jpg
./docs.it4i.cz/salomon/software/ansys/Fluent_Licence_4.jpg
diff --git a/source/list_md_mv b/source/list_md_mv
index cfb0e704abd6fe343808fcb11fc62657766ff6ac..49cab1d77ddcdb4ce634b8ce029c1635848cd1e9 100644
--- a/source/list_md_mv
+++ b/source/list_md_mv
@@ -1,4 +1,3 @@
-./docs.it4i.cz/get-started-with-it4innovations/introduction.md
./docs.it4i.cz/get-started-with-it4innovations/accessing-the-clusters/introduction.md
./docs.it4i.cz/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md
./docs.it4i.cz/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/cygwin-and-x11-forwarding.md
@@ -71,7 +70,6 @@
./docs.it4i.cz/salomon/storage/cesnet-data-storage.md
./docs.it4i.cz/salomon/storage/storage.md
./docs.it4i.cz/salomon/accessing-the-cluster.md
-./docs.it4i.cz/salomon/index.md
./docs.it4i.cz/salomon/hardware-overview-1/hardware-overview.md
./docs.it4i.cz/anselm-cluster-documentation/introduction.md
./docs.it4i.cz/anselm-cluster-documentation/hardware-overview.md
diff --git a/source/list_rm b/source/list_rm
index 60d141c76dbbe4c21e29b49854dff908ca0d3456..8c1e208065c9b1dd5d32010852ffeaeaf3485f5b 100644
--- a/source/list_rm
+++ b/source/list_rm
@@ -98,3 +98,4 @@
./docs.it4i.cz/sitemap.html
./docs.it4i.cz/whats-new.html
./docs.it4i.cz/salomon/index.html
+./docs.it4i.cz/get-started-with-it4innovations/introduction.html
diff --git a/source/repairIMG b/source/repairIMG
index f3705ba1a6024404c17d5402a7c03e4ce1a41ced..c5bbd4ab3468c5c7a642a1a1c28ce921c7cfa968 100644
--- a/source/repairIMG
+++ b/source/repairIMG
@@ -53,7 +53,7 @@ Preferences](gdmscreensaver.png/@@images/44048cfa-e854-4cb4-902b-c173821c2db1.pn
[](PuTTY_save_Salomon.png)&
[](PuTTY_open_Salomon.png)&
[](PuttyKeygeneratorV.png)&
- [](PuttyKeygenerator_001V.png)&
+ [](PuttyKeygenerator_001V.png)&
[](PuttyKeygenerator_002V.png)&
[](20150312_143443.png)&
[](PuttyKeygenerator_004V.png)&
@@ -106,3 +106,9 @@ Connect](Snmekobrazovky20160211v14.27.45.png/@@images/3550e4ae-2eab-4571-8387-11
&
&
+&
+screensaver](https://docs.it4i.cz/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc/gdmdisablescreensaver.png/@@images/8a4758d9-3027-4ce4-9a90-2d5e88197451.png "Disable lock screen and screensaver")](gdmdisablescreensaver.png)&
+[](gnome-terminal.png)&
+[](gnome-compute-nodes-over-vnc.png)&
diff --git a/source/replace b/source/replace
index b1c30cd98ffc0c7744f9f945fb2e686d05c29209..346ea0b427e794dedbda29abe43e37efedf6654c 100644
--- a/source/replace
+++ b/source/replace
@@ -146,3 +146,21 @@ Systems biology**&**Systems biology**
Workaround:**&**Workaround:**
-g** : Generates extra debugging information usable by GDB. -g3&-g** : Generates extra debugging information usable by GDB. -g3**
-O0** : Suppress all optimizations.&-O0** : Suppress all optimizations.**
+class="external-link">&
+ class="link-external">&
+class="WYSIWYG_LINK">&
+ class="wide-view-wrapper">&
+ class="listitem">&
+ class="emphasis">&
+<p><a href="x-window-system/cygwin-and-x11-forwarding.html" If no able to forward X11 using PuTTY to CygwinX</a>&[If no able to forward X11 using PuTTY to CygwinX](x-window-system/cygwin-and-x11-forwarding.html)
+<p><a href="http://x.cygwin.com/" Install Cygwin</a>&[Install Cygwin](http://x.cygwin.com/)
+class="visualHighlight">&
+{.spip_in&
+.external&
+nodes.****&nodes.
+###Compute Nodes Without Accelerator**&###Compute Nodes Without Accelerator
+###Compute Nodes With MIC Accelerator**&###Compute Nodes With MIC Accelerator
+###Compute Nodes With GPU Accelerator**&###Compute Nodes With GPU Accelerator
+###Fat Compute Nodes**&###Fat Compute Nodes
+**Figure Anselm bullx B510 servers****&**Figure Anselm bullx B510 servers**
+### Compute Nodes Summary********&### Compute Nodes Summary
diff --git a/source/tab b/source/tab
new file mode 100644
index 0000000000000000000000000000000000000000..7aaf44c46832a1b509a164420fedca91d41c6cac
--- /dev/null
+++ b/source/tab
@@ -0,0 +1,59 @@
+<table>&\\
+</th>&\\
+</td>&\\
+<td align="left">& |
+</tr>& |
+<tr class="odd">&\\
+<tr class="even">&\\
+</tbody>&\\
+</table>&\\
+<p> class="s1">&
+</p>&\\
+<colgroup>&\\
+<col width="50%" />&\\
+</colgroup>&\\
+<thead>&\\
+<tr class="header">&\\
+<tbody>&\\
+<th align="left">& |
+</thead>& | --- | --- |
+<th align="left">& |
+<br />&\\
+</p>&\\
+)\&)
+.\&.
+<p>&
+ compute nodes number of workers start-up time[s]&|compute nodes|number of workers|start-up time[s]|
+ --------------- ------------------- --------------------&|---|---|---|
+ 16 384 831&|16|384|831|
+ 8 192 807&|8|192|807|
+ 4 96 483&|4|96|483|
+ 2 48 16&|2|48|16|
+ Node type Count Range Memory Cores [Access](resource-allocation-and-job-execution/resources-allocation-policy.html)&|Node type|Count|Range|Memory|Cores|[Access](resource-allocation-and-job-execution/resources-allocation-policy.html)|
+ ---------------------------- ------- --------------- -------- ------------- --------------------------------------------------------------------------------------------------&|---|---|---|---|---|---|
+ Nodes without accelerator 180 cn[1-180] 64GB 16 @ 2.4Ghz qexp, qprod, qlong, qfree&|Nodes without accelerator|180|cn[1-180]|64GB|16 @ 2.4Ghz|qexp, qprod, qlong, qfree|
+ Nodes with GPU accelerator 23 cn[181-203] 96GB 16 @ 2.3Ghz qgpu, qprod&|Nodes with GPU accelerator|23|cn[181-203]|96GB|16 @ 2.3Ghz|qgpu, qprod|
+ Nodes with MIC accelerator 4 cn[204-207] 96GB 16 @ 2.3GHz qmic, qprod&|Nodes with MIC accelerator|4|cn[204-207]|96GB|16 @ 2.3GHz|qmic, qprod|
+ Fat compute nodes 2 cn[208-209] 512GB 16 @ 2.4GHz qfat, qprod&|Fat compute nodes|2|cn[208-209]|512GB|16 @ 2.4GHz|qfat, qprod|
+ Node Processor Memory Accelerator&|Node|Processor|Memory|Accelerator|
+ ------------------ --------------------------------------- -------- ----------------------&|---|---|---|---|
+ w/o accelerator 2x Intel Sandy Bridge E5-2665, 2.4GHz 64GB -&|w/o accelerator|2x Intel Sandy Bridge E5-2665, 2.4GHz|64GB|-|
+ GPU accelerated 2x Intel Sandy Bridge E5-2470, 2.3GHz 96GB NVIDIA Kepler K20&|GPU accelerated|2x Intel Sandy Bridge E5-2470, 2.3GHz|96GB|NVIDIA Kepler K20|
+ MIC accelerated 2x Intel Sandy Bridge E5-2470, 2.3GHz 96GB Intel Xeon Phi P5110&|MIC accelerated|2x Intel Sandy Bridge E5-2470, 2.3GHz|96GB|Intel Xeon Phi P5110|
+ Fat compute node 2x Intel Sandy Bridge E5-2665, 2.4GHz 512GB -&|Fat compute node|2x Intel Sandy Bridge E5-2665, 2.4GHz|512GB|-|
+ Login address Port Protocol Login node&|Login address|Port|Protocol|Login node|
+ ------------------------ ------ ---------- -----------------------------------------&|---|---|---|---|
+ salomon.it4i.cz 22 ssh round-robin DNS record for login[1-4]&|salomon.it4i.cz|22|ssh|round-robin DNS record for login[1-4]|
+ login1.salomon.it4i.cz 22 ssh login1&|login1.salomon.it4i.cz|22|ssh|login1|
+ login2.salomon.it4i.cz 22 ssh login2&|login1.salomon.it4i.cz|22|ssh|login1|
+ login3.salomon.it4i.cz 22 ssh login3&|login1.salomon.it4i.cz|22|ssh|login1|
+ login4.salomon.it4i.cz 22 ssh login4&|login1.salomon.it4i.cz|22|ssh|login1|
+ Toolchain Module(s)&|Toolchain|Module(s)|
+ -------------------- ------------------------------------------------&|---|----|
+ GCC GCC&|GCC|GCC|
+ ictce icc, ifort, imkl, impi&|ictce|icc, ifort, imkl, impi|
+ intel GCC, icc, ifort, imkl, impi&|intel|GCC, icc, ifort, imkl, impi|
+ gompi GCC, OpenMPI&|gompi|GCC, OpenMPI|
+ goolf BLACS, FFTW, GCC, OpenBLAS, OpenMPI, ScaLAPACK&|goolf|BLACS, FFTW, GCC, OpenBLAS, OpenMPI, ScaLAPACK|
+ >iompi OpenMPI, icc, ifort&|iompi|OpenMPI, icc, ifort|
+ iccifort icc, ifort&|iccifort|icc, ifort|
diff --git a/source/tabHTML b/source/tabHTML
new file mode 100644
index 0000000000000000000000000000000000000000..4ba3f28b499c639a21454d14fb7fa2cf6c415fa7
--- /dev/null
+++ b/source/tabHTML
@@ -0,0 +1,9 @@
+<table class="listing">&<table class="plain">
+<tr class="odd">&<tr>
+<tr class="even">&<tr>
+<table class="plain" id="big-picture-of-cluster">&<table class="plain">
+<td title="Login nodes">&<td>
+<table class="filled">&<table class="plain">
+<td title="Compute nodes">&<td>
+<table class="filled" id="blade-chassis">&<table class="plain">
+<td title="Compute nodes">&<td>