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

update dmlc-core #16149

Merged
merged 2 commits into from
Sep 16, 2019
Merged

update dmlc-core #16149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32a3953
Update dmlc-core
ZhennanQin Aug 29, 2019
d71c984
Merge remote-tracking branch 'offical/master' into dmlc_update
ZhennanQin Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/dmlc-core
Open in desktop
Submodule dmlc-core updated 30 files
+12 −0 .travis.yml
+26 −8 CMakeLists.txt
+4 −0 README.md
+13 −0 cmake/Modules/FindASan.cmake
+13 −0 cmake/Modules/FindLSan.cmake
+13 −0 cmake/Modules/FindTSan.cmake
+58 −0 cmake/Sanitizer.cmake
+1 −1 cmake/build_config.h.in
+1 −1 cmake/gtest_cmake.in
+5 −1 include/dmlc/base.h
+5 −5 include/dmlc/build_config_default.h
+7 −6 include/dmlc/endian.h
+1 −1 include/dmlc/omp.h
+1 −1 include/dmlc/parameter.h
+62 −32 include/dmlc/threadediter.h
+1 −0 include/dmlc/type_traits.h
+6 −6 scripts/packages.mk
+28 −0 scripts/travis/s390x/Dockerfile
+9 −0 scripts/travis/s390x/build_via_cmake.sh
+86 −0 scripts/travis/s390x/ci_build.sh
+43 −0 scripts/travis/s390x/entrypoint.sh
+27 −6 scripts/travis/travis_script.sh
+4 −4 src/config.cc
+1 −1 test/logging_test.cc
+1 −1 test/unittest/CMakeLists.txt
+9 −0 test/unittest/unittest_inputsplit.cc
+23 −0 test/unittest/unittest_serializer.cc
+0 −2 test/unittest/unittest_thread_group.cc
+4 −3 test/unittest/unittest_threaditer_exc_handling.cc
+1 −1 tracker/dmlc_tracker/mpi.py
3 changes: 2 additions & 1 deletion amalgamation/amalgamation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
'opencv2/opencv.hpp', 'sys/stat.h', 'sys/types.h', 'cuda.h', 'cuda_fp16.h', 'omp.h',
'onnx/onnx.pb.h', 'execinfo.h', 'packet/sse-inl.h', 'emmintrin.h', 'thrust/device_vector.h',
'cusolverDn.h', 'internal/concurrentqueue_internal_debug.h', 'relacy/relacy_std.hpp',
'relacy_shims.h', 'ittnotify.h', 'shared_mutex', 'nvToolsExt.h'
'relacy_shims.h', 'ittnotify.h', 'shared_mutex', 'nvToolsExt.h', 'dmlc/build_config.h',
'sys/isa_defs.h'
]

minimum = int(sys.argv[6]) if len(sys.argv) > 5 else 0
Expand Down
4 changes: 2 additions & 2 deletions scala-package/macros/src/main/scala/org/apache/mxnet/utils/CToScalaUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ private[mxnet] object CToScalaUtils {
case "double" | "doubleorNone" => types("double")
case "string" => "String"
case "boolean" | "booleanorNone" => types("bool")
case "tupleof<int>" | "tupleof<float>" | "tupleof<double>" | "tupleof<intorNone>" |
"tupleof<>" | "ptr" | "" => "Any"
case "tupleof<int>"| "tupleof<long>" | "tupleof<float>" | "tupleof<double>" |
"tupleof<intorNone>" | "tupleof<>" | "ptr" | "" => "Any"
case default => throw new IllegalArgumentException(
s"Invalid type for args: $default\nString argType: $argType\nargName: $argName")
}
Expand Down