-
Notifications
You must be signed in to change notification settings - Fork 652
New Recipe: CPUInfo v0.0.20200122 #4555
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
giordano
merged 8 commits into
JuliaPackaging:master
from
stemann:wizard/CPUInfo-v0.0.20200122_fe6bdc42
Mar 6, 2022
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
a4ad5de
New Recipe: CPUInfo v0.0.20200122
stemann c20c5d7
Omitted cpuid-dump product to enable aarch64-linux-gnu
stemann 30f675e
Added lowercase windows include patch
stemann 58d77fc
Excluded unsupported aarch64-macos and freebsd
stemann 83fe09e
Excluded executable products to enable PowerPC64LE
stemann 0eac1b9
Simplified filtering of platforms
stemann 34ae1d5
Added manual install of omitted shared library on Windows
stemann d46685e
Excluded i686-windows
stemann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| # Note that this script can accept some limited command-line arguments, run | ||
| # `julia build_tarballs.jl --help` to see a usage message. | ||
| using BinaryBuilder, Pkg | ||
|
|
||
| name = "CPUInfo" | ||
| version = v"0.0.20200122" | ||
|
|
||
| # Collection of sources required to complete build | ||
| sources = [ | ||
| GitSource("https://github.com/pytorch/cpuinfo.git", "0e6bde92b343c5fbcfe34ecd41abf9515d54b4a7"), | ||
| DirectorySource("./bundled"), | ||
| ] | ||
|
|
||
| # Bash recipe for building across all platforms | ||
| script = raw""" | ||
| cd $WORKSPACE/srcdir | ||
| cd cpuinfo | ||
| if [[ $target == *-w64-mingw32 ]]; then | ||
| atomic_patch -p1 ../patches/lowercase-windows-include.patch | ||
| fi | ||
| mkdir build | ||
| cd build | ||
| cmake \ | ||
| -DCMAKE_INSTALL_PREFIX=$prefix \ | ||
| -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \ | ||
| -DCMAKE_BUILD_TYPE=Release \ | ||
| -DCMAKE_INSTALL_LIBDIR=$libdir \ | ||
| -DCPUINFO_BUILD_UNIT_TESTS=OFF \ | ||
| -DCPUINFO_BUILD_MOCK_TESTS=OFF \ | ||
| -DCPUINFO_BUILD_BENCHMARKS=OFF \ | ||
| -DCPUINFO_LIBRARY_TYPE=shared \ | ||
| .. | ||
| cmake --build . -- -j $nproc | ||
| make install | ||
| if [[ $target == *-w64-mingw32 ]]; then | ||
| install -Dvm 755 libcpuinfo.dll "${libdir}/libcpuinfo.dll" | ||
| fi | ||
| """ | ||
|
|
||
| # These are the platforms we will build for by default, unless further | ||
| # platforms are passed in on the command line | ||
| platforms = supported_platforms() | ||
| filter!(p -> !(Sys.isapple(p) && arch(p) == "aarch64"), platforms) # aarch64-macos unsupported | ||
| filter!(p -> !Sys.isfreebsd(p), platforms) # FreeBSD unsupported | ||
| filter!(p -> !(Sys.iswindows(p) && arch(p) == "i686"), platforms) # Failing to link | ||
|
|
||
| # The products that we will ensure are always built | ||
| products = [ | ||
| LibraryProduct("libcpuinfo", :libcpuinfo), | ||
| ] | ||
|
|
||
| # Dependencies that must be installed before this package can be built | ||
| dependencies = Dependency[ | ||
| ] | ||
|
|
||
| # Build the tarballs, and possibly a `build.jl` as well. | ||
| build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6") |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/src/x86/windows/init.c b/src/x86/windows/init.c | ||
| index 7a2090e..115f366 100644 | ||
| --- a/src/x86/windows/init.c | ||
| +++ b/src/x86/windows/init.c | ||
| @@ -8,7 +8,7 @@ | ||
| #include <cpuinfo/internal-api.h> | ||
| #include <cpuinfo/log.h> | ||
|
|
||
| -#include <Windows.h> | ||
| +#include <windows.h> | ||
|
|
||
| static inline uint32_t bit_mask(uint32_t bits) { | ||
| return (UINT32_C(1) << bits) - UINT32_C(1); | ||
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.
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.
It'd be good to upstream this patch
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.
They actually already have fixed that - luckily :-)