[incubator-mxnet] branch master updated: Fix broken amalgamation (#12792)

[zhasheng]

This is an automated email from the ASF dual-hosted git repository.

zhasheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 29fa446  Fix broken amalgamation (#12792)
29fa446 is described below

commit 29fa446915a0dedfedf03226a5795f9a903d2b4f
Author: Ming <a...@ufoym.com>
AuthorDate: Sat Feb 16 12:34:26 2019 +0800

    Fix broken amalgamation (#12792)
    
    * Fix broken amalgamation
    
    * Fixes #8850
    
    * Update CONTRIBUTORS.md
    
    * Update CONTRIBUTORS.md
---
 CONTRIBUTORS.md                | 2 ++
 amalgamation/amalgamation.py   | 7 ++++++-
 amalgamation/dmlc-minimum0.cc  | 1 +
 amalgamation/mxnet_predict0.cc | 7 +++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ffe0da6..caec6cf 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -213,6 +213,8 @@ List of Contributors
 * [Piyush Ghai](https://github.com/piyushghai)
 * [Zach Boldyga](https://github.com/zboldyga)
 
+* [Ming Yang](http://ufoym.com)
+
 Label Bot
 ---------
 * [mxnet-label-bot](https://github.com/mxnet-label-bot)
diff --git a/amalgamation/amalgamation.py b/amalgamation/amalgamation.py
index a3c28f7..0a4be02 100644
--- a/amalgamation/amalgamation.py
+++ b/amalgamation/amalgamation.py
@@ -143,7 +143,12 @@ def expand(x, pending, stage):
                 continue
             path = m.groups()[0]
             h = path.strip('./') if "../3rdparty/" not in path else path
-            source = find_source(h, x, stage)
+            if h.endswith('complex.h') and x.endswith('openblas_config.h'):
+                source = ''
+            elif h.startswith('ps/'):
+                source = '../3rdparty/ps-lite/include/' + h
+            else:
+                source = find_source(h, x, stage)
             if not source:
                 if (h not in blacklist and
                     h not in sysheaders and
diff --git a/amalgamation/dmlc-minimum0.cc b/amalgamation/dmlc-minimum0.cc
index 87e08d3..2fe629b 100644
--- a/amalgamation/dmlc-minimum0.cc
+++ b/amalgamation/dmlc-minimum0.cc
@@ -29,6 +29,7 @@
 #include "../3rdparty/dmlc-core/src/io/local_filesys.cc"
 #include "../3rdparty/dmlc-core/src/data.cc"
 #include "../3rdparty/dmlc-core/src/io.cc"
+#include "../3rdparty/dmlc-core/src/io/filesys.cc"
 #include "../3rdparty/dmlc-core/src/recordio.cc"
 
 
diff --git a/amalgamation/mxnet_predict0.cc b/amalgamation/mxnet_predict0.cc
index c4653d3..a18e28f 100644
--- a/amalgamation/mxnet_predict0.cc
+++ b/amalgamation/mxnet_predict0.cc
@@ -43,25 +43,31 @@
 #define DISABLE_OPENMP 1
 #define DMLC_LOG_STACK_TRACE 0
 
+#include "src/common/utils.cc"
 
 #include "src/ndarray/ndarray_function.cc"
 #include "src/ndarray/ndarray.cc"
 
 #include "src/imperative/imperative.cc"
+#include "src/imperative/imperative_utils.cc"
 #include "src/imperative/cached_op.cc"
 
 #include "src/engine/engine.cc"
 #include "src/engine/naive_engine.cc"
+#include "src/engine/openmp.cc"
 
 #include "src/profiler/profiler.cc"
+#include "src/profiler/aggregate_stats.cc"
 
 #include "src/executor/graph_executor.cc"
 #include "src/executor/attach_op_execs_pass.cc"
 #include "src/executor/attach_op_resource_pass.cc"
 #include "src/executor/inplace_addto_detect_pass.cc"
+#include "src/executor/infer_graph_attr_pass.cc"
 
 #include "src/nnvm/legacy_json_util.cc"
 #include "src/nnvm/legacy_op_util.cc"
+#include "src/nnvm/graph_editor.cc"
 
 #include "src/operator/operator.cc"
 #include "src/operator/operator_util.cc"
@@ -93,4 +99,5 @@
 #include "src/c_api/c_api_symbolic.cc"
 #include "src/c_api/c_api_ndarray.cc"
 #include "src/c_api/c_api_error.cc"
+#include "src/c_api/c_api_profile.cc"