diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2024-03-31 20:46:45 -0400 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-03-31 20:46:45 -0400 |
| commit | 155f23a52e626e8ac60f818937d5bb1a3ebe3184 (patch) | |
| tree | a19317812471db31ae2a97844d6cf74e45057466 /gnu/packages/patches/r-sgloptim.patch | |
| parent | d9dee5ea2f564fa6979ae552fd9bd5ac22f86ecc (diff) | |
| parent | 1cba1f8ce6f84c4737650401c0eb0473a45f9ff7 (diff) | |
Merge branch 'master' into mesa-updates
Change-Id: I4cd94a58b62d8c3987e4a60c76b37894ad851e35
Diffstat (limited to 'gnu/packages/patches/r-sgloptim.patch')
| -rw-r--r-- | gnu/packages/patches/r-sgloptim.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/gnu/packages/patches/r-sgloptim.patch b/gnu/packages/patches/r-sgloptim.patch new file mode 100644 index 0000000000..efba2c7013 --- /dev/null +++ b/gnu/packages/patches/r-sgloptim.patch @@ -0,0 +1,53 @@ +From cb9a15eb9d558b2b4b67f9e6806b394f65bff01f Mon Sep 17 00:00:00 2001 +From: Dirk Eddelbuettel <edd@debian.org> +Date: Wed, 30 Nov 2022 20:15:42 -0600 +Subject: [PATCH] Simplify includes and only include RcppArmadillo.h + +--- + inst/include/sgl.h | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +diff --git a/inst/include/sgl.h b/inst/include/sgl.h +index a36011e..869a295 100644 +--- a/inst/include/sgl.h ++++ b/inst/include/sgl.h +@@ -21,13 +21,12 @@ + + #define R_NO_REMAP + ++//R, Rcpp, RcppArmadillo ++#include <RcppArmadillo.h> ++ + //Progress monitor + #include <progress.hpp> + +-//Rcpp ect +-#include <RcppCommon.h> +-#include <Rconfig.h> +-#include <RcppArmadilloConfig.h> + + // Debugging + #ifdef SGL_DEBUG +@@ -45,8 +44,10 @@ + #else + // Do no debugging + #define ARMA_NO_DEBUG ++#ifndef NDEBUG + #define NDEBUG + #endif ++#endif + + // Registration helper macros + #define STR_VALUE(x) #x +@@ -59,11 +60,6 @@ + + #define CALL_METHOD(METHOD, MODULE, ARGS) {GET_STR_VALUE(FUN_NAME(METHOD,MODULE)), (DL_FUNC) &r_ ## MODULE ## _ ## METHOD, ARGS} + +-//Support for xl matrices +-//#define ARMA_64BIT_WORD +- +-#include <armadillo> +-#include <Rcpp.h> + + //Boost + #include <boost/math/special_functions/fpclassify.hpp> |