Merge branch 'dev' of code.it4i.cz:bes0030/lib4neuro into dev

build_scripts/load_salomon_modules.inc

 module purge
 export GIT_EXEC=/apps/all/git/2.8.0/libexec/git-core/git
 
-ml CMake/3.13.1
+ml CMake/3.16.0-rc3
 ml OpenBLAS
 ml PETSc/3.7.5-intel-2018.04-it4i
 
 ml GCCcore/8.3.0
 ml Boost/1.68.0-intel-2018.04
 
+

build_scripts/load_salomon_modules.inc.BACKUP.22564.inc

+module purge
+export GIT_EXEC=/apps/all/git/2.8.0/libexec/git-core/git
+
+<<<<<<< HEAD
+ml Armadillo
+ml CMake/3.16.0-rc3
+ml OpenBLAS
+ml Valgrind
+ml Boost/1.68.0-intel-2018.04
+ml PETSc
+=======
+ml CMake/3.13.1
+ml OpenBLAS
+ml PETSc/3.7.5-intel-2018.04-it4i
+>>>>>>> 25ee61e50ac610751efe62b1dfa2d113658a8f0f
+
+ml GCCcore/8.3.0
+ml Boost/1.68.0-intel-2018.04
+

build_scripts/load_salomon_modules.inc.BASE.22564.inc

+module purge
+
+ml Armadillo
+ml Boost
+ml CMake/3.13.1
+ml OpenBLAS
+ml GCCcore/9.1.0
+ml MPICH/3.2.1-GCC-6.3.0-2.27
+ml Valgrind
+ml PETSc
+ml GCCcore/8.2.0
+
+export GIT_EXEC=/apps/all/git/2.8.0/libexec/git-core/git
+

build_scripts/load_salomon_modules.inc.LOCAL.22564.inc

+module purge
+
+ml Armadillo
+ml CMake/3.16.0-rc3
+ml OpenBLAS
+ml Valgrind
+ml Boost/1.68.0-intel-2018.04
+ml PETSc
+
+export GIT_EXEC=/apps/all/git/2.8.0/libexec/git-core/git
+

build_scripts/load_salomon_modules.inc.REMOTE.22564.inc

+module purge
+export GIT_EXEC=/apps/all/git/2.8.0/libexec/git-core/git
+
+ml CMake/3.13.1
+ml OpenBLAS
+ml PETSc/3.7.5-intel-2018.04-it4i
+
+ml GCCcore/8.3.0
+ml Boost/1.68.0-intel-2018.04
+