Update dmlc-core (apache#16149)

Change-Id: I472fb7bbffc16ed8c36494ab49838b08c59b2f12
larroy · Sep 28, 2019 · 537701f · 537701f
1 parent 55417c3
commit 537701f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/3rdparty/dmlc-core b/3rdparty/dmlc-core
diff --git a/amalgamation/amalgamation.py b/amalgamation/amalgamation.py
@@ -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

diff --git a/scala-package/macros/src/main/scala/org/apache/mxnet/utils/CToScalaUtils.scala b/scala-package/macros/src/main/scala/org/apache/mxnet/utils/CToScalaUtils.scala
@@ -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")
     }