Fix amalgamation scipt. #4135

Merged
merged 1 commit into from Dec 7, 2016

Projects

None yet

2 participants

@leezu
Contributor
leezu commented Dec 7, 2016

Fix amalgamation scipt and document that all other dependencies shall be disabled in config.mk.

This includes the changes proposed in #3667 (comment).

Without these changes, calling e.g. make MIN=1 libmxnet_predict.js in the amalgamation folder will fail due to unresolved dependencies (e.g. #include <mkl/mkl_batch_norm-inl.h>)

@leezu leezu Fix amalgamation scipt.
Document that all other dependencies shall be disabled in config.mk
2d3374b
@piiswrong piiswrong merged commit d31bd99 into dmlc:master Dec 7, 2016

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
default Build finished.
Details
@leezu leezu deleted the ML-HK:fix_amalgamation branch Dec 7, 2016
@leezu leezu referenced this pull request in dmlc/mxnet.js Dec 7, 2016
Open

Support current version of mxnet #11

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment