fixes for building via setup.py on aarch64 #135
Merged
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
FrancescAlted
requested changes
Dec 15, 2017
| @@ -941,7 +941,7 @@ def get_cpu_info_from_cpuid(): | |||
| ''' | |||
|
|
|||
| returncode, output = run_and_get_stdout([sys.executable, "-c", "import cpuinfo; print(cpuinfo.actual_get_cpu_info_from_cpuid())"]) | |||
| if returncode != 0: | |||
| if (returncode != 0) or (output.strip() == 'None'): | |||
| return None | |||
There was a problem hiding this comment.
The standard indentation size in Python is 4 spaces
There was a problem hiding this comment.
I'm pretty confused by your request. Your cpuinfo.py uses tabs, not spaces for indentation, and as little as I like it, I kept with the existing style. The line in question is indented with a single tab character, as the original line was before I made my edits.
$ head -n 944 cpuinfo.py|tail -n 1 | xxd
00000000: 0969 6620 2872 6574 7572 6e63 6f64 6520 .if (returncode
00000010: 213d 2030 2920 6f72 2028 6f75 7470 7574 != 0) or (output
00000020: 2e73 7472 6970 2829 203d 3d20 274e 6f6e .strip() == 'Non
00000030: 6527 293a 0a e'):.
There was a problem hiding this comment.
autopep8 -i cpuinfo.py completed successfully, I'm happy to push the resulting tab-free file if you'd like.
There was a problem hiding this comment.
Oh, I was not aware that cpuinfo.py was using tabs instead of spaces. Never mind, in order to not change too much, I'll merge as is. Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cpuinfo.py didn't check for "None\n" which is the result of
print(actual_get_cpu_info_from_cpuid())on at least this aarch64 platform.Rest of the fixes should be pretty readily apparent.
Cheers!