Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[backport] Update c++ requirement to 17 for the R package. (#8860) (#8983)

Browse Source
This commit is contained in:
Jiaming Yuan 2023-03-27 18:24:25 +08:00 committed by GitHub
parent 4be75d852c
commit a1c209182d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
R-package/DESCRIPTION
View File

@ -66,5 +66,6 @@ Imports:
methods, methods,
data.table (>= 1.9.6), data.table (>= 1.9.6),
jsonlite (>= 1.0), jsonlite (>= 1.0),
RoxygenNote: 7.2.2 RoxygenNote: 7.2.3
SystemRequirements: GNU make, C++14 Encoding: UTF-8
SystemRequirements: GNU make, C++17

6
R-package/configure vendored
View File

@ -2096,9 +2096,9 @@ if test -z "${R_HOME}"; then
exit 1 exit 1
fi fi
CXX14=`"${R_HOME}/bin/R" CMD config CXX14` CXX17=`"${R_HOME}/bin/R" CMD config CXX17`
CXX14STD=`"${R_HOME}/bin/R" CMD config CXX14STD` CXX17STD=`"${R_HOME}/bin/R" CMD config CXX17STD`
CXX="${CXX14} ${CXX14STD}" CXX="${CXX17} ${CXX17STD}"
CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS`
CC=`"${R_HOME}/bin/R" CMD config CC` CC=`"${R_HOME}/bin/R" CMD config CC`

6
R-package/configure.ac
View File

@ -10,9 +10,9 @@ if test -z "${R_HOME}"; then
exit 1 exit 1
fi fi
CXX14=`"${R_HOME}/bin/R" CMD config CXX14` CXX17=`"${R_HOME}/bin/R" CMD config CXX17`
CXX14STD=`"${R_HOME}/bin/R" CMD config CXX14STD` CXX17STD=`"${R_HOME}/bin/R" CMD config CXX17STD`
CXX="${CXX14} ${CXX14STD}" CXX="${CXX17} ${CXX17STD}"
CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS`
CC=`"${R_HOME}/bin/R" CMD config CC` CC=`"${R_HOME}/bin/R" CMD config CC`

2
R-package/src/Makevars.in
View File

@ -3,7 +3,7 @@ PKGROOT=../../
ENABLE_STD_THREAD=1 ENABLE_STD_THREAD=1
# _*_ mode: Makefile; _*_ # _*_ mode: Makefile; _*_
CXX_STD = CXX14 CXX_STD = CXX17
XGB_RFLAGS = -DXGBOOST_STRICT_R_MODE=1 -DDMLC_LOG_BEFORE_THROW=0\ XGB_RFLAGS = -DXGBOOST_STRICT_R_MODE=1 -DDMLC_LOG_BEFORE_THROW=0\
-DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) -DDMLC_DISABLE_STDIN=1\ -DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) -DDMLC_DISABLE_STDIN=1\

2
R-package/src/Makevars.win
View File

@ -3,7 +3,7 @@ PKGROOT=../../
ENABLE_STD_THREAD=0 ENABLE_STD_THREAD=0
# _*_ mode: Makefile; _*_ # _*_ mode: Makefile; _*_
CXX_STD = CXX14 CXX_STD = CXX17
XGB_RFLAGS = -DXGBOOST_STRICT_R_MODE=1 -DDMLC_LOG_BEFORE_THROW=0\ XGB_RFLAGS = -DXGBOOST_STRICT_R_MODE=1 -DDMLC_LOG_BEFORE_THROW=0\
-DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) -DDMLC_DISABLE_STDIN=1\ -DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) -DDMLC_DISABLE_STDIN=1\