remove vendoring to check Windows build

pachadotdev · Feb 19, 2024 · cdcb1d8 · cdcb1d8
1 parent c4cd78a
commit cdcb1d8
Show file tree

Hide file tree

Showing 665 changed files with 27 additions and 182,971 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -12,6 +12,8 @@ Authors@R: c(
         comment = c(ORCID = "0000-0003-1017-7574"))
     )
 Imports:
+    cpp11,
+    cpp11armadillo (>= 0.2),
     data.table,
     Formula,
     generics,
@@ -35,5 +37,8 @@ LazyData: true
 RoxygenNote: 7.3.1
 Encoding: UTF-8
 NeedsCompilation: yes
+LinkingTo: cpp11, cpp11armadillo
 VignetteBuilder: knitr
 Config/testthat/edition: 3
+Remotes: 
+    pachadotdev/cpp11armadillo
diff --git a/README.Rmd b/README.Rmd
@@ -46,17 +46,10 @@ numerical stability in the estimation process.
 
 The software heavily borrows from Gaure 20213 and Stammann 2018 works on the
 OLS and IWLS estimator with large k-way fixed effects (i.e., the lfe and alpaca
-packages). The differences are that Capybara does not use C nor Rcpp code, all
-the code is vendored from the cpp11 and
+packages). The differences are that Capybara does not use C nor Rcpp code,
+instead it uses the cpp11 and
 [cpp11armadillo](https://github.com/pachadotdev/cpp11armadillo) packages.
 
-Cpp11 nor cpp11armadillo are listed as dependencies, because of the vendoring
-option. This decision gives you full control over the code, and you can
-eventually tweak any part of the code to your needs. For example, if you clone
-this package, you can change the line `#define ARMA_OPENMP_THREADS 8` line
-in `src/vendor/armadillo/config.hpp` to set four, sixteen, or any other number
-of threads/cores for parallelization.
-
 The summary tables are nothing like R's default and borrow from Stata outputs.
 I have also provided integrations with broom to facilitate the inclusion of
 statistical tables in Quarto/Jupyter notebooks.

diff --git a/README.md b/README.md
@@ -36,17 +36,10 @@ compromising numerical stability in the estimation process.
 The software heavily borrows from Gaure 20213 and Stammann 2018 works on
 the OLS and IWLS estimator with large k-way fixed effects (i.e., the lfe
 and alpaca packages). The differences are that Capybara does not use C
-nor Rcpp code, all the code is vendored from the cpp11 and
+nor Rcpp code, instead it uses the cpp11 and
 [cpp11armadillo](https://github.com/pachadotdev/cpp11armadillo)
 packages.
 
-Cpp11 nor cpp11armadillo are listed as dependencies, because of the
-vendoring option. This decision gives you full control over the code,
-and you can eventually tweak any part of the code to your needs. For
-example, if you clone this package, you can change the line `#define
-ARMA_OPENMP_THREADS 8` line in `src/vendor/armadillo/config.hpp` to set
-four, sixteen, or any other number of threads/cores for parallelization.
-
 The summary tables are nothing like R’s default and borrow from Stata
 outputs. I have also provided integrations with broom to facilitate the
 inclusion of statistical tables in Quarto/Jupyter notebooks.

diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,5 +3,5 @@ pkgdown: 2.0.7
 pkgdown_sha: ~
 articles:
   intro: intro.html
-last_built: 2024-02-18T23:30Z
+last_built: 2024-02-19T00:17Z
 
diff --git a/docs/reference/apes.html b/docs/reference/apes.html
diff --git a/docs/reference/bias_corr.html b/docs/reference/bias_corr.html
diff --git a/docs/reference/feglm.html b/docs/reference/feglm.html
diff --git a/docs/reference/felm.html b/docs/reference/felm.html
diff --git a/docs/reference/fenegbin.html b/docs/reference/fenegbin.html
diff --git a/docs/reference/fepoisson.html b/docs/reference/fepoisson.html
diff --git a/src/00_main.h b/src/00_main.h
@@ -1,12 +1,12 @@
 // #include <omp.h>
 
 #include <algorithm>
+#include <armadillo.hpp>
 #include <cmath>
-#include <iostream>
+#include <cpp11.hpp>
+#include <cpp11armadillo.hpp>
+// #include <iostream>
 #include <vector>
 
-#include "cpp11.hpp"
-#include "cpp11armadillo.hpp"
-
+using namespace arma;
 using namespace cpp11;
-using namespace std;
diff --git a/src/Makevars b/src/Makevars
@@ -1,7 +1,3 @@
-PKG_CPPFLAGS = -I vendor/
-# PKG_CPPFLAGS = -UDEBUG -g -I vendor/
-
-# USE -O0 for debugging
-# USE -O3 for production code
-# PKG_CXXFLAGS = -Wall -O0 -pedantic
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) 
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,7 +1,3 @@
-PKG_CPPFLAGS = -I vendor/
-# PKG_CPPFLAGS = -UDEBUG -g -I vendor/
-
-# USE -O0 for debugging
-# USE -O3 for production code
-# PKG_CXXFLAGS = -Wall -O0 -pedantic
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) 
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)