From bd1cd83d7148a4856720cc7f29a1656a289fe92c Mon Sep 17 00:00:00 2001 From: "Gregory L. Lee" Date: Mon, 17 Aug 2015 11:54:14 -0700 Subject: added lapack and blas deps, fixed gfortran compiler dependency --- var/spack/packages/py-numpy/gnu_fcompiler.patch | 11 +++++++++++ var/spack/packages/py-numpy/package.py | 8 ++++++++ var/spack/packages/py-scipy/package.py | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 var/spack/packages/py-numpy/gnu_fcompiler.patch diff --git a/var/spack/packages/py-numpy/gnu_fcompiler.patch b/var/spack/packages/py-numpy/gnu_fcompiler.patch new file mode 100644 index 0000000000..e4e882b9df --- /dev/null +++ b/var/spack/packages/py-numpy/gnu_fcompiler.patch @@ -0,0 +1,11 @@ +--- a/numpy/distutils/fcompiler/gnu.py.orig 2015-08-17 11:31:52.000000000 -0700 ++++ b/numpy/distutils/fcompiler/gnu.py 2015-08-17 11:32:48.000000000 -0700 +@@ -252,7 +252,7 @@ + # GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental) + # GNU Fortran (GCC) 4.3.0 20070316 (experimental) + +- possible_executables = ['gfortran', 'f95'] ++ possible_executables = ['fc', 'f95'] + executables = { + 'version_cmd' : ["", "--version"], + 'compiler_f77' : [None, "-Wall", "-g", "-ffixed-form", diff --git a/var/spack/packages/py-numpy/package.py b/var/spack/packages/py-numpy/package.py index 6534e063d2..76fdd48da7 100644 --- a/var/spack/packages/py-numpy/package.py +++ b/var/spack/packages/py-numpy/package.py @@ -7,9 +7,17 @@ class PyNumpy(Package): version('1.9.1', '78842b73560ec378142665e712ae4ad9') version('1.9.2', 'a1ed53432dbcd256398898d35bc8e645') + + patch('gnu_fcompiler.patch', when='%gcc') extends('python') depends_on('py-nose') + depends_on('netlib-blas+fpic') + depends_on('netlib-lapack+shared') def install(self, spec, prefix): + with open('site.cfg', 'w') as f: + f.write('[DEFAULT]\n') + f.write('libraries=lapack,blas\n') + f.write('library_dirs=%s/lib:%s/lib\n' % (spec['blas'].prefix, spec['lapack'].prefix)) python('setup.py', 'install', '--prefix=%s' % prefix) diff --git a/var/spack/packages/py-scipy/package.py b/var/spack/packages/py-scipy/package.py index cdcf74534b..3a1124cc15 100644 --- a/var/spack/packages/py-scipy/package.py +++ b/var/spack/packages/py-scipy/package.py @@ -11,6 +11,8 @@ class PyScipy(Package): extends('python') depends_on('py-nose') depends_on('py-numpy') + depends_on('blas') + depends_on('lapack') def install(self, spec, prefix): python('setup.py', 'install', '--prefix=%s' % prefix) -- cgit v1.2.3-70-g09d2 From 689dbb8fb6ac9ed8e9e0c16d33d623e1f0a3a72a Mon Sep 17 00:00:00 2001 From: "Gregory L. Lee" Date: Mon, 24 Aug 2015 08:51:41 -0700 Subject: use filter_file instead of patch --- var/spack/packages/py-numpy/gnu_fcompiler.patch | 11 ----------- var/spack/packages/py-numpy/package.py | 9 +++++++-- 2 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 var/spack/packages/py-numpy/gnu_fcompiler.patch diff --git a/var/spack/packages/py-numpy/gnu_fcompiler.patch b/var/spack/packages/py-numpy/gnu_fcompiler.patch deleted file mode 100644 index e4e882b9df..0000000000 --- a/var/spack/packages/py-numpy/gnu_fcompiler.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/numpy/distutils/fcompiler/gnu.py.orig 2015-08-17 11:31:52.000000000 -0700 -+++ b/numpy/distutils/fcompiler/gnu.py 2015-08-17 11:32:48.000000000 -0700 -@@ -252,7 +252,7 @@ - # GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental) - # GNU Fortran (GCC) 4.3.0 20070316 (experimental) - -- possible_executables = ['gfortran', 'f95'] -+ possible_executables = ['fc', 'f95'] - executables = { - 'version_cmd' : ["", "--version"], - 'compiler_f77' : [None, "-Wall", "-g", "-ffixed-form", diff --git a/var/spack/packages/py-numpy/package.py b/var/spack/packages/py-numpy/package.py index 76fdd48da7..efa109a3e9 100644 --- a/var/spack/packages/py-numpy/package.py +++ b/var/spack/packages/py-numpy/package.py @@ -8,13 +8,18 @@ class PyNumpy(Package): version('1.9.1', '78842b73560ec378142665e712ae4ad9') version('1.9.2', 'a1ed53432dbcd256398898d35bc8e645') - patch('gnu_fcompiler.patch', when='%gcc') - extends('python') depends_on('py-nose') depends_on('netlib-blas+fpic') depends_on('netlib-lapack+shared') + def patch(self): + filter_file( + "possible_executables = \['(gfortran|g77|ifort|efl)", + "possible_executables = ['fc", + "numpy/distutils/fcompiler/gnu.py", + "numpy/distutils/fcompiler/intel.py") + def install(self, spec, prefix): with open('site.cfg', 'w') as f: f.write('[DEFAULT]\n') -- cgit v1.2.3-70-g09d2 From 1c9c5a385d4bb24c081a4297daf5dcad08a3c706 Mon Sep 17 00:00:00 2001 From: "Gregory L. Lee" Date: Tue, 25 Aug 2015 11:38:39 -0700 Subject: added graphviz and dependencies --- var/spack/packages/ghostscript/package.py | 17 +++++++++++++++++ var/spack/packages/graphviz/package.py | 21 +++++++++++++++++++++ var/spack/packages/pkg-config/package.py | 17 +++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 var/spack/packages/ghostscript/package.py create mode 100644 var/spack/packages/graphviz/package.py create mode 100644 var/spack/packages/pkg-config/package.py diff --git a/var/spack/packages/ghostscript/package.py b/var/spack/packages/ghostscript/package.py new file mode 100644 index 0000000000..0ab49d425f --- /dev/null +++ b/var/spack/packages/ghostscript/package.py @@ -0,0 +1,17 @@ +from spack import * + +class Ghostscript(Package): + """an interpreter for the PostScript language and for PDF. """ + homepage = "http://ghostscript.com/" + url = "http://downloads.ghostscript.com/public/ghostscript-9.16.tar.gz" + + version('9.16', '829319325bbdb83f5c81379a8f86f38f') + + parallel = False + + def install(self, spec, prefix): + configure("--prefix=%s" %prefix, "--enable-shared") + + make() + make("install") + diff --git a/var/spack/packages/graphviz/package.py b/var/spack/packages/graphviz/package.py new file mode 100644 index 0000000000..7af7da1881 --- /dev/null +++ b/var/spack/packages/graphviz/package.py @@ -0,0 +1,21 @@ +from spack import * + +class Graphviz(Package): + """Graph Visualization Software""" + homepage = "http://www.graphviz.org" + url = "http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.38.0.tar.gz" + + version('2.38.0', '5b6a829b2ac94efcd5fa3c223ed6d3ae') + + parallel = False + + depends_on("swig") + depends_on("python") + depends_on("ghostscript") + + def install(self, spec, prefix): + configure("--prefix=%s" %prefix) + + make() + make("install") + diff --git a/var/spack/packages/pkg-config/package.py b/var/spack/packages/pkg-config/package.py new file mode 100644 index 0000000000..9964c6ce34 --- /dev/null +++ b/var/spack/packages/pkg-config/package.py @@ -0,0 +1,17 @@ +from spack import * + +class PkgConfig(Package): + """pkg-config is a helper tool used when compiling applications and libraries""" + homepage = "http://www.freedesktop.org/wiki/Software/pkg-config/" + url = "http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" + + version('0.28', 'aa3c86e67551adc3ac865160e34a2a0d') + + parallel = False + + def install(self, spec, prefix): + configure("--prefix=%s" %prefix, "--enable-shared") + + make() + make("install") + -- cgit v1.2.3-70-g09d2 From 2c3e7a6f87ef5f8b5ba154b5a8b7da7a119f4a67 Mon Sep 17 00:00:00 2001 From: "Gregory L. Lee" Date: Tue, 25 Aug 2015 11:48:12 -0700 Subject: added graphviz dependency and dysect variant to STAT --- var/spack/packages/stat/package.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/var/spack/packages/stat/package.py b/var/spack/packages/stat/package.py index c40d65ae78..5d81e62731 100644 --- a/var/spack/packages/stat/package.py +++ b/var/spack/packages/stat/package.py @@ -9,17 +9,20 @@ class Stat(Package): version('2.1.0', 'ece26beaf057aa9134d62adcdda1ba91') version('2.0.0', 'c7494210b0ba26b577171b92838e1a9b') + variant('dysect', default=False, description="enable DySectAPI") + depends_on('libelf') depends_on('libdwarf') depends_on('dyninst') depends_on('graphlib') + depends_on('graphviz') depends_on('launchmon') depends_on('mrnet') patch('configure_mpicxx.patch', when='@2.1.0') def install(self, spec, prefix): - configure( + configure_args = [ "--enable-gui", "--prefix=%s" % prefix, "--disable-examples", # Examples require MPI: avoid this dependency. @@ -27,7 +30,11 @@ class Stat(Package): "--with-mrnet=%s" % spec['mrnet'].prefix, "--with-graphlib=%s" % spec['graphlib'].prefix, "--with-stackwalker=%s" % spec['dyninst'].prefix, - "--with-libdwarf=%s" % spec['libdwarf'].prefix) + "--with-libdwarf=%s" % spec['libdwarf'].prefix + ] + if '+dysect' in spec: + configure_args.append('--enable-dysectapi') + configure(*configure_args) make(parallel=False) make("install") -- cgit v1.2.3-70-g09d2