Skip to content

Commit c651dd3

Browse files
coatlesscoatless
committed
Roll new version
1 parent 20675ef commit c651dd3

File tree

9 files changed

+47
-202
lines changed

9 files changed

+47
-202
lines changed

‎ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2025-09-09 James Balamuta <[email protected]>
2+
3+
* DESCRIPTION: Updated requirements for RcppArmadillo
4+
* vignettes/package-usage.Rmd: Add define requirement
5+
6+
* DESCRIPTION (Version): Release 2.22.1-2
7+
* NEWS.md: Update for release 2.22.1-2
8+
9+
2025-09-08 Dirk Eddelbuettel <[email protected]>
10+
11+
* src/Makevars: Added define to opt-in to current armadillo version
12+
* src/Makevars.win: ditto
13+
114
2024-12-03 James Balamuta <[email protected]>
215

316
* DESCRIPTION: Updated requirements for Armadillo and C++ compiler

‎DESCRIPTION‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: RcppEnsmallen
22
Title: Header-Only C++ Mathematical Optimization Library for 'Armadillo'
3-
Version: 0.2.22.1.1
3+
Version: 0.2.22.1.2
44
Authors@R: c(
55
person("James Joseph", "Balamuta", email = "[email protected]",
66
role = c("aut", "cre", "cph"),
@@ -23,14 +23,14 @@ Description: 'Ensmallen' is a templated C++ mathematical optimization library
2323
the GNU GPL version 2 or later. Thus, 'RcppEnsmallen' is also licensed under
2424
similar terms. Note that 'Ensmallen' requires a compiler that supports
2525
'C++14' and 'Armadillo' 10.8.2 or later.
26-
Depends: R (>= 4.0.0)
26+
Depends: R (>= 4.3.0)
2727
License: GPL (>= 2)
2828
URL: https://github.com/coatless-rpkg/rcppensmallen, https://r-pkg.thecoatlessprofessor.com/rcppensmallen/, https://github.com/mlpack/ensmallen, https://ensmallen.org/
2929
BugReports: https://github.com/coatless-rpkg/rcppensmallen/issues
3030
Encoding: UTF-8
31-
LinkingTo: Rcpp, RcppArmadillo (>= 15.0.2-1)
31+
LinkingTo: Rcpp, RcppArmadillo
3232
Imports: Rcpp
33-
RoxygenNote: 7.3.2
33+
RoxygenNote: 7.3.3
3434
Roxygen: list(markdown = TRUE)
3535
Suggests:
3636
knitr,

‎NEWS.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# RcppEnsmallen 0.2.22.1.2
2+
3+
- `-DARMA_USE_CURRENT` added to `PKG_CXXFLAGS` to use Armadillo 15.0.2 or higher
4+
([#69](https://github.com/coatless-rpkg/rcppensmallen/pull/69)).
5+
- `DESCRIPTION` now emphasizes R 4.3.0 or higher for a higher C++ standard by default.
6+
17
# RcppEnsmallen 0.2.22.1.1
28

39
- Upgraded to ensmallen 2.22.1: "E-Bike Excitement" (2024-12-03)

‎revdep/.gitignore‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎revdep/README.md‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
# Platform
22

3-
|field |value |
4-
|:--------|:------------------------------------------|
5-
|version |R version 4.4.2 (2024-10-31) |
6-
|os |macOS Sequoia 15.1.1 |
7-
|system |aarch64, darwin20 |
8-
|ui |RStudio |
9-
|language |(EN) |
10-
|collate |en_US.UTF-8 |
11-
|ctype |en_US.UTF-8 |
12-
|tz |America/Chicago |
13-
|date |2024-11-30 |
14-
|rstudio |2024.09.1+394 Cranberry Hibiscus (desktop) |
15-
|pandoc |3.5 @ /opt/homebrew/bin/pandoc |
3+
|field |value |
4+
|:--------|:--------------------------------------------|
5+
|version |R version 4.5.1 (2025-06-13) |
6+
|os |macOS Sequoia 15.6.1 |
7+
|system |aarch64, darwin20 |
8+
|ui |RStudio |
9+
|language |(EN) |
10+
|collate |en_US.UTF-8 |
11+
|ctype |en_US.UTF-8 |
12+
|tz |America/Chicago |
13+
|date |2025-09-09 |
14+
|rstudio |2025.05.1+513 Mariposa Orchid (desktop) |
15+
|pandoc |3.7.0.2 @ /opt/homebrew/bin/ (via rmarkdown) |
16+
|quarto |1.7.34 @ /usr/local/bin/quarto |
1617

1718
# Dependencies
1819

1920
|package |old |new |Δ |
2021
|:-------------|:----------|:----------|:--|
21-
|RcppEnsmallen |0.2.21.1.1 |0.2.22.0.1 |* |
22+
|RcppEnsmallen |0.2.22.1.1 |0.2.22.1.2 |* |
2223

2324
# Revdeps
2425

25-
## Failed to check (1)
26-
27-
|package |version |error |warning |note |
28-
|:--------|:-------|:------|:-------|:----|
29-
|[sparsevb](failures.md#sparsevb)|0.1.0 |__+1__ | |-1 |
30-

‎revdep/cran.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
## revdepcheck results
22

3-
We checked 6 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
3+
We checked 2 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
44

55
* We saw 0 new problems
6-
* We failed to check 1 packages
6+
* We failed to check 0 packages
77

8-
Issues with CRAN packages are summarised below.
9-
10-
### Failed to check
11-
12-
* sparsevb (NA)

‎revdep/failures.md‎

Lines changed: 1 addition & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1 @@
1-
# sparsevb
2-
3-
<details>
4-
5-
* Version: 0.1.0
6-
* GitHub: NA
7-
* Source code: https://github.com/cran/sparsevb
8-
* Date/Publication: 2021-01-15 09:20:02 UTC
9-
* Number of recursive dependencies: 18
10-
11-
Run `revdepcheck::revdep_details(, "sparsevb")` for more info
12-
13-
</details>
14-
15-
## Newly broken
16-
17-
* checking whether package ‘sparsevb’ can be installed ... ERROR
18-
```
19-
Installation failed.
20-
See ‘/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/checks.noindex/sparsevb/new/sparsevb.Rcheck/00install.out’ for details.
21-
```
22-
23-
## Newly fixed
24-
25-
* checking C++ specification ... NOTE
26-
```
27-
Specified C++11: please drop specification unless essential
28-
```
29-
30-
## Installation
31-
32-
### Devel
33-
34-
```
35-
* installing *source* package ‘sparsevb’ ...
36-
** package ‘sparsevb’ successfully unpacked and MD5 sums checked
37-
** using staged installation
38-
** libs
39-
using C++ compiler: ‘Apple clang version 16.0.0 (clang-1600.0.26.4)’
40-
using C++11
41-
using SDK: ‘MacOSX15.1.sdk’
42-
clang++ -arch arm64 -std=gnu++11 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/Rcpp/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/RcppArmadillo/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/new/RcppEnsmallen/include' -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c RcppExports.cpp -o RcppExports.o
43-
In file included from RcppExports.cpp:5:
44-
In file included from /Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/new/RcppEnsmallen/include/RcppEnsmallen.h:25:
45-
/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/new/RcppEnsmallen/include/ensmallen.hpp:32:4: error: "*** C++14 compiler required; enable C++14 mode in your compiler, or use an earlier version of ensmallen"
46-
32 | #error "*** C++14 compiler required; enable C++14 mode in your compiler, or use an earlier version of ensmallen"
47-
| ^
48-
1 error generated.
49-
make: *** [RcppExports.o] Error 1
50-
ERROR: compilation failed for package ‘sparsevb’
51-
* removing ‘/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/checks.noindex/sparsevb/new/sparsevb.Rcheck/sparsevb’
52-
53-
54-
```
55-
### CRAN
56-
57-
```
58-
* installing *source* package ‘sparsevb’ ...
59-
** package ‘sparsevb’ successfully unpacked and MD5 sums checked
60-
** using staged installation
61-
** libs
62-
using C++ compiler: ‘Apple clang version 16.0.0 (clang-1600.0.26.4)’
63-
using C++11
64-
using SDK: ‘MacOSX15.1.sdk’
65-
clang++ -arch arm64 -std=gnu++11 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/Rcpp/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/RcppArmadillo/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/old/RcppEnsmallen/include' -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c RcppExports.cpp -o RcppExports.o
66-
clang++ -arch arm64 -std=gnu++11 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/Rcpp/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/RcppArmadillo/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/old/RcppEnsmallen/include' -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c fit_linear.cpp -o fit_linear.o
67-
clang++ -arch arm64 -std=gnu++11 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/Rcpp/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/RcppArmadillo/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/old/RcppEnsmallen/include' -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c fit_logit.cpp -o fit_logit.o
68-
...
69-
** R
70-
** byte-compile and prepare package for lazy loading
71-
** help
72-
*** installing help indices
73-
** building package indices
74-
** testing if installed package can be loaded from temporary location
75-
** checking absolute paths in shared objects and dynamic libraries
76-
** testing if installed package can be loaded from final location
77-
** testing if installed package keeps a record of temporary installation path
78-
* DONE (sparsevb)
79-
80-
81-
```
1+
*Wow, no problems at all. :)*

‎revdep/problems.md‎

Lines changed: 1 addition & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1 @@
1-
# sparsevb
2-
3-
<details>
4-
5-
* Version: 0.1.0
6-
* GitHub: NA
7-
* Source code: https://github.com/cran/sparsevb
8-
* Date/Publication: 2021-01-15 09:20:02 UTC
9-
* Number of recursive dependencies: 18
10-
11-
Run `revdepcheck::revdep_details(, "sparsevb")` for more info
12-
13-
</details>
14-
15-
## Newly broken
16-
17-
* checking whether package ‘sparsevb’ can be installed ... ERROR
18-
```
19-
Installation failed.
20-
See ‘/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/checks.noindex/sparsevb/new/sparsevb.Rcheck/00install.out’ for details.
21-
```
22-
23-
## Newly fixed
24-
25-
* checking C++ specification ... NOTE
26-
```
27-
Specified C++11: please drop specification unless essential
28-
```
29-
30-
## Installation
31-
32-
### Devel
33-
34-
```
35-
* installing *source* package ‘sparsevb’ ...
36-
** package ‘sparsevb’ successfully unpacked and MD5 sums checked
37-
** using staged installation
38-
** libs
39-
using C++ compiler: ‘Apple clang version 16.0.0 (clang-1600.0.26.4)’
40-
using C++11
41-
using SDK: ‘MacOSX15.1.sdk’
42-
clang++ -arch arm64 -std=gnu++11 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/Rcpp/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/RcppArmadillo/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/new/RcppEnsmallen/include' -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c RcppExports.cpp -o RcppExports.o
43-
In file included from RcppExports.cpp:5:
44-
In file included from /Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/new/RcppEnsmallen/include/RcppEnsmallen.h:25:
45-
/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/new/RcppEnsmallen/include/ensmallen.hpp:32:4: error: "*** C++14 compiler required; enable C++14 mode in your compiler, or use an earlier version of ensmallen"
46-
32 | #error "*** C++14 compiler required; enable C++14 mode in your compiler, or use an earlier version of ensmallen"
47-
| ^
48-
1 error generated.
49-
make: *** [RcppExports.o] Error 1
50-
ERROR: compilation failed for package ‘sparsevb’
51-
* removing ‘/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/checks.noindex/sparsevb/new/sparsevb.Rcheck/sparsevb’
52-
53-
54-
```
55-
### CRAN
56-
57-
```
58-
* installing *source* package ‘sparsevb’ ...
59-
** package ‘sparsevb’ successfully unpacked and MD5 sums checked
60-
** using staged installation
61-
** libs
62-
using C++ compiler: ‘Apple clang version 16.0.0 (clang-1600.0.26.4)’
63-
using C++11
64-
using SDK: ‘MacOSX15.1.sdk’
65-
clang++ -arch arm64 -std=gnu++11 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/Rcpp/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/RcppArmadillo/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/old/RcppEnsmallen/include' -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c RcppExports.cpp -o RcppExports.o
66-
clang++ -arch arm64 -std=gnu++11 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/Rcpp/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/RcppArmadillo/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/old/RcppEnsmallen/include' -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c fit_linear.cpp -o fit_linear.o
67-
clang++ -arch arm64 -std=gnu++11 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/Rcpp/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/sparsevb/RcppArmadillo/include' -I'/Users/ronin/Documents/GitHub/r-pkg/rcppensmallen/revdep/library.noindex/RcppEnsmallen/old/RcppEnsmallen/include' -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c fit_logit.cpp -o fit_logit.o
68-
...
69-
** R
70-
** byte-compile and prepare package for lazy loading
71-
** help
72-
*** installing help indices
73-
** building package indices
74-
** testing if installed package can be loaded from temporary location
75-
** checking absolute paths in shared objects and dynamic libraries
76-
** testing if installed package can be loaded from final location
77-
** testing if installed package keeps a record of temporary installation path
78-
* DONE (sparsevb)
79-
80-
81-
```
1+
*Wow, no problems at all. :)*

‎vignettes/package-usage.Rmd‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Open your R package's `DESCRIPTION` file. Ensure that the `LinkingTo` directive
2525
is present and contains:
2626

2727
```bash
28-
LinkingTo: Rcpp, RcppArmadillo (>= 0.9.800.0.0), RcppEnsmallen (>= 0.2.20.0.1)
28+
LinkingTo: Rcpp, RcppArmadillo (>= 15.0.2-1), RcppEnsmallen (>= 0.2.22.1.2)
2929
```
3030

3131
## Makevars inside the src/ Directory
@@ -34,9 +34,12 @@ Next, the `src/` directory must contain both a `Makevars` and `Makevars.win`
3434
file. Each file must have the same contents of:
3535

3636
```bash
37-
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
37+
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DARMA_USE_CURRENT
3838
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
3939
```
4040

4141
The `Makevars.win` file provides the appropriate configuration for Windows
4242
while `Makevars` acts on Unix-alike systems like macOS, Linux, and Solaris.
43+
44+
**Note:** The `-DARMA_USE_CURRENT` define is required to use 15.0.2 of
45+
Armadillo library.

0 commit comments

Comments
 (0)