This repository has been archived by the owner on Nov 17, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6.8k
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eric-haibin-lin
force-pushed
the
dmlc-core
branch
from
March 24, 2019 19:27
f7da6e3
to
d2f6a75
Compare
wkcn
approved these changes
Mar 24, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM: )
Thank you for the update!
eric-haibin-lin
force-pushed
the
dmlc-core
branch
from
March 25, 2019 00:38
d2f6a75
to
72bc5f2
Compare
Looks like the CMakeFile in dmlc-core has been changed in multiple PRs that causes amalgamation to break:
|
@mxnet-label-bot add[pr-awaiting-merge] |
wkcn
added
pr-work-in-progress
PR is still work in progress
and removed
pr-awaiting-merge
Review and CI is complete. Ready to Merge
labels
Mar 25, 2019
@eric-haibin-lin Platform-specific headers such as |
@eric-haibin-lin This patch should fix amalgamation: diff --git a/amalgamation/amalgamation.py b/amalgamation/amalgamation.py
index 0a4be02b8..edf01941d 100644
--- a/amalgamation/amalgamation.py
+++ b/amalgamation/amalgamation.py
@@ -46,7 +46,13 @@ if platform.system() != 'Darwin':
if platform.system() != 'Windows':
blacklist.append('windows.h')
blacklist.append('process.h')
+ blacklist.append('Shlwapi.h')
+if platform.system() == 'Windows':
+ blacklist.append('unistd.h')
+
+if 'freebsd' not in sys.platform:
+ blacklist.append('sys/endian.h')
def get_sources(def_file):
sources = []
@@ -94,6 +100,7 @@ def find_source(name, start, stage):
re1 = re.compile('<([./a-zA-Z0-9_-]*)>')
re2 = re.compile('"([./a-zA-Z0-9_-]*)"')
+re3 = re.compile('DMLC_EXECINFO_H')
sysheaders = []
history = set([])
@@ -129,6 +136,9 @@ def expand(x, pending, stage):
with open(x, 'rb') as x_h:
for line in x_h.readlines():
uline = line.decode('utf-8')
+ if '#define DMLC_LOG_STACK_TRACE 1' in uline.strip():
+ # Do not enable stacktrace logging
+ continue
if uline.find('#include') < 0:
out.write(line)
continue
@@ -138,10 +148,15 @@ def expand(x, pending, stage):
m = re1.search(uline)
if not m:
m = re2.search(uline)
- if not m:
- print(uline + ' not found')
- continue
- path = m.groups()[0]
+ if m:
+ path = m.groups()[0]
+ else:
+ m = re3.search(uline)
+ if m:
+ path = 'execinfo.h'
+ else:
+ print(uline + ' not found')
+ continue
h = path.strip('./') if "../3rdparty/" not in path else path
if h.endswith('complex.h') and x.endswith('openblas_config.h'):
source = '' |
Amalgamation test passed |
Somehow upgrading dmlc-core breaks Julia? |
haohuanw
pushed a commit
to haohuanw/incubator-mxnet
that referenced
this pull request
Jun 23, 2019
* upgrade dmlc-core * Update amalgamation.py
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Upgrade the dmlc-core dependency to the latest commit.
Checklist
Essentials
Please feel free to remove inapplicable items for your PR.
Comments