Skip to content

Commit

Permalink
Merge pull request #78 from quanteda/fix-quanteda-4_1_0
Browse files Browse the repository at this point in the history
Try adding back RcppArmadillo
  • Loading branch information
kbenoit authored Sep 3, 2024
2 parents c9c1423 + 5f4feee commit 11727bf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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")'
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/keyness.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <RcppArmadillo.h>
#include "lib.h"
#include "dev.h"

Expand Down Expand Up @@ -123,7 +124,7 @@ Rcpp::NumericVector cpp_keyness(arma::sp_mat &mt,
std::vector<double> row0 = to_vector(mt.row(0));
std::vector<double> row1 = to_vector(mt.row(1));
DoubleParams stats(mt.n_cols);

#if QUANTEDA_USE_TBB
tbb::task_arena arena(thread);
arena.execute([&]{
Expand Down

0 comments on commit 11727bf

Please sign in to comment.