From 0d509c4c9753aee390cec1413e55e079194c52a2 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: Mon, 12 Jun 2017 10:19:13 +0200
Subject: [PATCH] 	modified:  
 a/ATLAS/ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb 	new file:  
 o/Octave/Octave-4.2.1-intel-2017a-without-X11.eb 	deleted:   
 a/ATLAS/.ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb.swp 	deleted:   
 "a/ATLAS/\\"

---
 ...-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb.swp | Bin 12288 -> 0 bytes
 ...TLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb |   5 +-
 "a/ATLAS/\\"                                  |  37 ------------
 .../Octave-4.2.1-intel-2017a-without-X11.eb   |  54 ++++++++++++++++++
 4 files changed, 58 insertions(+), 38 deletions(-)
 delete mode 100644 a/ATLAS/.ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb.swp
 delete mode 100644 "a/ATLAS/\\"
 create mode 100644 o/Octave/Octave-4.2.1-intel-2017a-without-X11.eb

diff --git a/a/ATLAS/.ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb.swp b/a/ATLAS/.ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb.swp
deleted file mode 100644
index 5eb84a21b7bdc8ed6e4a3b538c8ca338a17ea988..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2&u<$=6vwAX2&GVd{{at&bZz0?b)1l(R6aN+ttt{6)d96aAsX+F?IHV1v$MEK
zRp^O3;=sSal?xXn1Sbw4P8_(maOcn~@ZI&sNt`BkU{?Ct-kmq|-hAHMl`X%1<Ncdk
zwCXG~94|8V<0or(9)H(-^@}aW1Wyn8nGF1V?1CeRhcYS_xWEWQE>DuwovvDZ^5SS9
zhp8>~vUIuI-q~#TCa?CAv)FK!>>Hhqz2Yo64ZG<ySMAOAcDwTq23MR#NAxfDXhsbI
zL!cm#>4E*$6}Hq|Y~<(jmDlK%m)|pR3;{#H5HJJ`0YktLFa!(%L*RczKqr^jr`YdP
z<({4L{nE^Pd1~Ga0YktLFa!(%L%<L)1PlQ~zz{G53;{#nUr2!C&;9Nk{tvv2;PL<e
z(eM99FEI8H`W5;C`X2fmT7iChp0PvdLuePOLYJXA=<yZCeujR6zJ>Zw3%Ulm&@<2<
z&oTB0dI)_DJ%Dzh7F2<Lf0nUtpm(7L^b+(Z;`;^q3i=FEP#<bR*Pt~h-@_dAH1s$2
z^cVC1pAVofA#)f4hJYbp2p9r}fFbZ7BM`=Z76>okX-X}!qAUz#-@@0TT{cfo9t^`c
z%n!_bvH`xBvGYd=hvg;Imyt^gRT-t42Z1kDEp>5?>|0iyO^kdhI!SS!#HlVVz0l7?
z{eUG(l$YW}r}PHG5Ba_zEki+9uad>)&ofE1Hxl0d#Ogew^G)E%D`T53QAAn<GCN9a
z(yuy=(!S1#2Sc(4+c!JbnNfQz^~jEdMkeflC*0e&HCF=}h}LX3Y#L|E6X~=GwlrTz
z9X&iGixy~d<zu1F`03NiGLii@d3f0tk(OE5+3vNPZ#Ei$cOvK(RqS3$gVj}pM3%kz
zdUa#{R=2x@HrtwuYgot*hJ#pX#UqO<<>X9>J)~<7ga`6&USE!tr|rbjdDhOboEZ=I
zQ5};~nBtx>5qA?fr_S}w_KjYvVt1D&bSqDq0GCJhw{M>_10`J4;3=S|c$P)FP>pyf
zf_N-YzzbD?PGua`kN~cn{$UfvTPCR}+H%>E*2$Xdj>ltXl4vJZLwDlLE$hE(l~$Aa
zpgR<~wVSB;BjM@P4LJ&hYuvnUULC31)4U%D_e2<0oh&~dM?uVet9BI2UZ#S{O~lH8
z(`-<t=%`tGAw9KSHZ7z)k3}an9uqo_18>A-R95~yE0LbHMms7K_m4+0<(`#u!jOfc
z$)hSA=U0w9wXOS%<@bi@D^B}DMIs>7m*VQcsZ=VA;)wJ}&^k}0N1HMdTv5BU?`3_U
z87dy8R9#0;c&$#H#?lwT0cEN1>y!uujv<dcVS7qy>G7Zr55+pHSh~H@?NPOz=@@v0
zPa9z(Rc=S!1dkSZ$Tbp7@ql{qK##c+HA=YRz8r>ic+;a|8I*a7dx}Juj1X)}%oizK
zVhzm39aX6med|+KxeLU(lSObkyR)e$ER^pbP4NLHl##Ge9EyYwMV^|nXpU>cnW-P7
ntz<vRWZp1uu{=BZc@Y#$ijMmr#zPVpJ4M4iZs#pLU@i6!qa;Sm

diff --git a/a/ATLAS/ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb b/a/ATLAS/ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb
index c839b0f2..e57930b1 100644
--- a/a/ATLAS/ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb
+++ b/a/ATLAS/ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb
@@ -30,7 +30,10 @@ preconfigopts += 'mkdir build && '
 preconfigopts += 'cd build && '
 configure_cmd_prefix = '.'
 configopts = "-Ss f77lib '-L$(EBROOTGCC)/lib64 -lgfortran' "
-configopts += '-b 64  -D c -DPentiumCPS=2500 '
+# salomon
+#configopts += '-b 64  -D c -DPentiumCPS=2500 '
+#anselm
+configopts += '-b 64  -D c -DPentiumCPS=2300 '
 configopts += '--with-netlib-lapack-tarfile=/apps/easybuild/sources/a/ATLAS/lapack-%s.tgz ' % lapackver
 configopts += '-Fa alg -fPIC'
 prebuildopts = 'cd build && ' 
diff --git "a/a/ATLAS/\\" "b/a/ATLAS/\\"
deleted file mode 100644
index f1a3a28d..00000000
--- "a/a/ATLAS/\\"
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ATLAS'
-version = '3.10.3'
-versionsuffix = '-test
-
-homepage = 'http://math-atlas.sourceforge.net'
-description = """ATLAS (Automatically Tuned Linear Algebra Software) is the application of
- the AEOS (Automated Empirical Optimization of Software) paradigm, with the present emphasis 
- on the Basic Linear Algebra Subprograms (BLAS), a widely used, performance-critical, linear 
- algebra kernel library."""
-
-toolchain = {'name': 'GCC', 'version': '7.1.0-2.28'}
-toolchainopts = {'pic': True}
-
-lapackver = '3.6.1'
-versionsuffix = '-LAPACK-%s' % lapackver
-
-source_urls = [
-    ('http://sourceforge.net/projects/math-atlas/files/Stable/%(version)s', 'download'),
-    'http://www.netlib.org/lapack/',
-]
-sources = [
-    '%(namelower)s%(version)s.tar.bz2',
-    'lapack-%s.tgz' % lapackver,
-]
-
-preconfigopts = 'mkdir build && '
-preconfigopts += 'cd build && '
-configure_cmd_prefix = '.'
-configopts = '-Ss f77lib '
-configopts = '-L$(EBROOTGCC)/lib64 -lgfortran ' 
-configopts = '-b 64  -D c -DPentiumCPS=2299 '
-configopts = '--with-netlib-lapack-tarfile=/apps/easybuild/sources/a/ATLAS/lapack-%s.tgz ' % lapackver
-configopts = '-Fa alg -fPIC'
-
-moduleclass = 'numlib'
diff --git a/o/Octave/Octave-4.2.1-intel-2017a-without-X11.eb b/o/Octave/Octave-4.2.1-intel-2017a-without-X11.eb
new file mode 100644
index 00000000..a890f5ba
--- /dev/null
+++ b/o/Octave/Octave-4.2.1-intel-2017a-without-X11.eb
@@ -0,0 +1,54 @@
+easyblock = 'ConfigureMake'
+
+name = 'Octave'
+version = '4.2.1'
+versionsuffix = '-without-X11'
+
+homepage = 'http://www.gnu.org/software/octave/'
+description = """GNU Octave is a high-level interpreted language, primarily intended for numerical computations."""
+
+toolchain = {'name': 'intel', 'version': '2017a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['%(name)s-%(version)s_intel.patch']
+
+builddependencies = [
+    ('Bison', '3.0.4', '', True),
+    ('flex', '2.6.4', '', True),
+    ('Autotools', '20150215', '', True),
+    ('libtool', '2.4.6', '', True),
+    ('gperf', '3.0.4'),
+]
+
+dependencies = [
+    ('PCRE', '8.40', '', True),
+    ('ncurses', '6.0', '', True),
+    ('libreadline', '7.0', '', True),
+    ('arpack-ng', '3.5.0'),
+    ('cURL', '7.53.1', '', True),
+    ('FLTK', '1.3.4', '', True),
+    ('zlib', '1.2.11', '', True),
+    ('Qt5', '5.8.0', '', ('GCC', '6.3.0-2.27')),
+    ('HDF5', '1.8.18', '-serial'),
+    ('FFTW', '3.3.6'),
+]
+
+configopts = 'MOC=$EBROOTQT5/bin/moc '
+configopts += 'UIC=$EBROOTQT5/bin/uic '
+configopts += 'RCC=$EBROOTQT5/bin/rcc '
+configopts += 'LRELEASE=$EBROOTQT5/bin/lrelease '
+configopts += '--with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK" --disable-docs '
+configopts += '--without-opengl --without-qhull '
+# correct for both GCC and Intel compilers
+configopts += '--enable-fortran-calling-convention=gfortran'
+
+sanity_check_paths = {
+    'files': ['bin/octave'],
+    'dirs': []
+}
+
+sanity_check_commands = [('octave', '--eval "1+2"')]
+
+moduleclass = 'math'