Skip to content

Commit 1ebf4d5

Browse files
authored
Merge pull request #92 from RcppCore/feature/eigen-3.3.9
Update to Eigen 3.3.9 (closes #91)
2 parents 09e8a6d + 6196440 commit 1ebf4d5

File tree

92 files changed

+1364
-857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1364
-857
lines changed

.travis.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,36 @@
22

33
language: c
44
sudo: required
5-
dist: trusty
5+
dist: focal
6+
7+
jobs:
8+
include:
9+
- name: linux
10+
os: linux
11+
#- name: macOS
12+
# os: osx
13+
14+
env:
15+
global:
16+
- USE_BSPM="true"
17+
- _R_CHECK_FORCE_SUGGESTS_="false"
618

719
before_install:
8-
- curl -OLs https://eddelbuettel.github.io/r-travis/run.sh && chmod 0755 run.sh
9-
# add our launchpad repo which has additional packages -- not needed here
10-
# - sudo add-apt-repository -y ppa:edd/r-3.5
20+
- curl -OLs https://eddelbuettel.github.io/r-ci/run.sh && chmod 0755 run.sh
1121
- ./run.sh bootstrap
1222

1323
install:
14-
- ./run.sh install_aptget r-cran-rcpp r-cran-matrix r-cran-inline r-cran-tinytest r-cran-pkgkitten r-cran-microbenchmark
24+
- ./run.sh install_all
1525

1626
script:
1727
- ./run.sh run_tests
1828

19-
#after_success:
20-
# - ./run.sh coverage
21-
2229
after_failure:
2330
- ./run.sh dump_logs
2431

32+
#after_success:
33+
# - ./run.sh coverage
34+
2535
notifications:
2636
email:
2737
on_success: change

ChangeLog

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
2020-12-05 Dirk Eddelbuettel <edd@debian.org>
2+
3+
* DESCRIPTION (Version, Date): Release 0.3.3.9.0
4+
5+
* inst/include/Eigen: Upgraded to Eigen 3.3.9
6+
* inst/include/unsupported/Eigen: Idem
7+
* patches/eigen-3.3.9.diff: Carried local CRAN patches forward
8+
9+
* .travis.yml: Switch to r-ci using focal and bspm
10+
11+
* README.md: Updated URLs to https and/or redirect location
12+
* inst/CITATION: Idem
13+
* man/RcppEigen-package.Rd: Idem
14+
* man/fastLm.Rd: Idem
15+
116
2020-08-16 Dirk Eddelbuettel <edd@debian.org>
217

318
* README.md: Add JSS badge

DESCRIPTION

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: RcppEigen
22
Type: Package
33
Title: 'Rcpp' Integration for the 'Eigen' Templated Linear Algebra Library
4-
Version: 0.3.3.7.0
5-
Date: 2019-11-16
4+
Version: 0.3.3.9.0
5+
Date: 2020-12-05
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>
@@ -21,7 +21,6 @@ Description: R and 'Eigen' integration using 'Rcpp'.
2121
later. 'RcppEigen' (the 'Rcpp' bindings/bridge to 'Eigen') is licensed under
2222
the GNU GPL version 2 or later, as is the rest of 'Rcpp'.
2323
License: GPL (>= 2) | file LICENSE
24-
Depends: R (>= 2.15.1)
2524
LazyLoad: yes
2625
LinkingTo: Rcpp
2726
Imports: Matrix (>= 1.1-0), Rcpp (>= 0.11.0), stats, utils

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
## RcppEigen: Rcpp Integration for the Eigen Templated Linear Algebra Library
22

33
[![Build Status](https://travis-ci.org/RcppCore/RcppEigen.svg)](https://travis-ci.org/RcppCore/RcppEigen)
4-
[![License](http://img.shields.io/badge/license-GPL%20%28%3E=%202%29-brightgreen.svg?style=flat)](http://www.gnu.org/licenses/gpl-2.0.html)
5-
[![License](http://img.shields.io/badge/license-MPL2-brightgreen.svg?style=flat)](http://www.mozilla.org/MPL/2.0/)
6-
[![CRAN](http://www.r-pkg.org/badges/version/RcppEigen)](https://cran.r-project.org/package=RcppEigen)
4+
[![License](https://img.shields.io/badge/license-GPL%20%28%3E=%202%29-brightgreen.svg?style=flat)](https://www.gnu.org/licenses/gpl-2.0.html)
5+
[![License](https://img.shields.io/badge/license-MPL2-brightgreen.svg?style=flat)](https://www.mozilla.org/MPL/2.0/)
6+
[![CRAN](https://www.r-pkg.org/badges/version/RcppEigen)](https://cran.r-project.org/package=RcppEigen)
77
[![Dependencies](https://tinyverse.netlify.com/badge/RcppEigen)](https://cran.r-project.org/package=RcppEigen)
88
[![Debian package](https://img.shields.io/debian/v/r-cran-rcppeigen/sid?color=brightgreen)](https://packages.debian.org/sid/r-cran-rcppeigen)
99
[![Last Commit](https://img.shields.io/github/last-commit/RcppCore/RcppEigen)](https://github.com/RcppCore/RcppEigen)
10-
[![Downloads](http://cranlogs.r-pkg.org/badges/RcppEigen?color=brightgreen)](http://www.r-pkg.org/pkg/RcppEigen)
10+
[![Downloads](https://cranlogs.r-pkg.org/badges/RcppEigen?color=brightgreen)](https://www.r-pkg.org:443/pkg/RcppEigen)
1111
[![CRAN use](https://jangorecki.gitlab.io/rdeps/RcppEigen/CRAN_usage.svg?sanitize=true)](https://cran.r-project.org/package=RcppEigen)
1212
[![BioConductor use](https://jangorecki.gitlab.io/rdeps/RcppEigen/BioC_usage.svg?sanitize=true)](https://cran.r-project.org/package=RcppEigen)
1313
[![StackOverflow](https://img.shields.io/badge/stackoverflow-rcpp-orange.svg)](https://stackoverflow.com/questions/tagged/rcpp)
@@ -16,19 +16,19 @@
1616

1717
### Synopsis
1818

19-
[Eigen](http://eigen.tuxfamily.org) is a C++ template library for linear algebra:
19+
[Eigen](http://eigen.tuxfamily.org/index.php?title=Main_Page) is a C++ template library for linear algebra:
2020
matrices, vectors, numerical solvers and related algorithms. It supports dense and sparse
2121
matrices on integer, floating point and complex numbers, decompositions of such matrices,
2222
and solutions of linear systems. Its performance on many algorithms is comparable with
2323
some of the best implementations based on `Lapack` and level-3 `BLAS`.
2424

25-
RcppEigen provides an interface from R to and from [Eigen](http://eigen.tuxfamily.org) by
25+
RcppEigen provides an interface from R to and from [Eigen](http://eigen.tuxfamily.org/index.php?title=Main_Page) by
2626
using the facilities offered by the [Rcpp](http://dirk.eddelbuettel.com/code/rcpp.html)
2727
package for seamless R and C++ integration.
2828

2929
### Examples
3030

31-
A few examples are over at the [Rcpp Gallery](http://gallery.rcpp.org/tags/eigen/). A simple one is
31+
A few examples are over at the [Rcpp Gallery](https://gallery.rcpp.org/tags/eigen/). A simple one is
3232

3333
```c++
3434
#include <RcppEigen.h>
@@ -55,13 +55,13 @@ sourceCpp("eigenExample.cpp")
5555
5656
due to the two Rcpp directives to use headers from the RcppEigen package, and to export
5757
the `getEigenValues()` function -- but read [the full
58-
post](http://gallery.rcpp.org/articles/eigen-eigenvalues/) for details.
58+
post](https://gallery.rcpp.org/articles/eigen-eigenvalues/) for details.
5959
6060
6161
### Status
6262
6363
The package is mature and under active development, following the
64-
[Eigen](http://eigen.tuxfamily.org) release cycle.
64+
[Eigen](http://eigen.tuxfamily.org/index.php?title=Main_Page) release cycle.
6565
6666
### Documentation
6767

inst/CITATION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ citEntry(entry = "Article",
99
volume = "52",
1010
number = "5",
1111
pages = "1--24",
12-
url = "http://www.jstatsoft.org/v52/i05/",
12+
url = "https://www.jstatsoft.org/v52/i05/",
1313

1414
textVersion =
1515
paste("Douglas Bates, Dirk Eddelbuettel (2013).",
1616
"Fast and Elegant Numerical Linear Algebra Using the RcppEigen Package.",
1717
"Journal of Statistical Software, 52(5), 1-24.",
18-
"URL http://www.jstatsoft.org/v52/i05/.")
18+
"URL https://www.jstatsoft.org/v52/i05/.")
1919
)

inst/include/Eigen/Core

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,10 @@
279279
#include <cmath>
280280
#include <cassert>
281281
#include <functional>
282-
#include <iosfwd>
282+
#include <sstream>
283+
#ifndef EIGEN_NO_IO
284+
#include <iosfwd>
285+
#endif
283286
#include <cstring>
284287
#include <string>
285288
#include <limits>
@@ -375,7 +378,9 @@ using std::ptrdiff_t;
375378

376379
#if defined EIGEN_VECTORIZE_AVX512
377380
#include "src/Core/arch/SSE/PacketMath.h"
381+
#include "src/Core/arch/SSE/MathFunctions.h"
378382
#include "src/Core/arch/AVX/PacketMath.h"
383+
#include "src/Core/arch/AVX/MathFunctions.h"
379384
#include "src/Core/arch/AVX512/PacketMath.h"
380385
#include "src/Core/arch/AVX512/MathFunctions.h"
381386
#elif defined EIGEN_VECTORIZE_AVX

inst/include/Eigen/Eigenvalues

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
#include "Core"
1212

13-
#include "src/Core/util/DisableStupidWarnings.h"
14-
1513
#include "Cholesky"
1614
#include "Jacobi"
1715
#include "Householder"
1816
#include "LU"
1917
#include "Geometry"
2018

19+
#include "src/Core/util/DisableStupidWarnings.h"
20+
2121
/** \defgroup Eigenvalues_Module Eigenvalues module
2222
*
2323
*

inst/include/Eigen/Geometry

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
#include "Core"
1212

13-
#include "src/Core/util/DisableStupidWarnings.h"
14-
1513
#include "SVD"
1614
#include "LU"
1715
#include <limits>
1816

17+
#include "src/Core/util/DisableStupidWarnings.h"
18+
1919
/** \defgroup Geometry_Module Geometry module
2020
*
2121
* This module provides support for:

inst/include/Eigen/QR

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
#include "Core"
1212

13-
#include "src/Core/util/DisableStupidWarnings.h"
14-
1513
#include "Cholesky"
1614
#include "Jacobi"
1715
#include "Householder"
1816

17+
#include "src/Core/util/DisableStupidWarnings.h"
18+
1919
/** \defgroup QR_Module QR module
2020
*
2121
*

inst/include/Eigen/SparseQR

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
*
2929
*/
3030

31-
#include "OrderingMethods"
3231
#include "src/SparseCore/SparseColEtree.h"
3332
#include "src/SparseQR/SparseQR.h"
3433

0 commit comments

Comments
 (0)