Skip to content

Commit 4bb1617

Browse files
eddelbuetteleddelbuettel
committed
release 0.3.2.9.1
1 parent 7bc0efb commit 4bb1617

File tree

9 files changed

+91
-17
lines changed

9 files changed

+91
-17
lines changed

‎.Rbuildignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ NEWS.org
44
vignettes/jss.bst
55
.travis.yml
66
debian
7+
^.*\.Rproj$
8+
^\.Rproj\.user$

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.Rproj.user
2+
.Rhistory
3+
.RData
4+
.Ruserdata
5+
src/*.o
6+
src/*.so
7+
src/*.dll

‎ChangeLog‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
2017-03-14 Dirk Eddelbuettel <edd@debian.org>
2+
3+
* DESCRIPTION (Version, Date): Release 0.3.2.9.1
4+
5+
* src/init.c (R_init_RcppEigen): Call R_registerRoutines()
6+
and R_useDynamicSymbols()
7+
8+
* NAMESPACE: Use .registration=TRUE on useDynLib
9+
10+
* R/fastLm.R (fastLmPure): Remove erroneous fourth argument from .Call
11+
12+
2017-03-13 Martin Maechler <maechler@r-project.org>
13+
14+
* inst/include/RcppEigenCholmod.h: Synchronize with Matrix package
15+
116
2016-12-22 Dirk Eddelbuettel <edd@debian.org>
217

318
* DESCRIPTION (URL, BugReports): Added / updated

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package: RcppEigen
22
Type: Package
33
Title: 'Rcpp' Integration for the 'Eigen' Templated Linear Algebra Library
44
Version: 0.3.2.9.1
5-
Date: 2017-03-13
5+
Date: 2017-03-14
66
Author: Douglas Bates, Dirk Eddelbuettel, Romain Francois, and Yixuan Qiu;
77
the authors of Eigen for the included version of Eigen
88
Maintainer: Dirk Eddelbuettel <edd@debian.org>

‎NAMESPACE‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
useDynLib(RcppEigen)
1+
useDynLib("RcppEigen", .registration=TRUE)
22

33
importClassesFrom("Matrix", "dgCMatrix", "dgeMatrix", "dsCMatrix", "dtCMatrix")
4-
importFrom(Rcpp, "evalCpp")
5-
importFrom(utils, "packageDescription", "package.skeleton")
6-
importFrom(stats, "model.frame", "model.matrix", "model.response", "fitted", "coef", "printCoefmat", "pt")
7-
#exportPattern("^[[:alpha:]]+")
8-
export(fastLm,
9-
fastLmPure,
10-
RcppEigen.package.skeleton
4+
importFrom("Rcpp", "evalCpp")
5+
importFrom("utils", "packageDescription", "package.skeleton")
6+
importFrom("stats", "model.frame", "model.matrix", "model.response", "fitted", "coef", "printCoefmat", "pt")
7+
export("fastLm",
8+
"fastLmPure",
9+
"RcppEigen.package.skeleton"
1110
)
1211

13-
S3method(fastLm, default)
14-
S3method(fastLm, formula)
15-
S3method(predict, fastLm)
16-
S3method(print, fastLm)
17-
S3method(summary, fastLm)
18-
S3method(print, summary.fastLm)
12+
S3method("fastLm", "default")
13+
S3method("fastLm", "formula")
14+
S3method("predict", "fastLm")
15+
S3method("print", "fastLm")
16+
S3method("summary", "fastLm")
17+
S3method("print", "summary.fastLm")

‎R/fastLm.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## fastLm.R: Rcpp/Eigen implementation of lm()
22
##
3-
## Copyright (C) 2011 - 2015 Douglas Bates, Dirk Eddelbuettel and Romain Francois
3+
## Copyright (C) 2011 - 2017 Douglas Bates, Dirk Eddelbuettel and Romain Francois
44
##
55
## This file is part of RcppEigen.
66
##
@@ -21,7 +21,7 @@ fastLmPure <- function(X, y, method = 0L) {
2121

2222
stopifnot(is.matrix(X), is.numeric(y), NROW(y)==nrow(X))
2323

24-
.Call("RcppEigen_fastLm_Impl", X, y, method, colnames(X), PACKAGE="RcppEigen")
24+
.Call("RcppEigen_fastLm_Impl", X, y, method, PACKAGE="RcppEigen")
2525
}
2626

2727
fastLm <- function(X, ...) UseMethod("fastLm")

‎inst/NEWS.Rd‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
\newcommand{\ghpr}{\href{https://github.com/RcppCore/RcppEigen/pull/#1}{##1}}
44
\newcommand{\ghit}{\href{https://github.com/RcppCore/RcppEigen/issues/#1}{##1}}
55

6+
\section{Changes in RcppEigen version 0.3.2.9.1 (2017-03-14)}{
7+
\itemize{
8+
\item Synchronize CholMod header file with Matrix package to ensure
9+
binary compatibility on all platforms (Martin Maechler in \ghpr{42})
10+
\item Added file \code{init.c} with calls to \code{R_registerRoutines()}
11+
\code{and R_useDynamicSymbols()}; also use \code{.registration=TRUE}
12+
in \code{useDynLib} in \code{NAMESPACE}
13+
}
14+
}
15+
616
\section{Changes in RcppEigen version 0.3.2.9.0 (2016-08-20)}{
717
\itemize{
818
\item Updated to version 3.2.9 of Eigen (PR \ghpr{37} by Yixuan

‎rcppeigen.Rproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Version: 1.0
2+
3+
RestoreWorkspace: Default
4+
SaveWorkspace: Default
5+
AlwaysSaveHistory: Default
6+
7+
EnableCodeIndexing: Yes
8+
UseSpacesForTab: Yes
9+
NumSpacesForTab: 4
10+
Encoding: UTF-8
11+
12+
RnwWeave: Sweave
13+
LaTeX: pdfLaTeX
14+
15+
BuildType: Package
16+
PackageInstallArgs: --no-multiarch --with-keep.source

‎src/init.c‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#include <R.h>
2+
#include <Rinternals.h>
3+
#include <stdlib.h> // for NULL
4+
#include <R_ext/Rdynload.h>
5+
6+
/* FIXME:
7+
Check these declarations against the C/Fortran source code.
8+
*/
9+
10+
/* .Call calls */
11+
extern SEXP RcppEigen_Eigen_SSE();
12+
extern SEXP RcppEigen_eigen_version(SEXP);
13+
extern SEXP RcppEigen_fastLm_Impl(SEXP, SEXP, SEXP);
14+
15+
static const R_CallMethodDef CallEntries[] = {
16+
{"RcppEigen_Eigen_SSE", (DL_FUNC) &RcppEigen_Eigen_SSE, 0},
17+
{"RcppEigen_eigen_version", (DL_FUNC) &RcppEigen_eigen_version, 1},
18+
{"RcppEigen_fastLm_Impl", (DL_FUNC) &RcppEigen_fastLm_Impl, 3},
19+
{NULL, NULL, 0}
20+
};
21+
22+
void R_init_RcppEigen(DllInfo *dll) {
23+
R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
24+
R_useDynamicSymbols(dll, FALSE);
25+
}

0 commit comments

Comments
 (0)