Permalink
Browse files

Fix amalgamation scipt. (#4135)

Document that all other dependencies shall be disabled in config.mk
  • Loading branch information...
1 parent 3f6cc9d commit d31bd993a2baf70b3897dc2a3e94969de9327459 @leezu leezu committed with piiswrong Dec 7, 2016
Showing with 8 additions and 2 deletions.
  1. +2 −0 amalgamation/README.md
  2. +6 −2 amalgamation/amalgamation.py
@@ -18,6 +18,8 @@ Dependency
----------
The only dependency is a BLAS library.
+Make sure to disable all other dependencies in the `config.mk` file.
+
Acknowledgement
---------------
This module is created by [Jack Deng](https://github.com/jdeng).
@@ -7,7 +7,8 @@
'glog/logging.h', 'io/azure_filesys.h', 'io/hdfs_filesys.h', 'io/s3_filesys.h',
'kvstore_dist.h', 'mach/clock.h', 'mach/mach.h',
'malloc.h', 'mkl.h', 'mkl_cblas.h', 'mkl_vsl.h', 'mkl_vsl_functions.h',
- 'nvml.h', 'opencv2/opencv.hpp', 'sys/stat.h', 'sys/types.h', 'cuda.h', 'cuda_fp16.h'
+ 'nvml.h', 'opencv2/opencv.hpp', 'sys/stat.h', 'sys/types.h', 'cuda.h', 'cuda_fp16.h',
+ 'omp.h'
]
if len(sys.argv) < 4:
@@ -87,7 +88,10 @@ def expand(x, pending):
h = m.groups()[0].strip('./')
source = find_source(h, x)
if not source:
- if h not in blacklist and h not in sysheaders: sysheaders.append(h)
+ if (h not in blacklist and
+ h not in sysheaders and
+ 'mkl' not in h and
+ 'nnpack' not in h): sysheaders.append(h)
else:
expand(source, pending + [x])
print >>out, "//===== EXPANDED: %s =====\n" %x

0 comments on commit d31bd99

Please sign in to comment.