From 15391d84fe45256f6c75ea5da42834ef98141448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Thu, 19 Dec 2019 11:49:24 +0100
Subject: [PATCH] 	new file:   g/Go/Go-1.13.5.eb 	modified:  
 p/PETSc/PETSc-3.12.2-intel-2018a-it4i.eb 	new file:  
 p/PETSc/PETSc-3.12.2-intel-2019a-it4i.eb 	modified:  
 s/Singularity/Singularity-3.5.2.eb

---
 g/Go/Go-1.13.5.eb                        | 24 ++++++++++
 p/PETSc/PETSc-3.12.2-intel-2018a-it4i.eb |  1 +
 p/PETSc/PETSc-3.12.2-intel-2019a-it4i.eb | 56 ++++++++++++++++++++++++
 s/Singularity/Singularity-3.5.2.eb       |  5 ++-
 4 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 g/Go/Go-1.13.5.eb
 create mode 100644 p/PETSc/PETSc-3.12.2-intel-2019a-it4i.eb

diff --git a/g/Go/Go-1.13.5.eb b/g/Go/Go-1.13.5.eb
new file mode 100644
index 00000000..670ef72d
--- /dev/null
+++ b/g/Go/Go-1.13.5.eb
@@ -0,0 +1,24 @@
+# It4Innovations 2019
+
+easyblock = 'Tarball'
+
+name = 'Go'
+version = '1.13.5'
+
+homepage = 'http://www.golang.org'
+description = """Go is an open source programming language that makes it easy to build
+ simple, reliable, and efficient software."""
+
+toolchain = SYSTEM
+
+source_urls = ['https://dl.google.com/go/']
+sources = ['%(namelower)s%(version)s.linux-amd64.tar.gz']
+
+sanity_check_paths = {
+    'files': ['bin/go', 'bin/gofmt'],
+    'dirs': ['api', 'doc', 'lib', 'pkg'],
+}
+
+modextravars = {'GOROOT': '%(installdir)s'}
+
+moduleclass = 'compiler'
diff --git a/p/PETSc/PETSc-3.12.2-intel-2018a-it4i.eb b/p/PETSc/PETSc-3.12.2-intel-2018a-it4i.eb
index 72fed650..b24f8151 100644
--- a/p/PETSc/PETSc-3.12.2-intel-2018a-it4i.eb
+++ b/p/PETSc/PETSc-3.12.2-intel-2018a-it4i.eb
@@ -1,4 +1,5 @@
 # IT4Innovations 2019
+# kompilovat na cn
 
 easyblock = 'ConfigureMake'
 name = 'PETSc'
diff --git a/p/PETSc/PETSc-3.12.2-intel-2019a-it4i.eb b/p/PETSc/PETSc-3.12.2-intel-2019a-it4i.eb
new file mode 100644
index 00000000..fa618af5
--- /dev/null
+++ b/p/PETSc/PETSc-3.12.2-intel-2019a-it4i.eb
@@ -0,0 +1,56 @@
+# IT4Innovations 2019
+# kompilovat na cn
+
+easyblock = 'ConfigureMake'
+name = 'PETSc'
+version = '3.12.2'
+versionsuffix = '-it4i'
+
+homepage = 'http://www.mcs.anl.gov/petsc'
+description = """PETSc, pronounced PET-see (the S is silent), is a suite of data structures and routines for the
+ scalable (parallel) solution of scientific applications modeled by partial differential equations."""
+
+toolchain = {'name': 'intel', 'version': '2019a'}
+
+# build is still parallel, PETSc make doesnt support -j opt
+maxparallel = 0
+
+source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
+sources = [SOURCELOWER_TAR_GZ]
+
+# (build) dependencies provided through EasyBuild
+builddependencies = [('CMake', '3.16.0', '-rc3', True)]
+
+# configure installs dependencies -> remove installdir before configure
+keeppreviousinstall = True
+preconfigopts = 'rm -rf %(installdir)s;'
+
+petscArch = 'intel-opt'
+petscDir = '%(builddir)s/%(namelower)s-%(version)s'
+
+# config options
+configopts = '--CFLAGS=-O3 -xHost --CXXFLAGS=-O3 -xHost --FFLAGS=-O3 -xHost --with-c++-support --with-pic=1 '
+configopts += '--with-cc=mpicc --with-cxx=mpicxx --with-fc=mpif90 --with-debugging=0 --with-gnu-compilers=0 '
+configopts += '--with-mpi=1 --with-x=0 '
+configopts += '--download-metis --download-parmetis --download-mumps --download-superlu --download-superlu_dist '
+configopts += '--with-blas-lapack-lib=[$EBROOTIMKL/mkl/lib/intel64_lin/libmkl_intel_lp64.a,libmkl_sequential.a,libmkl_core.a] '
+configopts += '--with-scalapack-include=$EBROOTIMKL/mkl/include '
+configopts += '--with-scalapack-lib=[$EBROOTIMKL/mkl/lib/intel64_lin/libmkl_scalapack_lp64.a,libmkl_blacs_intelmpi_lp64.a,libmkl_intel_lp64.a,libmkl_sequential.a,libmkl_core.a] '
+configopts += '--with-scalapack=1 '
+configopts += 'PETSC_ARCH=%s' % petscArch
+
+installopts = 'PETSC_DIR=%s PETSC_ARCH=%s' % (petscDir, petscArch)
+buildopts = installopts + ' all'
+
+modextravars = {'PETSC_DIR': '%(installdir)s'}
+modextrapaths = {'PATH': 'lib/petsc/bin'}
+
+moduleclass = 'numlib'
+
+# sanity checks
+runtest = 'test'   # run make test after make
+sanity_check_paths = {
+    'files': ['include/petscconf.h', 'lib/libpetsc.so'],
+    'dirs': []
+}
+sanity_check_commands = [('petscmpiexec', '-h')]
diff --git a/s/Singularity/Singularity-3.5.2.eb b/s/Singularity/Singularity-3.5.2.eb
index 833a2fe8..9cfd86db 100644
--- a/s/Singularity/Singularity-3.5.2.eb
+++ b/s/Singularity/Singularity-3.5.2.eb
@@ -6,6 +6,7 @@ easyblock = 'ConfigureMake'
 
 name = 'Singularity'
 version = '3.5.2'
+versionsuffix = 'test'
 
 homepage = 'https://github.com/sylabs/singularity'
 description = "Singularity is an open source container platform designed to be simple, fast, and secure. Singularity is optimized for EPC and HPC workloads, allowing untrusted users to run untrusted containers in a trusted way."
@@ -16,7 +17,7 @@ source_urls = ['https://github.com/sylabs/singularity/releases/download/v%s/' %
 sources = ['singularity-%(version)s.tar.gz']
 
 builddependencies = [
-        ('Go', '1.13.1'),
+        ('Go', '1.13.5'),
 ]
 
 dependencies = [
@@ -37,7 +38,7 @@ postinstallcmds = [
 ]
 
 # next steps after installation
-# INSTALLATION_PATH=your_installation_path
+# INSTALLATION_PATH=/apps/all
 # chown root:root $INSTALLATION_PATH/Singularity/*/etc/singularity/singularity.conf
 # chown root:root $INSTALLATION_PATH/Singularity/*/etc/singularity/capability.json
 # chown root:root $INSTALLATION_PATH/Singularity/*/etc/singularity/ecl.toml