Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:microsoft/interpret into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
interpret-ml committed Oct 10, 2019
2 parents ef80855 + 5c2504c commit 71c8d4f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
13 changes: 11 additions & 2 deletions R/src/Makevars
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
#TODO COPY THIS FROM Makevars.interpret
# THIS FILE IS ONLY USED WHEN using devtools::install_github('microsoft/interpret',subdir='R')
# Makevars and Makevars.interpret need to be identical files, except the COREDIR variable which indicates where to get the core C++ files
# Makevars needs to be named that exactly because it will get loaded from devtools::install_github and devtools will want it to be that name. When being installed from devtools, we can refer to .cpp and .h files wherever they are in the repo, so we use the COREDIR to point to them
# Makevars.interpret is the CRAN version of Makevars. When the interpret_*.tar.gz is created the Makevars.interpret file gets copied as Makevars into the R building directory

COREDIR=../../core

CXX_STD = CXX11
PKG_CPPFLAGS= -I$(COREDIR) -I$(COREDIR)/inc -DEBMCORE_R
PKG_CXXFLAGS=$(CXX_VISIBILITY)

OBJECTS = interpret_R.o $(COREDIR)/DataSetByFeature.o $(COREDIR)/DataSetByFeatureCombination.o $(COREDIR)/InteractionDetection.o $(COREDIR)/Logging.o $(COREDIR)/SamplingWithReplacement.o $(COREDIR)/Training.o
11 changes: 7 additions & 4 deletions R/src/Makevars.interpret
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
ROOTDIR=../../
# Makevars and Makevars.interpret need to be identical files, except the COREDIR variable which indicates where to get the core C++ files
# Makevars needs to be named that exactly because it will get loaded from devtools::install_github and devtools will want it to be that name. When being installed from devtools, we can refer to .cpp and .h files wherever they are in the repo, so we use the COREDIR to point to them
# Makevars.interpret is the CRAN version of Makevars. When the interpret_*.tar.gz is created the Makevars.interpret file gets copied as Makevars into the R building directory

CXX_STD = CXX11
COREDIR=./core

PKG_CPPFLAGS= -Icore -Icore/inc -DEBMCORE_R
CXX_STD = CXX11
PKG_CPPFLAGS= -I$(COREDIR) -I$(COREDIR)/inc -DEBMCORE_R
PKG_CXXFLAGS=$(CXX_VISIBILITY)

OBJECTS = interpret_R.o core/DataSetByFeature.o core/DataSetByFeatureCombination.o core/InteractionDetection.o core/Logging.o core/SamplingWithReplacement.o core/Training.o
OBJECTS = interpret_R.o $(COREDIR)/DataSetByFeature.o $(COREDIR)/DataSetByFeatureCombination.o $(COREDIR)/InteractionDetection.o $(COREDIR)/Logging.o $(COREDIR)/SamplingWithReplacement.o $(COREDIR)/Training.o

0 comments on commit 71c8d4f

Please sign in to comment.