Skip to content

Install mlpack and cereal headers in R package - #3488

Merged
rcurtin merged 7 commits into
mlpack:masterfrom
rcurtin:install-r-headers
Jun 1, 2023
Merged

rcurtin merged 7 commits into
mlpack:masterfrom
rcurtin:install-r-headers

Conversation

@rcurtin

@rcurtin rcurtin commented May 29, 2023

Copy link
Copy Markdown
Member

This handles #3486.

By putting the mlpack and cereal headers into inst/include/, they will be installed as part of the R package installation process. I also had to update Makevars to correctly include the headers (in the same way that's done in the Makevars of RcppEnsmallen).

@eddelbuettel

Copy link
Copy Markdown
Contributor

Just got in from 25 miles on the bicycle where I realized ... we are doing this likely wrong :) When you install the headers into src/, they should go directly to inst/include/ and src/Makevars should get a -I../inst/include to use them during package build. Anyway... Will review now.

@eddelbuettel eddelbuettel left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent stuff -- 🚢

Comment thread src/mlpack/bindings/R/CMakeLists.txt
Comment thread src/mlpack/bindings/R/mlpack/src/Makevars

@mlpack-bot mlpack-bot Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Second approval provided automatically after 24 hours. 👍

@zoq zoq left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@rcurtin

rcurtin commented Jun 1, 2023

Copy link
Copy Markdown
Member Author

Yep, it took me a minute to debug the failing test (unrelated to this PR), but now that it's all green I'll go ahead and merge. 👍

@rcurtin
rcurtin merged commit 3b893ba into mlpack:master Jun 1, 2023
@rcurtin
rcurtin deleted the install-r-headers branch June 1, 2023 12:38
@eddelbuettel

Copy link
Copy Markdown
Contributor

Thanks so much for the persistence! Should we make a 4.1.1 release for CRAN?

@rcurtin

rcurtin commented Jun 1, 2023

Copy link
Copy Markdown
Member Author

I was thinking of waiting on #3487 and other nearly-ready-to-go PRs to be merged, and then releasing the next version of mlpack (thus updating CRAN too). So, within the next week or so?

@eddelbuettel

Copy link
Copy Markdown
Contributor

That works too and is a wee bit cleaner :)

@conradsnicta

Copy link
Copy Markdown
Contributor

I was thinking of waiting on #3487 and other nearly-ready-to-go PRs to be merged, and then releasing the next version of mlpack (thus updating CRAN too). So, within the next week or so?

@rcurtin Suggest to label the new release as mlpack 4.2, instead of 4.1.1. The changes are more than just bug fixes -- there are new features. On top of that, people like new shiny things with bigger numbers.

@rcurtin

rcurtin commented Jun 12, 2023

Copy link
Copy Markdown
Member Author

Agreed, 4.2.0 is just fine given the new features.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants