From 0ca3371b8e5827859db12010aea1d8bcd974281f Mon Sep 17 00:00:00 2001 From: Ming Date: Thu, 11 Oct 2018 13:41:28 +0800 Subject: [PATCH 1/4] Fix broken amalgamation --- amalgamation/amalgamation.py | 7 ++++++- amalgamation/dmlc-minimum0.cc | 1 + amalgamation/mxnet_predict0.cc | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/amalgamation/amalgamation.py b/amalgamation/amalgamation.py index a3c28f7118e9..0a4be02b8ff9 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 87e08d31c4d6..2fe629b20ed3 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 c4653d30dd3d..a18e28fd57de 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" From 03f9b0319f54597f6e61c8437e15e1e502df96af Mon Sep 17 00:00:00 2001 From: Ming Date: Tue, 11 Dec 2018 16:43:34 +0800 Subject: [PATCH 2/4] Fixes #8850 --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index db8e37eb4254..6dac5cf09054 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -186,3 +186,4 @@ List of Contributors * [Chaitanya Bapat](https://github.com/ChaiBapchya) * [LuckyPigeon](https://github.com/LuckyPigeon) * [Anton Chernov](https://github.com/lebeg) +* [Ming Yang](http://ufoym.com) From f4f109ec7f1bd3a4189136da02e4dc7845929e23 Mon Sep 17 00:00:00 2001 From: Ming Date: Sun, 10 Feb 2019 22:47:22 +0800 Subject: [PATCH 3/4] Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 87ea33a96381..30fbf4239d2b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -193,8 +193,9 @@ List of Contributors * [Yuxi Hu](https://github.com/yuxihu) * [Harsh Patel](https://github.com/harshp8l) * [Xiao Wang](https://github.com/BeyonderXX) -* [Ming Yang](http://ufoym.com) * [Piyush Ghai](https://github.com/piyushghai) +* [Zach Boldyga](https://github.com/zboldyga) +* [Ming Yang](http://ufoym.com) Label Bot --------- From 76f82fd98f7d49f650b65b3f0ce3a68a0c227bfc Mon Sep 17 00:00:00 2001 From: Ming Date: Sat, 16 Feb 2019 09:47:44 +0800 Subject: [PATCH 4/4] Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 30fbf4239d2b..fd394cd17601 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -195,6 +195,7 @@ List of Contributors * [Xiao Wang](https://github.com/BeyonderXX) * [Piyush Ghai](https://github.com/piyushghai) * [Zach Boldyga](https://github.com/zboldyga) + * [Ming Yang](http://ufoym.com) Label Bot