549a72f128
* gnu/packages/patches/r-sgloptim.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/cran.scm (r-sgloptim)[source]: Apply it. Change-Id: I6435ec1dfadcffac684c378cd074777a19cd0d7f
54 lines
1.2 KiB
Diff
54 lines
1.2 KiB
Diff
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>
|