zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate & clean up packages from LLNL hackathon.

Browse Source
This commit is contained in:
Todd Gamblin 2014-03-15 19:46:41 -07:00
parent 61fc2317d8
commit 74ec74d73c
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/spack/spack/cmd/mirror.py
View File

@ -84,6 +84,9 @@ def mirror(parser, args):
shutil.move(stage.archive_file, final_dst) shutil.move(stage.archive_file, final_dst)
tty.msg("Added %s to mirror" % final_dst) tty.msg("Added %s to mirror" % final_dst)
except Exception, e:
tty.warn("Error while fetching %s. Skipping." % url, e.message)
finally: finally:
stage.destroy() stage.destroy()

2
lib/spack/spack/globals.py
View File

@ -117,7 +117,7 @@
# For no mirrors: # For no mirrors:
# mirrors = [] # mirrors = []
# #
mirrors = ['file:///Users/gamblin2/mirror'] mirrors = []
# Important environment variables # Important environment variables
SPACK_NO_PARALLEL_MAKE = 'SPACK_NO_PARALLEL_MAKE' SPACK_NO_PARALLEL_MAKE = 'SPACK_NO_PARALLEL_MAKE'

5
lib/spack/spack/packages/mrnet.py
View File

@ -6,9 +6,10 @@ class Mrnet(Package):
url = "ftp://ftp.cs.wisc.edu/paradyn/mrnet/mrnet_4.0.0.tar.gz" url = "ftp://ftp.cs.wisc.edu/paradyn/mrnet/mrnet_4.0.0.tar.gz"
versions = { '4.0.0' : 'd00301c078cba57ef68613be32ceea2f', } versions = { '4.0.0' : 'd00301c078cba57ef68613be32ceea2f', }
parallel = False
def install(self, spec, prefix): def install(self, spec, prefix):
configure("--prefix=%s" %prefix, "--enable-shared") configure("--prefix=%s" %prefix, "--enable-shared")
make(parallel=False) make()
make("install", parallel=False) make("install")

1
lib/spack/spack/packages/pmgr_collective.py
View File

@ -29,7 +29,6 @@ class PmgrCollective(Package):
MPI jobs.""" MPI jobs."""
homepage = "http://www.sourceforge.net/projects/pmgrcollective" homepage = "http://www.sourceforge.net/projects/pmgrcollective"
url = "http://downloads.sourceforge.net/project/pmgrcollective/pmgrcollective/PMGR_COLLECTIVE-1.0/pmgr_collective-1.0.tgz" url = "http://downloads.sourceforge.net/project/pmgrcollective/pmgrcollective/PMGR_COLLECTIVE-1.0/pmgr_collective-1.0.tgz"
# url = "http://downloads.sourceforge.net/project/pmgrcollective/pmgrcollective/PMGR_COLLECTIVE-1.0/pmgr_collective-1.0.tgz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fpmgrcollective%2F%3Fsource%3Ddlp&ts=1394747864&use_mirror=iweb
versions = { '1.0' : '0384d008774274cc3fc7b4d810dfd07e' } versions = { '1.0' : '0384d008774274cc3fc7b4d810dfd07e' }

25
lib/spack/spack/packages/stat.py
View File

@ -14,19 +14,24 @@ class Stat(Package):
depends_on('mrnet') depends_on('mrnet')
def install(self, spec, prefix): def install(self, spec, prefix):
my_mrnet = spec['mrnet'] configure(
my_graphlib = spec['graphlib'] "--enable-gui",
#my_launchmon = spec['launchmon'] "--prefix=%s" % prefix,
my_dyninst = spec['dyninst']
my_libdwarf = spec['libdwarf']
# TODO: this uses the launchmon package, but path is too long (see depends_on above) (Jira SPACK-21) # TODO: this uses the launchmon package, but path is
#configure("--enable-gui", "--prefix=%s" %prefix, "--with-launchmon=%s" %my_launchmon.prefix, "--with-mrnet=%s" %my_mrnet.prefix, "--with-graphlib=%s" %my_graphlib.prefix, "--with-stackwalker=%s" %my_dyninst.prefix, "--with-libdwarf=%s" %my_libdwarf.prefix) # too long (see depends_on above) (Jira SPACK-21)
# "--with-launchmon=%s" % spec['launchmon'].prefix,
# TODO: the configure line above is the proper one once Jira SPACK-21 is fixed # TODO: launchmon line above is the proper one once
configure("--enable-gui", "--prefix=%s" %prefix, "--with-launchmon=/collab/usr/global/tools/launchmon/chaos_5_x86_64_ib/launchmon-1.0.0-20140312", "--with-mrnet=%s" %my_mrnet.prefix, "--with-graphlib=%s" %my_graphlib.prefix, "--with-stackwalker=%s" %my_dyninst.prefix, "--with-libdwarf=%s" %my_libdwarf.prefix) # SPACK-21 is fixed
"--with-launchmon=/collab/usr/global/tools/launchmon/chaos_5_x86_64_ib/launchmon-1.0.0-20140312",
# TODO: remove once Jira SPACK-19 is fixed "--with-mrnet=%s" % spec['mrnet'].prefix,
"--with-graphlib=%s" % spec['graphlib'].prefix,
"--with-stackwalker=%s" % spec['dyninst'].prefix,
"--with-libdwarf=%s" % spec['libdwarf'].prefix)
# TODO: remove once SPACK-19 is fixed
import shutil import shutil
shutil.copy2('/usr/bin/libtool', 'libtool') shutil.copy2('/usr/bin/libtool', 'libtool')