Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

start adding package parallel

git-svn-id: https://svn.r-project.org/R/trunk@56557 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
commit bf1434377877f1298088bdc7723501a66ea85575 1 parent 18e61c3
ripley authored
View
8 Makefile.in
@@ -197,10 +197,10 @@ distdir: $(DISTFILES) vignettes
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
- @mkdir -p $(distdir)/src/library/grid/inst/doc \
- $(distdir)/src/library/utils/inst/doc
- @cp library/grid/doc/*.pdf $(distdir)/src/library/grid/inst/doc
- @cp library/utils/doc/*.pdf $(distdir)/src/library/utils/inst/doc
+ @for d in grid parallel utils; do \
+ mkdir -p $(distdir)/src/library/$${d}/inst/doc; \
+ cp library/$${d}/doc/*.pdf $(distdir)/src/library/$${d}/inst/doc; \
+ done
@(cd $(distdir); tools/link-recommended)
info pdf:
View
797 configure
396 additions, 401 deletions not shown
View
3  configure.ac
@@ -2540,6 +2540,9 @@ AC_CONFIG_FILES(
src/library/methods/DESCRIPTION
src/library/methods/Makefile
src/library/methods/src/Makefile
+ src/library/parallel/DESCRIPTION
+ src/library/parallel/Makefile
+ src/library/parallel/src/Makefile
src/library/profile/Makefile
src/library/stats/DESCRIPTION
src/library/stats/Makefile
View
5 doc/NEWS.Rd
@@ -25,7 +25,7 @@
allows the y-line bias of the graphics device to be tweaked,
including to reproduce output from earlier versions of \R.
- \item Labeling of p-values in various anova tables has been
+ \item Labeling of the p-values in various anova tables has been
rationalized to be either \code{"Pr(>F)"} or \code{"Pr(>Chi)"}
(i.e. the \code{"Pr(F)"}, \code{"Pr(Chi)"} and \code{"P(>|Chi|)"}
variants have been eliminated). Code which extracts the p value
@@ -35,6 +35,9 @@
lazy-loading in packages with namespaces (which makes it consistent
with its use for data-only packages without namespaces in earlier
versions of \R).
+
+ \item There is a new package \pkg{parallel}.\cr
+ [Currently a stub.]
}
}
View
6 share/make/vars.mk
@@ -1,11 +1,11 @@
## Static (i.e., not determined by configure) Make variables to be
## shared *and* grepped from m4/R.m4 and tools/*-recommended.
-R_PKGS_BASE = base tools utils grDevices graphics stats datasets methods grid splines stats4 tcltk compiler
+R_PKGS_BASE = base tools utils grDevices graphics stats datasets methods grid splines stats4 tcltk compiler parallel
## Those which can be installed initially compiled (not base tools)
-R_PKGS_BASE1 = utils grDevices graphics stats datasets methods grid splines stats4 tcltk
+R_PKGS_BASE1 = utils grDevices graphics stats datasets methods grid splines stats4 tcltk parallel
## Those with standard R directories (not datasets, methods)
-R_PKGS_BASE2 = base tools utils grDevices graphics stats grid splines stats4 tcltk compiler
+R_PKGS_BASE2 = base tools utils grDevices graphics stats grid splines stats4 tcltk compiler parallel
R_PKGS_RECOMMENDED = MASS lattice Matrix nlme survival boot cluster codetools foreign KernSmooth rpart class nnet spatial mgcv
# there are dependencies in src/library/Recommended/Makefile*
View
2  src/library/Makefile.in
@@ -102,7 +102,7 @@ vignettes:
@if test -z "$(PDFLATEX)"; then \
$(ECHO) "'pdflatex' is needed to make vignettes but is missing on your system."; \
else \
- for pkg in grid utils; do \
+ for pkg in grid parallel utils; do \
$(ECHO) "building/updating vignettes for package '$${pkg}' ..."; \
($(ECHO) "tools:::.install_package_vignettes(\"$(srcdir)/$${pkg}\", \"$(top_builddir)/library/$${pkg}\")") | \
R_DEFAULT_PACKAGES="utils,tools" LC_ALL=C \
View
2  src/library/Makefile.win
@@ -94,7 +94,7 @@ Rdfiles:
done
vignettes:
- @for pkg in grid utils; do \
+ @for pkg in grid parallel utils; do \
$(ECHO) "building/updating vignettes for package '$${pkg}' ..."; \
($(ECHO) "tools:::.install_package_vignettes(\"$(srcdir)/$${pkg}\", \"$(top_builddir)/library/$${pkg}\")") | \
R_DEFAULT_PACKAGES="utils,tools" LC_ALL=C \
View
4 src/library/base/R/library.R
@@ -711,8 +711,8 @@ find.package <-
## time with 1000+ packages installed.
if(length(package) == 1L &&
package %in% c("base", "tools", "utils", "grDevices", "graphics",
- "stats", "datasets", "methods", "grid", "splines",
- "stats4", "tcltk"))
+ "stats", "datasets", "methods", "grid", "parallel",
+ "splines", "stats4", "tcltk"))
return(file.path(.Library, package))
use_attached <- FALSE
View
8 src/library/parallel/DESCRIPTION.in
@@ -0,0 +1,8 @@
+Package: parallel
+Version: @VERSION@
+Priority: base
+Title: Support for Parallel computation in R
+Author: R Core Team
+Maintainer: R Core Team <R-core@r-project.org>
+Description: Support for parallel computation on multicore computer systems.
+License: Part of R @VERSION@
View
35 src/library/parallel/Makefile.in
@@ -0,0 +1,35 @@
+#
+# ${R_HOME}/src/library/parallel/Makefile
+
+VPATH = @srcdir@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
+top_builddir = ../../..
+subdir = src/library/parallel
+
+include $(top_builddir)/Makeconf
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE
+
+pkg = parallel
+
+RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R`
+INSTDIRS = doc
+
+R_EXE = $(top_builddir)/bin/R --vanilla --slave
+DEFPKGS = NULL
+
+all: Makefile DESCRIPTION
+ @$(ECHO) "building package '$(pkg)'"
+ @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
+ @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc
+ @$(MAKE) mkR1 mkdesc instdirs mkpo
+@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
+@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
+
+mkR: mkR1
+
+include $(top_srcdir)/share/make/basepkg.mk
+include $(top_srcdir)/share/make/lazycomp.mk
View
28 src/library/parallel/Makefile.win
@@ -0,0 +1,28 @@
+#-*- Makefile -*-
+#
+# ${R_HOME}/src/library/parallel/Makefile.win
+
+srcdir = .
+top_srcdir = ../../..
+
+top_builddir = ../../..
+
+include $(top_builddir)/Makeconf
+
+pkg = parallel
+
+RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R`
+INSTDIRS = doc
+DEFPKGS = NULL
+
+all:
+ @$(ECHO) "building package '$(pkg)'"
+ @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
+ @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc
+ @$(MAKE) -f Makefile.win mkR1 mkdesc instdirs mkpo
+ @$(MAKE) -f Makefile.win mklazycomp
+
+mkR: mkR1
+
+include $(top_srcdir)/share/make/basepkg.mk
+include $(top_srcdir)/share/make/lazycomp.mk
View
1  src/library/parallel/NAMESPACE
@@ -0,0 +1 @@
+## Namespace for package 'parallel'
View
20 src/library/parallel/R/parlapply.R
@@ -0,0 +1,20 @@
+# File src/library/parallel/R/parlapply.R
+# Part of the R package, http://www.R-project.org
+#
+# 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; either version 2 of the License, or
+# (at your option) any later version.
+#
+# 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
+# GNU General Public License for more details.
+#
+# A copy of the GNU General Public License is available at
+# http://www.r-project.org/Licenses/
+
+parlapply <- function(X, FUN, ..., Ncpus)
+{
+ message("package parallel is just a stub")
+}
View
20 src/library/parallel/R/zzz.R
@@ -0,0 +1,20 @@
+# File src/library/parallel/R/zzz.R
+# Part of the R package, http://www.R-project.org
+#
+# 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; either version 2 of the License, or
+# (at your option) any later version.
+#
+# 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
+# GNU General Public License for more details.
+#
+# A copy of the GNU General Public License is available at
+# http://www.r-project.org/Licenses/
+
+.noGenerics <- TRUE
+
+.onAttach <- function(...)
+ packageStartupMessage("Package 'parallel' does nothing as yet")
View
33 src/library/parallel/man/parlapply.Rd
@@ -0,0 +1,33 @@
+% File src/library/parallel/man/parlapply.Rd
+% Part of the R package, http://www.R-project.org
+% Copyright 2011 R Core Development Team
+% Distributed under GPL 2 or later
+
+\name{parlapply}
+\alias{parlapply}
+\title{
+ A Parallel Version of \code{lapply}
+}
+\description{
+ A parallel version of \code{\link{lapply}}.
+}
+\usage{
+parlapply(X, FUN, ..., Ncpus)
+}
+\arguments{
+ \item{X}{a vector (atomic or list) or an \code{\link{expression}}
+ object. Other objects (including classed objects) will be coerced
+ by \code{base::\link{as.list}}.}
+ \item{FUN}{the function to be applied to each element of \code{X}:
+ see \sQuote{Details}. In the case of functions like
+ \code{+}, \code{\%*\%}, the function name must be backquoted or quoted.}
+ \item{\dots}{optional arguments to \code{FUN}.}
+ \item{Ncpus}{The number of CPUs to use.}
+}
+\details{
+ More to come
+}
+\value{
+ A list of the same length as \code{X}.
+}
+\keyword{iteration}
View
51 src/library/parallel/src/Makefile.in
@@ -0,0 +1,51 @@
+#
+# ${R_HOME}/src/library/parallel/src/Makefile
+
+pkg = parallel
+
+VPATH = @srcdir@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
+top_builddir = ../../../..
+subdir = src/library/$(pkg)/src
+R_HOME = $(top_builddir)
+R_SHARE_DIR = $(R_HOME)/share
+R_INCLUDE_DIR = $(R_HOME)/include
+
+SOURCES_C =
+
+DEPENDS = $(SOURCES_C:.c=.d)
+OBJECTS = $(SOURCES_C:.c=.o)
+
+SHLIB = $(pkg)@SHLIB_EXT@
+
+all: Makefile Makedeps
+ @$(MAKE) Makedeps
+# @$(MAKE) shlib
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+Makedeps: Makefile $(DEPENDS)
+ @cat $(DEPENDS) >> Makefile
+ @touch $@
+
+shlib: $(SHLIB)
+ @$(MKINSTALLDIRS) \
+ $(top_builddir)/library/$(pkg)/libs@R_ARCH@
+ @$(SHELL) $(top_srcdir)/tools/copy-if-change $(SHLIB) \
+ $(top_builddir)/library/$(pkg)/libs@R_ARCH@/$(SHLIB)
+
+include $(R_HOME)/etc${R_ARCH}/Makeconf
+include $(top_srcdir)/share/make/shlib.mk
+
+mostlyclean: clean
+clean:
+ @-rm -rf .libs _libs
+ @-rm -f Makedeps *.d *.o *$(SHLIB_EXT)
+distclean: clean
+ @-rm -f Makefile
+maintainer-clean: distclean
+
+## Automagically generated dependencies:
View
31 src/library/parallel/vignettes/parallel.Rnw
@@ -0,0 +1,31 @@
+\documentclass[a4paper]{article}
+
+\usepackage{Rd}
+
+%\VignetteIndexEntry{Package 'parallel'}
+%\VignettePackage{parallel}
+
+
+\title{Package `parallel'}
+\author{R-core}
+
+
+\begin{document}
+
+\maketitle
+
+\section{Introduction}
+
+It is planned to added a package \pkg{parallel} in \R{} 2.14.0.
+
+<<>>=
+library(parallel)
+@
+
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
View
2  src/library/tcltk/Makefile.in
@@ -35,7 +35,7 @@ all: Makefile DESCRIPTION
$(top_builddir)/library/$(pkg)/R/$(pkg) ; \
fi)
@$(INSTALL_DATA) $(srcdir)/NAMESPACE $(top_builddir)/library/$(pkg)
- rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds
+ @rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds
@$(MAKE) mkdesc mkexec mkdemos mkpo
@if test -d src -a @use_tcltk@ = yes; then \
(cd src && $(MAKE)) || exit 1; \
Please sign in to comment.
Something went wrong with that request. Please try again.