Commit 4db09de5 authored by Lukáš Krupčík's avatar Lukáš Krupčík

new file: a/ACTC/ACTC-1.1-intel-2017a.eb

	new file:   d/darshan/darshan-runtime-3.1.4-foss-2017a.eb
	new file:   d/darshan/darshan-util-3.1.4-foss-2017a.eb
	new file:   e/eudev/eudev-3.1.5-intel-2017a.eb
	new file:   f/FFmpeg/FFmpeg-3.1.3-intel-2017a.eb
	new file:   f/flex/flex-2.6.6.eb
	new file:   f/fontsproto/fontsproto-2.1.3-intel-2017a.eb
	new file:   g/glproto/glproto-1.4.17-intel-2017a.eb
	new file:   i/ImageMagick/ImageMagick-7.0.7.27-intel-2017a.eb
	new file:   l/libXau/libXau-1.0.8-intel-2017a.eb
	new file:   l/libXdamage/libXdamage-1.1.4-intel-2017a.eb
	new file:   l/libXfont/libXfont-1.5.1-intel-2017a.eb
	new file:   m/Mesa/Mesa-13.0.0-intel-2017a.eb
	new file:   m/Mesa/Mesa-17.2.6-intel-2017a.eb
	new file:   m/Molden/Molden-5.7-intel-2017b.eb
	new file:   m/mkl/mkl-2018.1.163.eb
	new file:   n/numpy/numpy-1.14.1-mkl-Py-3.6.eb
	new file:   p/Perl/Perl-5.26.1-foss-2017a.eb
	new file:   v/VMD/VMD-1.9.3-intel-2017b-Py-2.7.eb
	new file:   v/VMD/VMD-1.9.3_configure.patch
	new file:   x/x264/x264-20160430-intel-2017a.eb
	deleted:    n/numpy/numpy-1.14.1-Py-3.6.eb
parent a896c0b0
# IT4Innovations 2018
easyblock = 'MakeCp'
name = 'ACTC'
version = '1.1'
homepage = 'https://sourceforge.net/projects/actc'
description = "ACTC converts independent triangles into triangle strips or fans."
toolchain = {'name': 'intel', 'version': '2017a'}
source_urls = [SOURCEFORGE_SOURCE]
sources = [SOURCELOWER_TAR_GZ]
buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
files_to_copy = [
(['tcsample', 'tctest', 'tctest2'], 'bin'),
(['tc.h'], 'include/ac'),
(['libactc.a'], 'lib'),
'COPYRIGHT', 'manual.html', 'prims.gif', 'README',
]
sanity_check_paths = {
'files': ['bin/tctest', 'bin/tctest2', 'bin/tcsample', 'include/ac/tc.h', 'lib/libactc.a',
'COPYRIGHT', 'manual.html', 'prims.gif', 'README'],
'dirs': [],
}
modextrapaths = {'CPATH': 'include/ac'}
moduleclass = 'lib'
easyblock = "ConfigureMake"
name = "darshan-runtime"
version = "3.1.4"
homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
description = """Darshan is designed to capture an accurate picture of
application I/O behavior, including properties such as patterns of
access within files, with minimum overhead. The name is taken from a
Sanskrit word for “sight” or “vision”.
Darshan can be used to investigate and tune the I/O behavior of
complex HPC applications. In addition, Darshan’s lightweight design
makes it suitable for full time deployment for workload
characterization of large systems. We hope that such studies will
help the storage research community to better serve the needs of
scientific computing.
Darshan was originally developed on the IBM Blue Gene series of
computers deployed at the Argonne Leadership Computing Facility, but
it is portable across a wide variety of platforms include the Cray
XE6, Cray XC30, and Linux clusters. Darshan routinely instruments
jobs using up to 786,432 compute cores on the Mira system at ALCF.
"""
usage = """
Export the environment variable DARSHAN_LOG_PATH to where the logging
data should be written, e.g.
LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
DARSHAN_LOG_PATH=/path/to/your/logdir \
"""
toolchain = {'name': 'foss', 'version': '2017a'}
sources = ['http://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
subpath = 'darshan-runtime'
preconfigopts = 'cd %s;' % subpath
configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH --with-jobid-env=SLURM_JOBID CC=mpicc'
prebuildopts = 'cd %s;' % subpath
preinstallopts = 'cd %s;' % subpath
sanity_check_paths = {
'files': ["lib/libdarshan.so"],
'dirs': []
}
moduleclass = 'lib'
easyblock = "ConfigureMake"
name = "darshan-util"
version = "3.1.4"
homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
description = """Darshan is designed to capture an accurate picture of
application I/O behavior, including properties such as patterns of
access within files, with minimum overhead. The name is taken from a
Sanskrit word for “sight” or “vision”.
Darshan can be used to investigate and tune the I/O behavior of
complex HPC applications. In addition, Darshan’s lightweight design
makes it suitable for full time deployment for workload
characterization of large systems. We hope that such studies will
help the storage research community to better serve the needs of
scientific computing.
Darshan was originally developed on the IBM Blue Gene series of
computers deployed at the Argonne Leadership Computing Facility, but
it is portable across a wide variety of platforms include the Cray
XE6, Cray XC30, and Linux clusters. Darshan routinely instruments
jobs using up to 786,432 compute cores on the Mira system at ALCF.
"""
usage = """
The result is a darshan log file which can be converted using
darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
"""
toolchain = {'name': 'foss', 'version': '2017a'}
sources = ['http://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
subpath = 'darshan-util'
preconfigopts = 'cd %s;' % subpath
prebuildopts = 'cd %s;' % subpath
preinstallopts = 'cd %s;' % subpath
sanity_check_paths = {
'files': ["bin/darshan-job-summary.pl"],
'dirs': []
}
dependencies = [
('gnuplot', '5.0.6', '', ('GCC', '6.3.0-2.27')),
('Perl', '5.26.1'),
]
moduleclass = 'lib'
easyblock = 'ConfigureMake'
name = 'eudev'
version = '3.1.5'
homepage = 'https://wiki.gentoo.org/wiki/Project:Eudev'
description = """eudev is a fork of systemd-udev with the goal of obtaining
better compatibility with existing software such as
OpenRC and Upstart, older kernels, various toolchains
and anything else required by users and various distributions."""
toolchain = {'name': 'intel', 'version': '2017a'}
toolchainopts = {'cstd': 'c99'}
sources = [SOURCE_TAR_GZ]
source_urls = ['http://dev.gentoo.org/~blueness/%(name)s/']
patches = ['%(name)s-3.1.2_pre-2.6.34_kernel.patch']
builddependencies = [
('gperf', '3.0.4'),
]
osdependencies = [('kernel-headers', 'linux-libc-dev')]
configopts = '--disable-blkid --disable-selinux --disable-manpages '
runtest = 'check'
sanity_check_paths = {
'files' : ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
'dirs' : [],
}
maxparallel = 1
moduleclass = 'system'
# IT4Innovations 2018
easyblock = 'ConfigureMake'
name = 'FFmpeg'
version = '3.1.3'
homepage = 'https://www.ffmpeg.org/'
description = """A complete, cross-platform solution to record, convert and stream audio and video."""
toolchain = {'name': 'intel', 'version': '2017a'}
sources = [SOURCELOWER_TAR_BZ2]
source_urls = ['http://ffmpeg.org/releases/']
dependencies = [
('NASM', '2.12.02', '', True),
('zlib', '1.2.11', '', True),
('x264', '20160430'),
]
configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
configopts += '--enable-libx264'
sanity_check_paths = {
'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server']] +
['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc',
'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
'dirs': ['include']
}
moduleclass = 'vis'
# IT4Innovations 2018
name = 'flex'
version = '2.6.6'
homepage = 'http://flex.sourceforge.net/'
description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner,
sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
toolchain = {'name': 'dummy', 'version': ''}
toolchainopts = {'pic': True}
sources = [SOURCELOWER_TAR_GZ]
source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
dependencies = [('Bison', '3.0.4')]
moduleclass = 'lang'
easyblock = 'ConfigureMake'
name = 'fontsproto'
version = '2.1.3'
homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
description = "X11 font extension wire protocol"
toolchain = {'name': 'intel', 'version': '2017a'}
toolchainopts = {'optarch': True}
sources = [SOURCE_TAR_GZ]
source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
sanity_check_paths = {
'files' : [],
'dirs' : ['include/X11/fonts'],
}
moduleclass = 'devel'
easyblock = 'ConfigureMake'
name = 'glproto'
version = '1.4.17'
homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
description = "X protocol and ancillary headers"
toolchain = {'name': 'intel', 'version': '2017a'}
toolchainopts = {'optarch': True}
sources = [SOURCE_TAR_GZ]
source_urls = [XORG_PROTO_SOURCE]
sanity_check_paths = {
'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
'dirs': [],
}
moduleclass = 'devel'
# IT4Innovations
easyblock = 'ConfigureMake'
name = 'ImageMagick'
version = '7.0.7-27'
homepage = 'http://www.imagemagick.org/'
description = """ImageMagick is a software suite to create, edit, compose, or convert bitmap images"""
toolchain = {'name': 'intel', 'version': '2017a'}
sources = [SOURCE_TAR_XZ]
source_urls = ['http://www.imagemagick.org/download']
dependencies = [
('bzip2', '1.0.6', '', True),
('X11', '20160819', '', True),
('Ghostscript', '9.21'),
('JasPer', '2.0.12'),
('libjpeg-turbo', '1.5.1', '', True),
('LibTIFF', '4.0.7', '', True),
('LittleCMS', '2.8'),
]
builddependencies = [
('pkg-config', '0.29.1', '', True),
]
configopts = "--with-gslib --with-x"
sanity_check_paths = {
'files': [],
'dirs': ['bin', 'etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
}
modextravars = {'MAGICK_HOME': '%(installdir)s'}
moduleclass = 'vis'
easyblock = 'ConfigureMake'
name = 'libXau'
version = '1.0.8'
homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
description = """The libXau package contains a library implementing the X11 Authorization Protocol.
This is useful for restricting client access to the display."""
toolchain = {'name': 'intel', 'version': '2017a'}
toolchainopts = {'optarch': True}
sources = [SOURCE_TAR_GZ]
source_urls = [XORG_LIB_SOURCE]
builddependencies = [
('xproto', '7.0.28', '', True),
]
sanity_check_paths = {
'files': ['lib/libXau.a', 'lib/libXau.%s' % SHLIB_EXT],
'dirs': [],
}
moduleclass = 'vis'
easyblock = 'ConfigureMake'
name = 'libXdamage'
version = '1.1.4'
homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
description = """X Damage extension library"""
toolchain = {'name': 'intel', 'version': '2017a'}
sources = [SOURCE_TAR_GZ]
source_urls = [XORG_LIB_SOURCE]
dependencies = [
('libX11', '1.6.5'),
('libxcb', '1.11.1', '', True),
('libXau', '1.0.8'),
]
sanity_check_paths = {
'files': ['include/X11/extensions/Xdamage.h', 'lib/libXdamage.%s' % SHLIB_EXT, 'lib/libXdamage.a'],
'dirs': [],
}
moduleclass = 'vis'
easyblock = 'ConfigureMake'
name = 'libXfont'
version = '1.5.1'
homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
description = """X font libary"""
toolchain = {'name': 'intel', 'version': '2017a'}
sources = [SOURCE_TAR_GZ]
source_urls = [XORG_LIB_SOURCE]
builddependencies = [
('fontsproto', '2.1.3'),
('xproto', '7.0.28', '', True),
('xtrans', '1.3.5', '', True),
('xorg-macros', '1.19.1', '', True),
('libfontenc', '1.1.3', '', True),
]
dependencies = [
('libX11', '1.6.5'),
('freetype', '2.8', '', True),
]
sanity_check_paths = {
'files': ['lib/libXfont.so', 'lib/libXfont.a'],
'dirs': ['include/X11/fonts'],
}
moduleclass = 'vis'
# IT4Innovations 2018
easyblock = 'ConfigureMake'
name = 'Mesa'
version = '13.0.0'
homepage = 'http://www.mesa3d.org/'
description = """Mesa is an open-source implementation of the OpenGL specification -
a system for rendering interactive 3D graphics."""
toolchain = {'name': 'intel', 'version': '2017a'}
toolchainopts = {'optarch': True}
sources = [SOURCELOWER_TAR_GZ]
source_urls = ['mesa-13.0.0.tar.gz',]
builddependencies = [
('flex', '2.6.4', '', True),
('Bison', '3.0.4', '', True),
('Autotools', '20150215', '', True),
('pkg-config', '0.29.1', '', True),
('glproto', '1.4.17'),
('kbproto', '1.0.6', '', True),
('libpthread-stubs', '0.4', '', True),
('xextproto', '7.3.0', '', True),
('xproto', '7.0.28', '', True),
('makedepend', '1.0.4', '', True),
]
dependencies = [
('libxml2', '2.9.4', '', True),
('libdrm', '2.4.76', '', True),
('libX11', '1.6.5',),
('libXext', '1.3.3', '', True),
('libXfixes', '5.0.1', '', True),
('libXdamage', '1.1.4'),
('libXfont', '1.5.1'),
('LLVM', '5.0.0', '', ('GCC', '6.3.0-2.27')),
# ('eudev', '3.1.5'),
]
# Use the os provided libudev or the EB provided eudev
#osdependencies = ['libudev']
# GLU is not part anymore of Mesa package!
configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri"
configopts += " --enable-xlib-glx --disable-driglx-direct --with-gallium-drivers='swrast' --disable-egl"
configopts += " --with-osmesa-bits=32 --enable-texture-float "
# package-config files for os dependencies are in an os specific place
#preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
preconfigopts = ' libtoolize && '
prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
#sanity_check_paths = {
# 'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT, 'lib/libGLESv1_CM.%s' % SHLIB_EXT,
# 'lib/libGLESv2.%s' %SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h', 'include/GL/glx.h',
# 'include/GL/osmesa.h', 'include/GL/wglext.h', 'include/GL/gl.h', 'include/GL/glxext.h',
# 'include/GL/glx_mangle.h', 'include/GLES/gl.h', 'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
# 'dirs': []
#}
maxparallel = 1
moduleclass = 'vis'
# the purpose of the easyconfig is to build a Mesa for software rendering,
# not hardware rendering. This means you want at least SSE4.2. We build:
# - llvmpipe: the high-performance Gallium LLVM driver
# - swr: Intel's OpenSWR
# it will try to use the llvmpipe by default. It you want swr, do:
# GALLIUM_DRIVER=swr
easyblock = 'ConfigureMake'
name = 'Mesa'
version = '17.2.6'
homepage = 'http://www.mesa3d.org/'
description = """Mesa is an open-source implementation of the OpenGL specification -
a system for rendering interactive 3D graphics."""
toolchain = {'name': 'intel', 'version': '2017a'}
# swr detects and builds parts specific for AVX and AVX2. If we use
# -xHost, this always gets overwritten and will fail.
toolchainopts = {'optarch': False}
sources = [SOURCELOWER_TAR_XZ]
source_urls = [
'https://mesa.freedesktop.org/archive/',
'https://mesa.freedesktop.org/archive/%(version)s',
'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
]
#patches = ['Mesa-17.0.2_fix-strip-llvm-flags.patch']
builddependencies = [
('flex', '2.6.4', '', True),
('Bison', '3.0.4', '', True),
('Autotools', '20150215', '', True),
('pkg-config', '0.29.1', '', True),
('Mako', '1.0.6', '-Python-2.7.13', True),
('libxml2', '2.9.4', '-Python-2.7.13', True),
]
dependencies = [
('zlib', '1.2.11', '', True),
('nettle', '3.3'),
('libdrm', '2.4.76', '', True),
('LLVM', '4.0.0', '', ('GCC', '6.3.0-2.27')),
('X11', '20160819', '', True),
]
# GLU is not part anymore of Mesa package!
configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri"
configopts += " --disable-gbm --disable-driglx-direct --with-gallium-drivers='swrast,swr' --disable-egl"
configopts += " --with-osmesa-bits=32 --enable-texture-float --enable-llvm-shared-libs "
buildopts = 'V=1'
sanity_check_paths = {
'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
'lib/libGLESv1_CM.%s' % SHLIB_EXT, 'lib/libGLESv2.%s' % SHLIB_EXT,
'include/GL/glext.h', 'include/GL/gl_mangle.h',
'include/GL/glx.h', 'include/GL/osmesa.h',
'include/GL/gl.h', 'include/GL/glxext.h',
'include/GL/glx_mangle.h', 'include/GLES/gl.h',
'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
'dirs': []
}
moduleclass = 'vis'
# IT4Innovations
easyblock = 'MakeCp'
name = 'Molden'
version = '5.7'
homepage = 'http://www.cmbi.ru.nl/molden/'
description = """Molden is a package for displaying Molecular Density from the
Ab Initio packages GAMESS-UK, GAMESS-US and GAUSSIAN and the Semi-Empirical
packages Mopac/Ampac"""
toolchain = {'name': 'intel', 'version': '2017b'}
sources = ['%(namelower)s%(version)s.tar.gz']
source_urls = ['http://ftp.cmbi.ru.nl/pub/molgraph/molden']
dependencies = [
('X11', '20160819', '', True),
]
buildopts = 'CC="$CC" FC="$F90" molden'
files_to_copy = [(['molden'], 'bin'), 'CopyRight', 'README', 'REGISTER']
sanity_check_paths = {
'files': ['bin/molden', 'README', 'REGISTER'],
'dirs': [],
}
moduleclass = 'chem'
name = 'mkl'
version = '2018.1.163'
homepage = 'http://software.intel.com/en-us/intel-mkl/'
description = """Intel Math Kernel Library is a library of highly optimized,
extensively threaded math routines for science, engineering, and financial
applications that require maximum performance. Core math functions include
BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
toolchain = {'name': 'dummy', 'version': ''}
sources = ['l_mkl_%(version)s.tgz']
dontcreateinstalldir = 'True'
interfaces = False
postinstallcmds = [
# extract the examples
'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
]
modextravars = {
'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
}
moduleclass = 'numlib'
......@@ -4,6 +4,7 @@ easyblock = 'PythonPackage'
name = 'numpy'
version = '1.14.1'
versionsuffix = '-mkl'
homepage = 'http://www.numpy.org'
description = """NumPy is the fundamental package needed for scientific computing with Python."""
......@@ -18,11 +19,15 @@ patches = [
# 'numpy-1.14.1-mkl.patch'
]
builddependencies = [
# ('mkl', '2017.4.239', '', True),
dependencies = [
('intel', '2017a', '', True),
]
#builddependencies = [
# ('mkl', '2017.4.239', '', True),
# ('intel', '2018a', '', True),
#]
#prebuildopts = 'mv site.cfg.example site.cfg && export MKL_THREADING_LAYER=GNU && ' # ' export CFLAGS="-fopenmp -m64 -mtune=native -O3 -Wl,--no-as-needed" && export CXXFLAGS="-fopenmp -m64 -mtune=native -O3 -Wl,--no-as-needed" && export LDFLAGS="-ldl -lm" && export FFLAGS="-fopenmp -m64 -mtune=native -O3" && '
sanity_check_paths = {
......
This diff is collapsed.
# IT4Innovation 2018
name = 'VMD'
version = '1.9.3'
versionsuffix = '-Py-2.7'
homepage = 'http://www.ks.uiuc.edu/Research/vmd'
description = """VMD is a molecular visualization program for displaying, animating, and analyzing large biomolecular
systems using 3-D graphics and built-in scripting."""
toolchain = {'name': 'intel', 'version': '2017a'}
# downloading requires registration
sources = ['vmd-%(version)s.src.tar.gz']
patches = ['VMD-%(version)s_configure.patch']
dependencies = [
('Tcl', '8.6.5'),
('Tk', '8.6.5'),
('FLTK', '1.3.4', '', True),
('Py', '2.7', '', True),
('numpy', '1.13.3', '-Py-2.7', True),
# ('Mesa', '17.2.6'),
('netCDF', '4.4.1.1'),
# ('FFmpeg', '3.1.3'),
# ('ImageMagick', '7.0.7-27'),
# ('ACTC', '1.1'),
]
moduleclass = 'vis'
fix hardcoded stuff in VMD configure script
authors: Stephane Thiell (Stanford University), Kenneth Hoste (HPC-UGent)
--- vmd-1.9.3/configure.orig 2016-12-01 08:11:33.000000000 +0100
+++ vmd-1.9.3/configure 2017-03-23 13:36:41.501910996 +0100
@@ -466,7 +476,7 @@
$arch_cc = "cc";
$arch_ccpp = "CC";
-$arch_nvcc = "/usr/local/cuda-8.0/bin/nvcc";
+$arch_nvcc = "nvcc";
$arch_nvccflags = "--ptxas-options=-v " .
"-gencode arch=compute_30,code=compute_30 " .
"-gencode arch=compute_30,code=sm_35 " .
@@ -581,17 +591,17 @@
# location of Mesa library and include files; basically does the same
# as OpenGL. This is based on the default instructions from the Mesa
# README; the include files should by default be in /usr/local/include/GL.
-$mesa_dir = "$vmd_library_dir/Mesa";
+$mesa_dir = $ENV{'EBROOTMESA'};
$mesa_include = "-I$mesa_dir/include";
$mesa_library = "-L$mesa_dir/lib_$config_arch";
#$mesa_libs = "-lMesaGL -lMesaGLU";
-$mesa_libs = "-lMesaGL";
+$mesa_libs = "-lGL -lGLU";
$mesa_defines = "-DUSELINEAXES -DVMDMESA -DVMDOPENGL";
@mesa_cc = ();
@mesa_cu = ();
-@mesa_ccpp = @opengl_ccpp;
-@mesa_h = @opengl_h;
-@mesa_extra = @opengl_extra;
+@mesa_ccpp = ();
+@mesa_h = ();
+@mesa_extra = ();
#
@@ -666,10 +676,10 @@
################ FLTK GUI
$fltk_defines = "-DVMDGUI -DVMDFLTK";
-$fltk_dir = "$vmd_library_dir/fltk";
+$fltk_dir = $ENV{'EBROOTFLTK'};
$fltk_include = "-I$fltk_dir/include";
$fltk_library = "-L$fltk_dir/$config_arch";
-$fltk_libs = "-lfltk -lX11";
+$fltk_libs = "-lfltk -lX11 -lXfixes -lXcursor -lXinerama";
#@fltk_cc = ('forms_ui.c');
@fltk_cu = ();
@fltk_ccpp = ( 'ColorFltkMenu.C',
@@ -729,8 +739,8 @@
if ($config_tk) { $tcl_include .= " -I$stock_tk_include_dir"; }
$tcl_library = "-L$stock_tcl_library_dir";
if ($config_tk) { $tcl_library .= " -L$stock_tk_library_dir"; }
-$tcl_libs = "-ltcl8.5";
-if ($config_tk) { $tcl_libs = "-ltk8.5 -lX11 " . $tcl_libs; }
+$tcl_libs = "-ltcl8.6";
+if ($config_tk) { $tcl_libs = "-ltk8.6 -lX11 " . $tcl_libs; }
@tcl_cc = ();
@tcl_cu = ();
@@ -922,7 +932,7 @@
# This option enables the use of CUDA GPU acceleration functions.
#######################
$cuda_defines = "-DVMDCUDA -DMSMPOT_CUDA";
-$cuda_dir = "/usr/local/cuda-8.0";
+$cuda_dir = "$CUDA_HOME";
$cuda_include = "";
$cuda_library = "";
$cuda_libs = "-Wl,-rpath -Wl,\$\$ORIGIN/ -lcudart_static";
@@ -1042,7 +1052,7 @@
# $liboptix_dir = "/usr/local/encap/NVIDIA-OptiX-SDK-3.6.3-linux64";
# $liboptix_dir = "/usr/local/encap/NVIDIA-OptiX-SDK-3.8.0-linux64";
# $liboptix_dir = "/usr/local/encap/NVIDIA-OptiX-SDK-3.9.0-linux64";
-$liboptix_dir = "/usr/local/encap/NVIDIA-OptiX-SDK-4.0.1-linux64";
+$liboptix_dir = "$ENV{'EBROOTOPTIX'}";
# NCSA Blue Waters
# $liboptix_dir = "/u/sciteam/stonej/local/NVIDIA-OptiX-SDK-3.6.3-linux64";
# $liboptix_dir = "/u/sciteam/stonej/local/NVIDIA-OptiX-SDK-3.8.0-linux64";
@@ -1310,8 +1320,8 @@
#######################
$actc_defines = "-DVMDACTC";
$actc_dir = "$vmd_library_dir/actc";
-$actc_include = "-I$actc_dir/include";
-$actc_library = "-L$actc_dir/lib_$config_arch";
+$actc_include = "-I$actc_dir";
+$actc_library = "-L$actc_dir";
$actc_libs = "-lactc";
@actc_cc = ();
@actc_cu = ();
@@ -1388,7 +1398,7 @@
$python_defines = "-DVMDPYTHON";
$python_include = "-I$stock_python_include_dir -I$stock_numpy_include_dir -I$stock_numpy_library_dir";
$python_library = "-L$stock_python_library_dir";
-$python_libs = "-lpython2.5 -lpthread";
+$python_libs = "-lpython2.7 -lpthread";
@python_h = ('PythonTextInterp.h',
'VMDTkinterMenu.h',
'py_commands.h',
@@ -2173,7 +2183,7 @@
if ($config_static) {
$arch_lopts = "-static";