From 27a284be9079ee2e1c3d52c55ecbeaa4f93d5afd Mon Sep 17 00:00:00 2001 From: Tom Merrick Date: Thu, 18 May 2017 11:14:51 -0500 Subject: [PATCH 1/2] Updated the URL to match the version --- var/spack/repos/builtin/packages/r-gmp/package.py | 2 +- var/spack/repos/builtin/packages/r-rmpfr/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/r-gmp/package.py b/var/spack/repos/builtin/packages/r-gmp/package.py index 9a686d8632c..13b890220d6 100644 --- a/var/spack/repos/builtin/packages/r-gmp/package.py +++ b/var/spack/repos/builtin/packages/r-gmp/package.py @@ -31,7 +31,7 @@ class RGmp(RPackage): using the C library GMP (GNU Multiple Precision Arithmetic).""" homepage = "http://mulcyber.toulouse.inra.fr/projects/gmp" - url = "https://cran.r-project.org/src/contrib/gmp_0.5-12.tar.gz" + url = "https://cran.r-project.org/src/contrib/gmp_0.5-13.1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/gmp" version('0.5-13.1', '4a45d45e53bf7140720bd44f10b075ed') diff --git a/var/spack/repos/builtin/packages/r-rmpfr/package.py b/var/spack/repos/builtin/packages/r-rmpfr/package.py index 3b2827e2217..cbf9b3d3c2d 100644 --- a/var/spack/repos/builtin/packages/r-rmpfr/package.py +++ b/var/spack/repos/builtin/packages/r-rmpfr/package.py @@ -33,7 +33,7 @@ class RRmpfr(RPackage): is based on the GMP (GNU Multiple Precision) Library.""" homepage = "http://rmpfr.r-forge.r-project.org" - url = "https://cran.r-project.org/src/contrib/Rmpfr_0.6-0.tar.gz" + url = "https://cran.r-project.org/src/contrib/Rmpfr_0.6-1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/Rmpfr" version('0.6-1', '55d4ec257bd2a9233bafee9e444d0265') From 55fc50fa5bc55d4aac56a88fc0a8c49d6e0423bd Mon Sep 17 00:00:00 2001 From: Tom Merrick Date: Thu, 18 May 2017 15:19:18 -0500 Subject: [PATCH 2/2] Remove duplicate packages --- .../repos/builtin/packages/r-rmpi/package.py | 55 ------------------- .../repos/builtin/packages/r-snow/package.py | 38 ------------- 2 files changed, 93 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/r-rmpi/package.py delete mode 100644 var/spack/repos/builtin/packages/r-snow/package.py diff --git a/var/spack/repos/builtin/packages/r-rmpi/package.py b/var/spack/repos/builtin/packages/r-rmpi/package.py deleted file mode 100644 index 7b955545d8f..00000000000 --- a/var/spack/repos/builtin/packages/r-rmpi/package.py +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/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 Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, 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 Lesser 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 RRmpi(RPackage): - """An interface (wrapper) to MPI APIs. It also provides interactive R - manager and worker environment.""" - - homepage = "http://www.stats.uwo.ca/faculty/yu/Rmpi" - url = "https://cran.r-project.org/src/contrib/Rmpi_0.6-6.tar.gz" - list_url = "https://cran.r-project.org/src/contrib/Archive/Rmpi" - - version('0.6-6', '59ae8ce62ff0ff99342d53942c745779') - - depends_on('mpi') - depends_on('r@2.15.1:') - - def install(self, spec, prefix): - if 'mpich' in spec: - Rmpi_type = 'MPICH' - elif 'mvapich' in spec: - Rmpi_type = 'MVAPICH' - else: - Rmpi_type = 'OPENMPI' - - my_mpi = spec['mpi'] - - R('CMD', 'INSTALL', - '--configure-args=--with-Rmpi-type=%s' % Rmpi_type + - ' --with-mpi=%s' % my_mpi.prefix, - '--library={0}'.format(self.module.r_lib_dir), - self.stage.source_path) diff --git a/var/spack/repos/builtin/packages/r-snow/package.py b/var/spack/repos/builtin/packages/r-snow/package.py deleted file mode 100644 index 662cdd80a74..00000000000 --- a/var/spack/repos/builtin/packages/r-snow/package.py +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/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 Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, 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 Lesser 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 RSnow(RPackage): - """Support for simple parallel computing in R.""" - - homepage = "https://cran.r-project.org/web/packages/snow/index.html" - url = "https://cran.r-project.org/src/contrib/snow_0.4-2.tar.gz" - list_url = "https://cran.r-project.org/src/contrib/Archive/snow" - - version('0.4-2', 'afc7b0dfd4518aedb6fc81712fd2ac70') - - depends_on('r-rmpi', type='run') - depends_on('r@2.13.1:', type=('build', 'run'))