Enable building rabit on Windows

.github/workflows/main.yml

@@ -179,9 +179,8 @@ jobs:
  fail-fast: false
  matrix:
  config:
- - {os: windows-2016, r: 'release', compiler: 'msvc', build: 'autotools'}
- - {os: windows-2016, r: 'release', compiler: 'msvc', build: 'cmake'}
  - {os: windows-2016, r: 'release', compiler: 'mingw', build: 'autotools'}
+ - {os: windows-2016, r: 'release', compiler: 'msvc', build: 'cmake'}
  - {os: windows-2016, r: 'release', compiler: 'mingw', build: 'cmake'}
  env:
  R_REMOTES_NO_ERRORS_FROM_WARNINGS: true

CMakeLists.txt

@@ -177,7 +177,7 @@ else()
  -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE)
  endif (MSVC)
 endif(RABIT_MOCK)
-foreach(lib rabit rabit_base rabit_empty rabit_mock rabit_mock_static)
+foreach(lib rabit rabit_base rabit_mock rabit_mock_static)
  # Explicitly link dmlc to rabit, so that configured header (build_config.h)
  # from dmlc is correctly applied to rabit.
  if (TARGET ${lib})

R-package/configure.ac

@@ -52,4 +52,3 @@ AC_SUBST(ENDIAN_FLAG)
 AC_SUBST(BACKTRACE_LIB)
 AC_CONFIG_FILES([src/Makevars])
 AC_OUTPUT
-

R-package/src/Makevars.in

@@ -8,7 +8,7 @@ CXX_STD = CXX14
 XGB_RFLAGS = -DXGBOOST_STRICT_R_MODE=1 -DDMLC_LOG_BEFORE_THROW=0\
  -DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) -DDMLC_DISABLE_STDIN=1\
  -DDMLC_LOG_CUSTOMIZE=1 -DXGBOOST_CUSTOMIZE_LOGGER=1\
- -DRABIT_CUSTOMIZE_MSG_ -DRABIT_STRICT_CXX98_
+ -DRABIT_CUSTOMIZE_MSG_
 
 # disable the use of thread_local for 32 bit windows:
 ifeq ($(R_OSTYPE)$(WIN),windows)
@@ -19,6 +19,7 @@ $(foreach v, $(XGB_RFLAGS), $(warning $(v)))
 PKG_CPPFLAGS= -I$(PKGROOT)/include -I$(PKGROOT)/dmlc-core/include -I$(PKGROOT)/rabit/include -I$(PKGROOT) $(XGB_RFLAGS)
 PKG_CXXFLAGS= @OPENMP_CXXFLAGS@ @ENDIAN_FLAG@ -pthread
 PKG_LIBS = @OPENMP_CXXFLAGS@ @OPENMP_LIB@ @ENDIAN_FLAG@ @BACKTRACE_LIB@ -pthread
-OBJECTS= ./xgboost_R.o ./xgboost_custom.o ./xgboost_assert.o ./init.o\
- $(PKGROOT)/amalgamation/xgboost-all0.o $(PKGROOT)/amalgamation/dmlc-minimum0.o\
- $(PKGROOT)/rabit/src/engine_empty.o $(PKGROOT)/rabit/src/c_api.o
+OBJECTS= ./xgboost_R.o ./xgboost_custom.o ./xgboost_assert.o ./init.o \
+ $(PKGROOT)/amalgamation/xgboost-all0.o $(PKGROOT)/amalgamation/dmlc-minimum0.o \
+ $(PKGROOT)/rabit/src/engine.o $(PKGROOT)/rabit/src/c_api.o \
+ $(PKGROOT)/rabit/src/allreduce_base.o $(PKGROOT)/rabit/src/allreduce_robust.o

R-package/src/Makevars.win

@@ -20,7 +20,7 @@ CXX_STD = CXX14
 XGB_RFLAGS = -DXGBOOST_STRICT_R_MODE=1 -DDMLC_LOG_BEFORE_THROW=0\
  -DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) -DDMLC_DISABLE_STDIN=1\
  -DDMLC_LOG_CUSTOMIZE=1 -DXGBOOST_CUSTOMIZE_LOGGER=1\
- -DRABIT_CUSTOMIZE_MSG_ -DRABIT_STRICT_CXX98_
+ -DRABIT_CUSTOMIZE_MSG_
 
 # disable the use of thread_local for 32 bit windows:
 ifeq ($(R_OSTYPE)$(WIN),windows)
@@ -31,8 +31,9 @@ $(foreach v, $(XGB_RFLAGS), $(warning $(v)))
 PKG_CPPFLAGS= -I$(PKGROOT)/include -I$(PKGROOT)/dmlc-core/include -I$(PKGROOT)/rabit/include -I$(PKGROOT) $(XGB_RFLAGS)
 PKG_CXXFLAGS= $(SHLIB_OPENMP_CXXFLAGS) $(SHLIB_PTHREAD_FLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(SHLIB_PTHREAD_FLAGS)
-OBJECTS= ./xgboost_R.o ./xgboost_custom.o ./xgboost_assert.o ./init.o\
- $(PKGROOT)/amalgamation/xgboost-all0.o $(PKGROOT)/amalgamation/dmlc-minimum0.o\
- $(PKGROOT)/rabit/src/engine_empty.o $(PKGROOT)/rabit/src/c_api.o
+OBJECTS= ./xgboost_R.o ./xgboost_custom.o ./xgboost_assert.o ./init.o \
+ $(PKGROOT)/amalgamation/xgboost-all0.o $(PKGROOT)/amalgamation/dmlc-minimum0.o \
+ $(PKGROOT)/rabit/src/engine.o $(PKGROOT)/rabit/src/c_api.o \
+ $(PKGROOT)/rabit/src/allreduce_base.o $(PKGROOT)/rabit/src/allreduce_robust.o
 
 $(OBJECTS) : xgblib

R-package/src/xgboost_custom.cc

@@ -13,23 +13,6 @@ void CustomLogMessage::Log(const std::string& msg) {
 }
 } // namespace dmlc
 
-// implements rabit error handling.
-extern "C" {
- void XGBoostAssert_R(int exp, const char *fmt, ...);
- void XGBoostCheck_R(int exp, const char *fmt, ...);
-}
-
-namespace rabit {
-namespace utils {
-extern "C" {
- void (*Printf)(const char *fmt, ...) = Rprintf;
- void (*Assert)(int exp, const char *fmt, ...) = XGBoostAssert_R;
- void (*Check)(int exp, const char *fmt, ...) = XGBoostCheck_R;
- void (*Error)(const char *fmt, ...) = error;
-}
-}
-}
-
 namespace xgboost {
 ConsoleLogger::~ConsoleLogger() {
  if (cur_verbosity_ == LogVerbosity::kIgnore ||

amalgamation/dmlc-minimum0.cc

@@ -12,5 +12,3 @@
 #include "../dmlc-core/src/data.cc"
 #include "../dmlc-core/src/io.cc"
 #include "../dmlc-core/src/recordio.cc"
-
-

rabit/CMakeLists.txt

@@ -1,28 +1,19 @@
 cmake_minimum_required(VERSION 3.3)
 
-if(R_LIB OR MINGW OR WIN32)
- add_library(rabit src/engine_empty.cc src/c_api.cc)
- set(rabit_libs rabit)
- set_target_properties(rabit
- PROPERTIES CXX_STANDARD 14
- CXX_STANDARD_REQUIRED ON
- POSITION_INDEPENDENT_CODE ON)
-else()
- find_package(Threads REQUIRED)
+find_package(Threads REQUIRED)
 
- add_library(rabit src/allreduce_base.cc src/allreduce_robust.cc src/engine.cc src/c_api.cc)
- add_library(rabit_mock_static src/allreduce_base.cc src/allreduce_robust.cc src/engine_mock.cc src/c_api.cc)
- add_library(rabit_mock SHARED src/allreduce_base.cc src/allreduce_robust.cc src/engine_mock.cc src/c_api.cc)
- target_link_libraries(rabit Threads::Threads dmlc)
- target_link_libraries(rabit_mock_static Threads::Threads dmlc)
- target_link_libraries(rabit_mock Threads::Threads dmlc)
+add_library(rabit src/allreduce_base.cc src/allreduce_robust.cc src/engine.cc src/c_api.cc)
+add_library(rabit_mock_static src/allreduce_base.cc src/allreduce_robust.cc src/engine_mock.cc src/c_api.cc)
+add_library(rabit_mock SHARED src/allreduce_base.cc src/allreduce_robust.cc src/engine_mock.cc src/c_api.cc)
+target_link_libraries(rabit Threads::Threads dmlc)
+target_link_libraries(rabit_mock_static Threads::Threads dmlc)
+target_link_libraries(rabit_mock Threads::Threads dmlc)
 
- set(rabit_libs rabit rabit_mock rabit_mock_static)
- set_target_properties(rabit rabit_mock rabit_mock_static
- PROPERTIES CXX_STANDARD 14
- CXX_STANDARD_REQUIRED ON
- POSITION_INDEPENDENT_CODE ON)
-endif(R_LIB OR MINGW OR WIN32)
+set(rabit_libs rabit rabit_mock rabit_mock_static)
+set_target_properties(rabit rabit_mock rabit_mock_static
+ PROPERTIES CXX_STANDARD 14
+ CXX_STANDARD_REQUIRED ON
+ POSITION_INDEPENDENT_CODE ON)
 
 if(RABIT_BUILD_MPI)
  find_package(MPI REQUIRED)