From 23dd4dd055d589246e64515983e9dbfa48c3277f Mon Sep 17 00:00:00 2001 From: Kenneth Benoit Date: Mon, 2 Sep 2024 19:33:46 +0800 Subject: [PATCH 1/6] Try adding back RcppArmadillo --- DESCRIPTION | 1 + src/keyness.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index a5330d3..e2acd59 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -25,6 +25,7 @@ Imports: nsyllable, proxyC (>= 0.1.4), Rcpp (>= 0.12.12), + RcppArmadillo (>= 0.7.600.1.0), stringi LinkingTo: Rcpp, RcppArmadillo (>= 0.7.600.1.0), quanteda Suggests: diff --git a/src/keyness.cpp b/src/keyness.cpp index 31a77c3..04db308 100644 --- a/src/keyness.cpp +++ b/src/keyness.cpp @@ -1,5 +1,6 @@ #include "lib.h" #include "dev.h" +#include using namespace quanteda; @@ -123,7 +124,7 @@ Rcpp::NumericVector cpp_keyness(arma::sp_mat &mt, std::vector row0 = to_vector(mt.row(0)); std::vector row1 = to_vector(mt.row(1)); DoubleParams stats(mt.n_cols); - + #if QUANTEDA_USE_TBB tbb::task_arena arena(thread); arena.execute([&]{ From 4476cc3b49c7764e86a8a73ea9c9c69617e1d8bb Mon Sep 17 00:00:00 2001 From: Kohei Watanabe Date: Tue, 3 Sep 2024 08:07:28 +0900 Subject: [PATCH 2/6] Include RcppArmadillo first --- src/keyness.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keyness.cpp b/src/keyness.cpp index 04db308..b31dc87 100644 --- a/src/keyness.cpp +++ b/src/keyness.cpp @@ -1,6 +1,6 @@ +#include #include "lib.h" #include "dev.h" -#include using namespace quanteda; From cc67c19744042a30bd53a9464ed1bb0a3bc422d3 Mon Sep 17 00:00:00 2001 From: Kohei Watanabe Date: Tue, 3 Sep 2024 08:40:24 +0900 Subject: [PATCH 3/6] Fix import --- DESCRIPTION | 1 - 1 file changed, 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index e2acd59..a5330d3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -25,7 +25,6 @@ Imports: nsyllable, proxyC (>= 0.1.4), Rcpp (>= 0.12.12), - RcppArmadillo (>= 0.7.600.1.0), stringi LinkingTo: Rcpp, RcppArmadillo (>= 0.7.600.1.0), quanteda Suggests: From 7e1098bfd2fe6761e929c8b1c47bbe37c398c6fc Mon Sep 17 00:00:00 2001 From: Kohei Watanabe Date: Mon, 2 Sep 2024 23:48:06 +0000 Subject: [PATCH 4/6] Increment version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index a5330d3..79105ef 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: quanteda.textstats -Version: 0.97.1 +Version: 0.97.2 Title: Textual Statistics for the Quantitative Analysis of Textual Data Description: Textual statistics functions formerly in the 'quanteda' package. Textual statistics for characterizing and comparing textual data. Includes From aa0e4bc7b7cef467e1874b4ff56c9525be2bd947 Mon Sep 17 00:00:00 2001 From: Kohei Watanabe Date: Tue, 3 Sep 2024 09:01:54 +0900 Subject: [PATCH 5/6] Update Github action --- .github/workflows/R-CMD-check.yaml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index f2313a0..97f5710 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -27,9 +27,8 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} R_KEEP_PKG_SOURCE: yes - + steps: - - if: matrix.config.os == 'ubuntu-latest' run: | sudo apt update @@ -38,8 +37,8 @@ jobs: run: | brew update brew install tbb - - - uses: actions/checkout@v4 + + - uses: actions/checkout@v3 - uses: r-lib/actions/setup-pandoc@v2 @@ -54,15 +53,7 @@ jobs: extra-packages: any::rcmdcheck needs: check - # - name: Install remotes - # run: | - # Rscript -e "install.packages('remotes', repos='https://ftp.belnet.be/mirror/CRAN')" - # - # - name: Install quanteda from Github - # run: | - # Rscript -e "remotes::install_github('quanteda/quanteda')" - - uses: r-lib/actions/check-r-package@v2 with: + args: 'c("--no-vignettes", "--no-manual", "--as-cran")' upload-snapshots: true - build_args: 'c("—-no-manual","—-compact-vignettes=gs+qpdf")' From adcd14263b17d0f071299de4a14c03fe082ce0fd Mon Sep 17 00:00:00 2001 From: Kohei Watanabe Date: Tue, 3 Sep 2024 09:02:13 +0900 Subject: [PATCH 6/6] Rename --- .github/workflows/{R-CMD-check.yaml => check-standard.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{R-CMD-check.yaml => check-standard.yaml} (100%) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/check-standard.yaml similarity index 100% rename from .github/workflows/R-CMD-check.yaml rename to .github/workflows/check-standard.yaml