Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add configure #91

Merged
merged 13 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Fix GitHub Linguist language detection
# docs/ and man/ are automatically excluded
vignettes/* linguist-documentation
tests/**/*.html linguist-generated

# Source files
# ============
*.Rdata text
*.rdb binary
*.rds binary
*.Rd text
*.Rdx binary
*.Rmd text
*.R text

# Fix for R checks
configure.ac text eol=lf
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
.Rhistory
.RData
.Ruserdata
# C++
src/*.o
src/*.so
src/*.dll
*_cache
# Configure
src/Makevars
autom4te.cache
config.log
config.status
*~
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ S3method(textmodel_seededlda,dfm)
S3method(textmodel_seqlda,dfm)
S3method(topics,textmodel_lda)
export(divergence)
export(info_tbb)
export(perplexity)
export(sizes)
export(terms)
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
## Changes in v1.4.0

- Use configure to link the TBB library on MacOS.
- Add `adjust_alpha` as an experimental argument to optimize `alpha` automatically.
- Add `update_model` to update terms of existing models to classify documents with unseen words more accurately.

## Changes in v1.3.2

- Improve the way to convert std::vector to arma::mat.
- Improve the way to convert `std::vector` to `arma::mat`.

## Changes in v1.3.1

Expand Down
8 changes: 8 additions & 0 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,11 @@ get_threads <- function() {
}
return(value)
}

#' Get information on TBB library
#' @keywords internal
#' @export
info_tbb <- function() {
list("enabled" = cpp_tbb_enabled(),
"max_threads" = cpp_get_max_thread())
}
5 changes: 5 additions & 0 deletions cleanup
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
rm -f src/Makevars
rm -rf config.log config.status confdefs.h autom4te.cache/ \
src/*.o src/*.so src/symbols.rds \
*/*~ *~
Loading
Loading