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

Fix broken amalgamation #12792

Merged
merged 8 commits into from
Feb 16, 2019
Merged

Fix broken amalgamation #12792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0ca3371
Fix broken amalgamation
ufoym Oct 11, 2018
03f9b03
Fixes #8850
ufoym Dec 11, 2018
1455e11
Merge branch 'master' into master
ufoym Dec 11, 2018
5163c36
Merge branch 'master' into master
ufoym Dec 17, 2018
0acd7b3
Merge branch 'master' into master
ufoym Jan 15, 2019
f4f109e
Update CONTRIBUTORS.md
ufoym Feb 10, 2019
fd2ff73
Merge branch 'master' into master
ufoym Feb 10, 2019
76f82fd
Update CONTRIBUTORS.md
ufoym Feb 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: 2 additions & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,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)
Expand Down
7 changes: 6 additions & 1 deletion amalgamation/amalgamation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment explaining the special case? Also, is there maybe a nicer way to deal with this ambiguity - e.g. making the names (complex.h) more unique in the output to avoid a name clash?

source = ''
elif h.startswith('ps/'):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does the "ps/" come from? Maybe we can edit where this comes from instead of adding an exception?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"ps/" come from

https://github.com/apache/incubator-mxnet/blob/4649bfa641ad4129b3e83ea0af14b489e512f8f4/src/kvstore/kvstore_dist.h#L33

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to rewrite that instead. It doesn't seem correct to me.

@szha @eric-haibin-lin

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
Expand Down
1 change: 1 addition & 0 deletions amalgamation/dmlc-minimum0.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"


7 changes: 7 additions & 0 deletions amalgamation/mxnet_predict0.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"