Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
[DEP] upgrade dmlc-core (#14510)
Browse files Browse the repository at this point in the history
* upgrade dmlc-core

* Update amalgamation.py
  • Loading branch information
eric-haibin-lin committed Apr 13, 2019
1 parent c437d5b commit 273ebc7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/dmlc-core
Submodule dmlc-core updated 69 files
+1 −0 .gitignore
+13 −0 .travis.yml
+88 −12 CMakeLists.txt
+6 −1 Makefile
+121 −0 appveyor.yml
+24 −0 cmake/build_config.h.in
+5 −0 cmake/dmlc-config.cmake.in
+15 −0 cmake/gtest_cmake.in
+16 −0 doc/build.md
+1 −0 doc/index.md
+57 −1 include/dmlc/any.h
+6 −24 include/dmlc/base.h
+35 −0 include/dmlc/build_config.h
+1 −1 include/dmlc/concurrency.h
+23 −5 include/dmlc/endian.h
+158 −0 include/dmlc/filesystem.h
+113 −0 include/dmlc/io.h
+3 −2 include/dmlc/json.h
+28 −21 include/dmlc/logging.h
+1 −1 include/dmlc/optional.h
+26 −6 include/dmlc/parameter.h
+6 −2 include/dmlc/registry.h
+737 −0 include/dmlc/strtonum.h
+2 −2 include/dmlc/thread_group.h
+19 −15 include/dmlc/threadediter.h
+3 −0 make/config.mk
+1 −1 scripts/lint.py
+1 −1 scripts/packages.mk
+0 −2 scripts/travis/travis_osx_install.sh
+14 −0 scripts/travis/travis_script.sh
+16 −0 src/build_config.cc
+28 −4 src/data/csv_parser.h
+1 −1 src/data/libfm_parser.h
+1 −1 src/data/libsvm_parser.h
+0 −312 src/data/strtonum.h
+21 −17 src/data/text_parser.h
+0 −1 src/io.cc
+1 −1 src/io/azure_filesys.h
+32 −2 src/io/filesys.cc
+0 −128 src/io/filesys.h
+2 −1 src/io/hdfs_filesys.h
+3 −0 src/io/indexed_recordio_split.h
+28 −15 src/io/input_split_base.cc
+7 −1 src/io/input_split_base.h
+3 −0 src/io/line_split.h
+38 −28 src/io/local_filesys.cc
+1 −1 src/io/local_filesys.h
+3 −0 src/io/recordio_split.h
+4 −2 src/io/s3_filesys.cc
+1 −1 src/io/s3_filesys.h
+9 −4 src/io/single_file_split.h
+0 −1 src/io/uri_spec.h
+1 −1 test/dmlc_test.mk
+1 −1 test/filesys_test.cc
+8 −7 test/strtonum_test.cc
+1 −0 test/unittest/.gitignore
+59 −33 test/unittest/CMakeLists.txt
+1 −0 test/unittest/build_config.h.in
+ test/unittest/sample.rec
+117 −118 test/unittest/unittest_inputsplit.cc
+1 −1 test/unittest/unittest_lockfree.cc
+1 −2 test/unittest/unittest_logging.cc
+150 −12 test/unittest/unittest_param.cc
+56 −2 test/unittest/unittest_parser.cc
+77 −0 test/unittest/unittest_tempdir.cc
+30 −8 test/unittest/unittest_thread_group.cc
+13 −6 tracker/dmlc_tracker/local.py
+2 −0 tracker/dmlc_tracker/opts.py
+2 −2 tracker/dmlc_tracker/tracker.py
25 changes: 21 additions & 4 deletions amalgamation/amalgamation.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@
if platform.system() != 'Windows':
blacklist.append('windows.h')
blacklist.append('process.h')
blacklist.append('Shlwapi.h')

if platform.system() == 'Windows':
blacklist.append('unistd.h')

if 'freebsd' not in sys.platform:
blacklist.append('sys/endian.h')



def get_sources(def_file):
Expand Down Expand Up @@ -94,6 +102,7 @@ def find_source(name, start, stage):

re1 = re.compile('<([./a-zA-Z0-9_-]*)>')
re2 = re.compile('"([./a-zA-Z0-9_-]*)"')
re3 = re.compile('DMLC_EXECINFO_H')

sysheaders = []
history = set([])
Expand Down Expand Up @@ -129,6 +138,9 @@ def expand(x, pending, stage):
with open(x, 'rb') as x_h:
for line in x_h.readlines():
uline = line.decode('utf-8')
if '#define DMLC_LOG_STACK_TRACE 1' in uline.strip():
# Do not enable stacktrace logging
continue
if uline.find('#include') < 0:
out.write(line)
continue
Expand All @@ -138,10 +150,15 @@ def expand(x, pending, stage):
m = re1.search(uline)
if not m:
m = re2.search(uline)
if not m:
print(uline + ' not found')
continue
path = m.groups()[0]
if m:
path = m.groups()[0]
else:
m = re3.search(uline)
if m:
path = 'execinfo.h'
else:
print(uline + ' not found')
continue
h = path.strip('./') if "../3rdparty/" not in path else path
if h.endswith('complex.h') and x.endswith('openblas_config.h'):
source = ''
Expand Down

0 comments on commit 273ebc7

Please sign in to comment.