From 0e38a9d16dfacfefbc7715268185f4f2bc47c116 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Thu, 13 Mar 2014 14:24:47 -0700 Subject: [PATCH 01/10] Added a -k/--insecure option to make curl not check certs. --- bin/spack | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bin/spack b/bin/spack index 72fd47d732..420b9adc78 100755 --- a/bin/spack +++ b/bin/spack @@ -51,9 +51,11 @@ parser = argparse.ArgumentParser( parser.add_argument('-V', '--version', action='version', version="%s" % spack.spack_version) parser.add_argument('-v', '--verbose', action='store_true', dest='verbose', - help="print additional output during builds") + help="Print additional output during builds") parser.add_argument('-d', '--debug', action='store_true', dest='debug', - help="write out debug logs during compile") + help="Write out debug logs during compile") +parser.add_argument('-k', '--insecure', action='store_true', dest='insecure', + help="Do not check ssl certificates when downloading archives.") parser.add_argument('-m', '--mock', action='store_true', dest='mock', help="Use mock packages instead of real ones.") @@ -76,6 +78,11 @@ if args.mock: mock_path = new_path(spack.module_path, 'test', 'mock_packages') spack.packages_path = mock_path +# If the user asked for it, don't check ssl certs. +if args.insecure: + tty.warn("You asked for --insecure, which does not check SSL certificates. ") + spack.curl.add_default_arg('-k') + # Try to load the particular command asked for and run it command = spack.cmd.get_command(args.command) try: From 0528129e52d70ec64321f532268c0e258d869a8e Mon Sep 17 00:00:00 2001 From: "Gregory L. Lee" Date: Thu, 13 Mar 2014 14:29:28 -0700 Subject: [PATCH 02/10] added mrnet and graphlib --- lib/spack/spack/globals.py | 1 + lib/spack/spack/packages/graphlib.py | 33 ++++++++++++++++++++++++++++ lib/spack/spack/packages/mrnet.py | 32 +++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 lib/spack/spack/packages/graphlib.py create mode 100644 lib/spack/spack/packages/mrnet.py diff --git a/lib/spack/spack/globals.py b/lib/spack/spack/globals.py index 40bb50f219..8e8f32ba04 100644 --- a/lib/spack/spack/globals.py +++ b/lib/spack/spack/globals.py @@ -70,6 +70,7 @@ # Curl tool for fetching files. curl = which("curl", required=True) +curl.add_default_arg("-k") # TODO not good # Whether to build in tmp space or directly in the stage_path. # If this is true, then spack will make stage directories in diff --git a/lib/spack/spack/packages/graphlib.py b/lib/spack/spack/packages/graphlib.py new file mode 100644 index 0000000000..4f1e610441 --- /dev/null +++ b/lib/spack/spack/packages/graphlib.py @@ -0,0 +1,33 @@ +# FIXME: +# This is a template package file for Spack. We've conveniently +# put "FIXME" labels next to all the things you'll want to change. +# +# Once you've edited all the FIXME's, delete this whole message, +# save this file, and test out your package like this: +# +# spack install v +# +# You can always get back here to change things with: +# +# spack edit v +# +# See the spack documentation for more information on building +# packages. +# +from spack import * + +class Graphlib(Package): + """Library to create, manipulate, and export graphs Graphlib.""" + # FIXME: add a proper url for your package's homepage here. + homepage = "http://www.example.com" + url = "https://github.com/lee218llnl/graphlib/archive/v2.0.0.tar.gz" + + versions = { '2.0.0' : '43c6df84f1d38ba5a5dce0ae19371a70', } + + def install(self, spec, prefix): + # FIXME: Modify the configure line to suit your build system here. + cmake(".", *std_cmake_args) + + # FIXME: Add logic to build and install here + make() + make("install") diff --git a/lib/spack/spack/packages/mrnet.py b/lib/spack/spack/packages/mrnet.py new file mode 100644 index 0000000000..e7218be0d4 --- /dev/null +++ b/lib/spack/spack/packages/mrnet.py @@ -0,0 +1,32 @@ +# FIXME: +# This is a template package file for Spack. We've conveniently +# put "FIXME" labels next to all the things you'll want to change. +# +# Once you've edited all the FIXME's, delete this whole message, +# save this file, and test out your package like this: +# +# spack install mrnet +# +# You can always get back here to change things with: +# +# spack edit mrnet +# +# See the spack documentation for more information on building +# packages. +# +from spack import * + +class Mrnet(Package): + """The MRNet Multi-Cast Reduction Network.""" + homepage = "http://paradyn.org/mrnet" + url = "ftp://ftp.cs.wisc.edu/paradyn/mrnet/mrnet_4.0.0.tar.gz" + + versions = { '4.0.0' : 'd00301c078cba57ef68613be32ceea2f', } + + def install(self, spec, prefix): + # FIXME: Modify the configure line to suit your build system here. + configure("--prefix=%s" %prefix, "--enable-shared") + + # FIXME: Add logic to build and install here + make(parallel=False) + make("install", parallel=False) From c3f3353de0011d8366068530ac56dfe55ae66135 Mon Sep 17 00:00:00 2001 From: Adam Moody Date: Thu, 13 Mar 2014 14:43:26 -0700 Subject: [PATCH 03/10] change rename to move in mirror creation --- lib/spack/spack/cmd/mirror.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/spack/spack/cmd/mirror.py b/lib/spack/spack/cmd/mirror.py index 77cbb1eb58..ec91ef0fd5 100644 --- a/lib/spack/spack/cmd/mirror.py +++ b/lib/spack/spack/cmd/mirror.py @@ -23,6 +23,7 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import os +import shutil import argparse import spack.packages as packages @@ -78,7 +79,7 @@ def mirror(parser, args): final_dst = new_path(pkg_path, basename) os.chdir(working_dir) - os.rename(stage.archive_file, final_dst) + shutil.move(stage.archive_file, final_dst) tty.msg("Added %s to mirror" % final_dst) finally: From 77aeac65013250b1bd3beccb4c2f6dc6d3138ac9 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Thu, 13 Mar 2014 14:50:38 -0700 Subject: [PATCH 04/10] Support github URLs --- bin/spack | 2 +- lib/spack/spack/url.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/spack b/bin/spack index 420b9adc78..775a9dbd08 100755 --- a/bin/spack +++ b/bin/spack @@ -80,7 +80,7 @@ if args.mock: # If the user asked for it, don't check ssl certs. if args.insecure: - tty.warn("You asked for --insecure, which does not check SSL certificates. ") + tty.warn("You asked for --insecure, which does not check SSL certificates.") spack.curl.add_default_arg('-k') # Try to load the particular command asked for and run it diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index 0bc7ff53b4..a4c32eb37b 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -102,6 +102,9 @@ def parse_version_string_with_indices(path): # e.g. https://github.com/petdance/ack/tarball/1.93_02 (r'github.com/.+/(?:zip|tar)ball/v?((\d+\.)+\d+_(\d+))$', path), + # e.g. https://github.com/hpc/lwgrp/archive/v1.0.1.tar.gz + (r'github.com/[^/]+/[^/]+/archive/v?(\d+(?:\.\d+)*)\.tar\.gz$', path), + # e.g. https://github.com/erlang/otp/tarball/OTP_R15B01 (erlang style) (r'[-_](R\d+[AB]\d*(-\d+)?)', path), @@ -169,6 +172,7 @@ def parse_name(path, ver=None): ntypes = (r'/sourceforge/([^/]+)/', r'/([^/]+)/(tarball|zipball)/', r'/([^/]+)[_.-](bin|dist|stable|src|sources)[_.-]%s' % ver, + r'github.com/[^/]+/([^/]+)/archive', r'/([^/]+)[_.-]v?%s' % ver, r'/([^/]+)%s' % ver, r'^([^/]+)[_.-]v?%s' % ver, From 15840cc677ae2ead701b0db3000e6270ef2f7df7 Mon Sep 17 00:00:00 2001 From: Matthew LeGendre Date: Thu, 13 Mar 2014 15:17:26 -0700 Subject: [PATCH 05/10] Use unzip to unpackage .zip files --- lib/spack/spack/util/compression.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/spack/spack/util/compression.py b/lib/spack/spack/util/compression.py index ca98160bdd..2b8b05eb28 100644 --- a/lib/spack/spack/util/compression.py +++ b/lib/spack/spack/util/compression.py @@ -39,6 +39,9 @@ def allowed_archive(path): def decompressor_for(path): """Get the appropriate decompressor for a path.""" + if path.endswith(".zip"): + unzip = which('unzip', required=True) + return unzip tar = which('tar', required=True) tar.add_default_arg('-xf') return tar From 6058f7aac606ed292007b94cb791d528acf6a338 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Thu, 13 Mar 2014 15:53:18 -0700 Subject: [PATCH 06/10] Add str() calls around messages in tty --- lib/spack/spack/tty.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/spack/spack/tty.py b/lib/spack/spack/tty.py index df4760df40..b9ad3f12bf 100644 --- a/lib/spack/spack/tty.py +++ b/lib/spack/spack/tty.py @@ -36,27 +36,27 @@ def msg(message, *args): def info(message, *args, **kwargs): format = kwargs.get('format', '*b') - cprint("@%s{==>} %s" % (format, cescape(message))) + cprint("@%s{==>} %s" % (format, cescape(str(message)))) for arg in args: print indent + str(arg) def verbose(message, *args): if spack.verbose: - info(message, *args, format='c') + info(str(message), *args, format='c') def debug(*args): if spack.debug: - info("Debug: " + message, *args, format='*g') + info("Debug: " + str(message), *args, format='*g') def error(message, *args): - info("Error: " + message, *args, format='*r') + info("Error: " + str(message), *args, format='*r') def warn(message, *args): - info("Warning: " + message, *args, format='*Y') + info("Warning: " + str(message), *args, format='*Y') def die(message, *args): From fadd2032a3677e56bff38ed64f5a0073a6de7856 Mon Sep 17 00:00:00 2001 From: Adam Moody Date: Thu, 13 Mar 2014 15:56:29 -0700 Subject: [PATCH 07/10] adding pmgr_collective --- lib/spack/spack/packages/pmgr_collective.py | 38 +++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 lib/spack/spack/packages/pmgr_collective.py diff --git a/lib/spack/spack/packages/pmgr_collective.py b/lib/spack/spack/packages/pmgr_collective.py new file mode 100644 index 0000000000..a7e1130436 --- /dev/null +++ b/lib/spack/spack/packages/pmgr_collective.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://scalability-llnl.github.io/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License (as published by +# the Free Software Foundation) version 2.1 dated February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + +class PmgrCollective(Package): + """PMGR_COLLECTIVE provides a scalable network for bootstrapping + MPI jobs.""" + 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?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fpmgrcollective%2F%3Fsource%3Ddlp&ts=1394747864&use_mirror=iweb + + versions = { '1.0' : '0384d008774274cc3fc7b4d810dfd07e' } + + def install(self, spec, prefix): + make('PREFIX="' + prefix + '"') + make('PREFIX="' + prefix + '"', "install") From 09b5239a526ce9f592dbf8eb4e868faf0ac2f5ca Mon Sep 17 00:00:00 2001 From: "Gregory L. Lee" Date: Thu, 13 Mar 2014 16:02:28 -0700 Subject: [PATCH 08/10] workarounds for bugs --- lib/spack/env/cc | 6 ++++++ lib/spack/spack/globals.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/spack/env/cc b/lib/spack/env/cc index 0245e06531..a258bdb49d 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -29,6 +29,11 @@ spack_env_path = get_path("SPACK_ENV_PATH") # Figure out what type of operation we're doing command = os.path.basename(sys.argv[0]) cpp, cc, ccld, ld = range(4) + +# TODO: this can to be removed once Jira issue SPACK-16 is resolved +if command == 'CC': + command = 'c++' + if command == 'cpp': mode = cpp elif command == 'ld': @@ -90,6 +95,7 @@ for item in ['.'] + spack_env_path: os.environ["PATH"] = ":".join(clean_path) full_command = [command] + arguments + if spack_debug: input_log = os.path.join(spack_build_root, 'spack_cc_in.log') output_log = os.path.join(spack_build_root, 'spack_cc_out.log') diff --git a/lib/spack/spack/globals.py b/lib/spack/spack/globals.py index 8e8f32ba04..6ff1a69304 100644 --- a/lib/spack/spack/globals.py +++ b/lib/spack/spack/globals.py @@ -70,7 +70,7 @@ # Curl tool for fetching files. curl = which("curl", required=True) -curl.add_default_arg("-k") # TODO not good +curl.add_default_arg("-k") # TODO: remove me in favor of spack -k` # Whether to build in tmp space or directly in the stage_path. # If this is true, then spack will make stage directories in From 0668cf1ab15b5c41d9858e184666115e13e19162 Mon Sep 17 00:00:00 2001 From: "Gregory L. Lee" Date: Thu, 13 Mar 2014 16:11:51 -0700 Subject: [PATCH 09/10] removed curl -k hack after rebase with spack -k fix --- lib/spack/spack/globals.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/spack/spack/globals.py b/lib/spack/spack/globals.py index 6ff1a69304..40bb50f219 100644 --- a/lib/spack/spack/globals.py +++ b/lib/spack/spack/globals.py @@ -70,7 +70,6 @@ # Curl tool for fetching files. curl = which("curl", required=True) -curl.add_default_arg("-k") # TODO: remove me in favor of spack -k` # Whether to build in tmp space or directly in the stage_path. # If this is true, then spack will make stage directories in From e8bf148e08b4287e01d361ed6ab1086e102d640b Mon Sep 17 00:00:00 2001 From: "Gregory L. Lee" Date: Fri, 14 Mar 2014 08:40:57 -0700 Subject: [PATCH 10/10] initial stat creation --- lib/spack/spack/packages/stat.py | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 lib/spack/spack/packages/stat.py diff --git a/lib/spack/spack/packages/stat.py b/lib/spack/spack/packages/stat.py new file mode 100644 index 0000000000..89ade201d3 --- /dev/null +++ b/lib/spack/spack/packages/stat.py @@ -0,0 +1,40 @@ +# FIXME: +# This is a template package file for Spack. We've conveniently +# put "FIXME" labels next to all the things you'll want to change. +# +# Once you've edited all the FIXME's, delete this whole message, +# save this file, and test out your package like this: +# +# spack install v +# +# You can always get back here to change things with: +# +# spack edit v +# +# See the spack documentation for more information on building +# packages. +# +from spack import * + +class Stat(Package): + """Library to create, manipulate, and export graphs Graphlib.""" + # FIXME: add a proper url for your package's homepage here. + homepage = "http://www.example.com" + url = "https://github.com/lee218llnl/stat/archive/v2.0.0.tar.gz" + + versions = { '2.0.0' : 'c7494210b0ba26b577171b92838e1a9b', } + + depends_on('libdwarf') + depends_on('dyninst') + depends_on('graphlib') + depends_on('mrnet') + + def install(self, spec, prefix): + my_mrnet = spec['mrnet'] + + # FIXME: Modify the configure line to suit your build system here. + 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) + + # FIXME: Add logic to build and install here + make(parallel=False) + make("install")