Skip to content

Commit 28a466a

Browse files
trivialfistrivialfis
authored
Fixes for R checks. (dmlc#8330)
- Bump configure.ac version. - Remove amalgamation to reduce the build time for a single object with the added benefit that we can use parallel build during development. - Fix c function prototype warning. - Remove Windows automake file generation step to make the build script easier to understand.
1 parent 5bd849f commit 28a466a

File tree

8 files changed

+165
-144
lines changed

8 files changed

+165
-144
lines changed

‎Makefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,8 @@ Rpack: clean_all
123123
cp -r dmlc-core/include xgboost/src/dmlc-core/include
124124
cp -r dmlc-core/src xgboost/src/dmlc-core/src
125125
cp ./LICENSE xgboost
126-
# Modify PKGROOT in Makevars.in
127126
cat R-package/src/Makevars.in|sed '2s/.*/PKGROOT=./' > xgboost/src/Makevars.in
128-
# Configure Makevars.win (Windows-specific Makevars, likely using MinGW)
129-
cp xgboost/src/Makevars.in xgboost/src/Makevars.win
130-
cat xgboost/src/Makevars.in| sed '3s/.*/ENABLE_STD_THREAD=0/' > xgboost/src/Makevars.win
131-
sed -i -e 's/@OPENMP_CXXFLAGS@/$$\(SHLIB_OPENMP_CXXFLAGS\)/g' xgboost/src/Makevars.win
132-
sed -i -e 's/-pthread/$$\(SHLIB_PTHREAD_FLAGS\)/g' xgboost/src/Makevars.win
133-
sed -i -e 's/@ENDIAN_FLAG@/-DDMLC_CMAKE_LITTLE_ENDIAN=1/g' xgboost/src/Makevars.win
134-
sed -i -e 's/@BACKTRACE_LIB@//g' xgboost/src/Makevars.win
135-
sed -i -e 's/@OPENMP_LIB@//g' xgboost/src/Makevars.win
127+
cat R-package/src/Makevars.win|sed '2s/.*/PKGROOT=./' > xgboost/src/Makevars.win
136128
rm -f xgboost/src/Makevars.win-e # OSX sed create this extra file; remove it
137129
bash R-package/remove_warning_suppression_pragma.sh
138130
bash xgboost/remove_warning_suppression_pragma.sh

‎R-package/DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package: xgboost
22
Type: Package
33
Title: Extreme Gradient Boosting
44
Version: 1.7.0.1
5-
Date: 2022-09-28
5+
Date: 2022-10-18
66
Authors@R: c(
77
person("Tianqi", "Chen", role = c("aut"),
88
email = "[email protected]"),

‎R-package/configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for xgboost 1.6-0.
3+
# Generated by GNU Autoconf 2.69 for xgboost 1.7.0.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@ MAKEFLAGS=
576576
# Identity of this package.
577577
PACKAGE_NAME='xgboost'
578578
PACKAGE_TARNAME='xgboost'
579-
PACKAGE_VERSION='1.6-0'
580-
PACKAGE_STRING='xgboost 1.6-0'
579+
PACKAGE_VERSION='1.7.0'
580+
PACKAGE_STRING='xgboost 1.7.0'
581581
PACKAGE_BUGREPORT=''
582582
PACKAGE_URL=''
583583

@@ -1195,7 +1195,7 @@ if test "$ac_init_help" = "long"; then
11951195
# Omit some internal or obsolete options to make the list less imposing.
11961196
# This message is too long to be a string in the A/UX 3.1 sh.
11971197
cat <<_ACEOF
1198-
\`configure' configures xgboost 1.6-0 to adapt to many kinds of systems.
1198+
\`configure' configures xgboost 1.7.0 to adapt to many kinds of systems.
11991199
12001200
Usage: $0 [OPTION]... [VAR=VALUE]...
12011201
@@ -1257,7 +1257,7 @@ fi
12571257

12581258
if test -n "$ac_init_help"; then
12591259
case $ac_init_help in
1260-
short | recursive ) echo "Configuration of xgboost 1.6-0:";;
1260+
short | recursive ) echo "Configuration of xgboost 1.7.0:";;
12611261
esac
12621262
cat <<\_ACEOF
12631263
@@ -1336,7 +1336,7 @@ fi
13361336
test -n "$ac_init_help" && exit $ac_status
13371337
if $ac_init_version; then
13381338
cat <<\_ACEOF
1339-
xgboost configure 1.6-0
1339+
xgboost configure 1.7.0
13401340
generated by GNU Autoconf 2.69
13411341
13421342
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1479,7 +1479,7 @@ cat >config.log <<_ACEOF
14791479
This file contains any messages produced by compilers while
14801480
running configure, to aid debugging if configure makes a mistake.
14811481
1482-
It was created by xgboost $as_me 1.6-0, which was
1482+
It was created by xgboost $as_me 1.7.0, which was
14831483
generated by GNU Autoconf 2.69. Invocation command line was
14841484
14851485
$ $0 $@
@@ -3287,7 +3287,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
32873287
# report actual input values of CONFIG_FILES etc. instead of their
32883288
# values after options handling.
32893289
ac_log="
3290-
This file was extended by xgboost $as_me 1.6-0, which was
3290+
This file was extended by xgboost $as_me 1.7.0, which was
32913291
generated by GNU Autoconf 2.69. Invocation command line was
32923292
32933293
CONFIG_FILES = $CONFIG_FILES
@@ -3340,7 +3340,7 @@ _ACEOF
33403340
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
33413341
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
33423342
ac_cs_version="\\
3343-
xgboost config.status 1.6-0
3343+
xgboost config.status 1.7.0
33443344
configured by $0, generated by GNU Autoconf 2.69,
33453345
with options \\"\$ac_cs_config\\"
33463346

‎R-package/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
AC_PREREQ(2.69)
44

5-
AC_INIT([xgboost],[1.6-0],[],[xgboost],[])
5+
AC_INIT([xgboost],[1.7.0],[],[xgboost],[])
66

77
# Use this line to set CC variable to a C compiler
88
AC_PROG_CC

‎R-package/src/Makevars.in

Lines changed: 75 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,78 @@ $(foreach v, $(XGB_RFLAGS), $(warning $(v)))
1919
PKG_CPPFLAGS= -I$(PKGROOT)/include -I$(PKGROOT)/dmlc-core/include -I$(PKGROOT)/rabit/include -I$(PKGROOT) $(XGB_RFLAGS)
2020
PKG_CXXFLAGS= @OPENMP_CXXFLAGS@ @ENDIAN_FLAG@ -pthread $(CXX_VISIBILITY)
2121
PKG_LIBS = @OPENMP_CXXFLAGS@ @OPENMP_LIB@ @ENDIAN_FLAG@ @BACKTRACE_LIB@ -pthread
22-
OBJECTS= ./xgboost_R.o ./xgboost_custom.o ./xgboost_assert.o ./init.o \
23-
$(PKGROOT)/amalgamation/xgboost-all0.o $(PKGROOT)/amalgamation/dmlc-minimum0.o \
24-
$(PKGROOT)/rabit/src/engine.o $(PKGROOT)/rabit/src/rabit_c_api.o \
25-
$(PKGROOT)/rabit/src/allreduce_base.o
22+
23+
OBJECTS= \
24+
./xgboost_R.o \
25+
./xgboost_custom.o \
26+
./xgboost_assert.o \
27+
./init.o \
28+
$(PKGROOT)/src/metric/metric.o \
29+
$(PKGROOT)/src/metric/elementwise_metric.o \
30+
$(PKGROOT)/src/metric/multiclass_metric.o \
31+
$(PKGROOT)/src/metric/rank_metric.o \
32+
$(PKGROOT)/src/metric/auc.o \
33+
$(PKGROOT)/src/metric/survival_metric.o \
34+
$(PKGROOT)/src/objective/objective.o \
35+
$(PKGROOT)/src/objective/regression_obj.o \
36+
$(PKGROOT)/src/objective/multiclass_obj.o \
37+
$(PKGROOT)/src/objective/rank_obj.o \
38+
$(PKGROOT)/src/objective/hinge.o \
39+
$(PKGROOT)/src/objective/aft_obj.o \
40+
$(PKGROOT)/src/objective/adaptive.o \
41+
$(PKGROOT)/src/gbm/gbm.o \
42+
$(PKGROOT)/src/gbm/gbtree.o \
43+
$(PKGROOT)/src/gbm/gbtree_model.o \
44+
$(PKGROOT)/src/gbm/gblinear.o \
45+
$(PKGROOT)/src/gbm/gblinear_model.o \
46+
$(PKGROOT)/src/data/simple_dmatrix.o \
47+
$(PKGROOT)/src/data/data.o \
48+
$(PKGROOT)/src/data/sparse_page_raw_format.o \
49+
$(PKGROOT)/src/data/ellpack_page.o \
50+
$(PKGROOT)/src/data/gradient_index.o \
51+
$(PKGROOT)/src/data/gradient_index_page_source.o \
52+
$(PKGROOT)/src/data/gradient_index_format.o \
53+
$(PKGROOT)/src/data/sparse_page_dmatrix.o \
54+
$(PKGROOT)/src/data/proxy_dmatrix.o \
55+
$(PKGROOT)/src/data/iterative_dmatrix.o \
56+
$(PKGROOT)/src/predictor/predictor.o \
57+
$(PKGROOT)/src/predictor/cpu_predictor.o \
58+
$(PKGROOT)/src/tree/constraints.o \
59+
$(PKGROOT)/src/tree/param.o \
60+
$(PKGROOT)/src/tree/tree_model.o \
61+
$(PKGROOT)/src/tree/tree_updater.o \
62+
$(PKGROOT)/src/tree/updater_approx.o \
63+
$(PKGROOT)/src/tree/updater_colmaker.o \
64+
$(PKGROOT)/src/tree/updater_prune.o \
65+
$(PKGROOT)/src/tree/updater_quantile_hist.o \
66+
$(PKGROOT)/src/tree/updater_refresh.o \
67+
$(PKGROOT)/src/tree/updater_sync.o \
68+
$(PKGROOT)/src/linear/linear_updater.o \
69+
$(PKGROOT)/src/linear/updater_coordinate.o \
70+
$(PKGROOT)/src/linear/updater_shotgun.o \
71+
$(PKGROOT)/src/learner.o \
72+
$(PKGROOT)/src/logging.o \
73+
$(PKGROOT)/src/global_config.o \
74+
$(PKGROOT)/src/collective/communicator.o \
75+
$(PKGROOT)/src/collective/socket.o \
76+
$(PKGROOT)/src/common/charconv.o \
77+
$(PKGROOT)/src/common/column_matrix.o \
78+
$(PKGROOT)/src/common/common.o \
79+
$(PKGROOT)/src/common/hist_util.o \
80+
$(PKGROOT)/src/common/host_device_vector.o \
81+
$(PKGROOT)/src/common/io.o \
82+
$(PKGROOT)/src/common/json.o \
83+
$(PKGROOT)/src/common/numeric.o \
84+
$(PKGROOT)/src/common/pseudo_huber.o \
85+
$(PKGROOT)/src/common/quantile.o \
86+
$(PKGROOT)/src/common/random.o \
87+
$(PKGROOT)/src/common/survival_util.o \
88+
$(PKGROOT)/src/common/threading_utils.o \
89+
$(PKGROOT)/src/common/timer.o \
90+
$(PKGROOT)/src/common/version.o \
91+
$(PKGROOT)/src/c_api/c_api.o \
92+
$(PKGROOT)/src/c_api/c_api_error.o \
93+
$(PKGROOT)/amalgamation/dmlc-minimum0.o \
94+
$(PKGROOT)/rabit/src/engine.o \
95+
$(PKGROOT)/rabit/src/rabit_c_api.o \
96+
$(PKGROOT)/rabit/src/allreduce_base.o

‎R-package/src/Makevars.win

Lines changed: 77 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
# package root
2-
PKGROOT=./
2+
PKGROOT=../../
33
ENABLE_STD_THREAD=0
44
# _*_ mode: Makefile; _*_
55

6-
# This file is only used for Windows compilation from GitHub
7-
# It will be replaced with Makevars.in for the CRAN version
8-
.PHONY: all xgblib
9-
all: $(SHLIB)
10-
$(SHLIB): xgblib
11-
xgblib:
12-
cp -r ../../src .
13-
cp -r ../../rabit .
14-
cp -r ../../dmlc-core .
15-
cp -r ../../include .
16-
cp -r ../../amalgamation .
17-
186
CXX_STD = CXX14
197

208
XGB_RFLAGS = -DXGBOOST_STRICT_R_MODE=1 -DDMLC_LOG_BEFORE_THROW=0\
@@ -29,11 +17,80 @@ endif
2917
$(foreach v, $(XGB_RFLAGS), $(warning $(v)))
3018

3119
PKG_CPPFLAGS= -I$(PKGROOT)/include -I$(PKGROOT)/dmlc-core/include -I$(PKGROOT)/rabit/include -I$(PKGROOT) $(XGB_RFLAGS)
32-
PKG_CXXFLAGS= $(SHLIB_OPENMP_CXXFLAGS) $(SHLIB_PTHREAD_FLAGS)
33-
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(SHLIB_PTHREAD_FLAGS) -lwsock32 -lws2_32
34-
OBJECTS= ./xgboost_R.o ./xgboost_custom.o ./xgboost_assert.o ./init.o \
35-
$(PKGROOT)/amalgamation/xgboost-all0.o $(PKGROOT)/amalgamation/dmlc-minimum0.o \
36-
$(PKGROOT)/rabit/src/engine.o $(PKGROOT)/rabit/src/rabit_c_api.o \
37-
$(PKGROOT)/rabit/src/allreduce_base.o
20+
PKG_CXXFLAGS= $(SHLIB_OPENMP_CXXFLAGS) -DDMLC_CMAKE_LITTLE_ENDIAN=1 $(SHLIB_PTHREAD_FLAGS) $(CXX_VISIBILITY)
21+
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) -DDMLC_CMAKE_LITTLE_ENDIAN=1 $(SHLIB_PTHREAD_FLAGS) -lwsock32 -lws2_32
3822

39-
$(OBJECTS) : xgblib
23+
OBJECTS= \
24+
./xgboost_R.o \
25+
./xgboost_custom.o \
26+
./xgboost_assert.o \
27+
./init.o \
28+
$(PKGROOT)/src/metric/metric.o \
29+
$(PKGROOT)/src/metric/elementwise_metric.o \
30+
$(PKGROOT)/src/metric/multiclass_metric.o \
31+
$(PKGROOT)/src/metric/rank_metric.o \
32+
$(PKGROOT)/src/metric/auc.o \
33+
$(PKGROOT)/src/metric/survival_metric.o \
34+
$(PKGROOT)/src/objective/objective.o \
35+
$(PKGROOT)/src/objective/regression_obj.o \
36+
$(PKGROOT)/src/objective/multiclass_obj.o \
37+
$(PKGROOT)/src/objective/rank_obj.o \
38+
$(PKGROOT)/src/objective/hinge.o \
39+
$(PKGROOT)/src/objective/aft_obj.o \
40+
$(PKGROOT)/src/objective/adaptive.o \
41+
$(PKGROOT)/src/gbm/gbm.o \
42+
$(PKGROOT)/src/gbm/gbtree.o \
43+
$(PKGROOT)/src/gbm/gbtree_model.o \
44+
$(PKGROOT)/src/gbm/gblinear.o \
45+
$(PKGROOT)/src/gbm/gblinear_model.o \
46+
$(PKGROOT)/src/data/simple_dmatrix.o \
47+
$(PKGROOT)/src/data/data.o \
48+
$(PKGROOT)/src/data/sparse_page_raw_format.o \
49+
$(PKGROOT)/src/data/ellpack_page.o \
50+
$(PKGROOT)/src/data/gradient_index.o \
51+
$(PKGROOT)/src/data/gradient_index_page_source.o \
52+
$(PKGROOT)/src/data/gradient_index_format.o \
53+
$(PKGROOT)/src/data/sparse_page_dmatrix.o \
54+
$(PKGROOT)/src/data/proxy_dmatrix.o \
55+
$(PKGROOT)/src/data/iterative_dmatrix.o \
56+
$(PKGROOT)/src/predictor/predictor.o \
57+
$(PKGROOT)/src/predictor/cpu_predictor.o \
58+
$(PKGROOT)/src/tree/constraints.o \
59+
$(PKGROOT)/src/tree/param.o \
60+
$(PKGROOT)/src/tree/tree_model.o \
61+
$(PKGROOT)/src/tree/tree_updater.o \
62+
$(PKGROOT)/src/tree/updater_approx.o \
63+
$(PKGROOT)/src/tree/updater_colmaker.o \
64+
$(PKGROOT)/src/tree/updater_prune.o \
65+
$(PKGROOT)/src/tree/updater_quantile_hist.o \
66+
$(PKGROOT)/src/tree/updater_refresh.o \
67+
$(PKGROOT)/src/tree/updater_sync.o \
68+
$(PKGROOT)/src/linear/linear_updater.o \
69+
$(PKGROOT)/src/linear/updater_coordinate.o \
70+
$(PKGROOT)/src/linear/updater_shotgun.o \
71+
$(PKGROOT)/src/learner.o \
72+
$(PKGROOT)/src/logging.o \
73+
$(PKGROOT)/src/global_config.o \
74+
$(PKGROOT)/src/collective/communicator.o \
75+
$(PKGROOT)/src/collective/socket.o \
76+
$(PKGROOT)/src/common/charconv.o \
77+
$(PKGROOT)/src/common/column_matrix.o \
78+
$(PKGROOT)/src/common/common.o \
79+
$(PKGROOT)/src/common/hist_util.o \
80+
$(PKGROOT)/src/common/host_device_vector.o \
81+
$(PKGROOT)/src/common/io.o \
82+
$(PKGROOT)/src/common/json.o \
83+
$(PKGROOT)/src/common/numeric.o \
84+
$(PKGROOT)/src/common/pseudo_huber.o \
85+
$(PKGROOT)/src/common/quantile.o \
86+
$(PKGROOT)/src/common/random.o \
87+
$(PKGROOT)/src/common/survival_util.o \
88+
$(PKGROOT)/src/common/threading_utils.o \
89+
$(PKGROOT)/src/common/timer.o \
90+
$(PKGROOT)/src/common/version.o \
91+
$(PKGROOT)/src/c_api/c_api.o \
92+
$(PKGROOT)/src/c_api/c_api_error.o \
93+
$(PKGROOT)/amalgamation/dmlc-minimum0.o \
94+
$(PKGROOT)/rabit/src/engine.o \
95+
$(PKGROOT)/rabit/src/rabit_c_api.o \
96+
$(PKGROOT)/rabit/src/allreduce_base.o

‎R-package/src/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ extern SEXP XGDMatrixSetInfo_R(SEXP, SEXP, SEXP);
5050
extern SEXP XGDMatrixSetStrFeatureInfo_R(SEXP, SEXP, SEXP);
5151
extern SEXP XGDMatrixSliceDMatrix_R(SEXP, SEXP);
5252
extern SEXP XGBSetGlobalConfig_R(SEXP);
53-
extern SEXP XGBGetGlobalConfig_R();
53+
extern SEXP XGBGetGlobalConfig_R(void);
5454
extern SEXP XGBoosterFeatureScore_R(SEXP, SEXP);
5555

5656
static const R_CallMethodDef CallEntries[] = {

0 commit comments

Comments
 (0)