Skip to content

Commit

Permalink
Using full lib instead of single header. And clang-asan working
Browse files Browse the repository at this point in the history
  • Loading branch information
gvegayon committed Sep 6, 2023
1 parent 8c58386 commit 99f7c17
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 13,169 deletions.
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ check: build
R CMD check --as-cran defm_*.tar.gz

update:
rsync -avz ../barry/barry.hpp inst/include/barry.hpp && \
rsync -avz ../barry/defm.hpp inst/include/defm.hpp
rsync -avz ../barry/include/barry inst/include

debug:
$(MAKE) clean && \
Expand All @@ -31,15 +30,20 @@ inst/NEWS: NEWS.md
Rscript -e "rmarkdown::pandoc_convert('NEWS.md', 'plain', output='inst/NEWS')" && \
head -n 80 inst/NEWS


docker-run:
docker run --rm -ti -v $(PWD):/mnt -w/mnt gvegayon/defm:latest bash

# Thanls to Dirk Eddelbuettel for the Dockerfile
# https://dirk.eddelbuettel.com/blog/2015/01/18/
docker-check:
docker run --rm -ti -v $(PWD):/mnt -w/mnt gvegayon/defm:latest make docker-check-all
docker run --rm -ti -v $(PWD):/mnt -w/mnt gvegayon/defm:clang make docker-check-all


# -fno-sanitize=float-divide-by-zero,vptr \
\ # -fno-sanitize-recover"
#-DBARRY_DEBUG -fsanitize=address -fno-sanitize=float-divide-by-zero,vptr -fno-sanitize-recover"
docker-check-all:
RD CMD build . && \
DEFM_CONFIG="-DBARRY_DEBUG -std=c++11 -fsanitize=address -L/usr/local/lib" \
DEFM_CONFIG="-DBARRY_DEBUG" _R_CHECK_FORCE_SUGGESTS_=false \
RD CMD check defm_*.tar.gz
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export(term_defm_logit_intercept)
export(term_defm_ones)
export(term_defm_transition)
export(term_defm_transition_formula)
import(stats4)
importFrom(Rcpp,sourceCpp)
importFrom(stats,pnorm)
useDynLib(defm, .registration = TRUE)
7 changes: 5 additions & 2 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ build: Dockerfile
build-clang: Dockerfile-clang
docker build -f Dockerfile-clang -t gvegayon/defm:clang .

build-address: Dockerfile-w-address
docker build -t gvegayon/defm:address -f Dockerfile-w-address .

run:
docker run --rm -ti -v $(PWD)/..:/mnt -w/mnt gvegayon/defm:latest bash




run-address:
docker run --rm -ti -v $(PWD)/..:/mnt -w/mnt gvegayon/defm:address bash
2 changes: 0 additions & 2 deletions inst/include/Makefile

This file was deleted.

Loading

0 comments on commit 99f7c17

Please sign in to comment.