Skip to content
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

[BLIS] Update to 1.1 #10284

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion B/blis/blis/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ script = blis_script(blis32=false)
products = [
LibraryProduct("libblis", :blis)
]

build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
preferred_gcc_version=v"11", lock_microarchitecture=false, julia_compat="1.6")


# Build counter: 1
2 changes: 1 addition & 1 deletion B/blis/blis32/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ products = [
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
preferred_gcc_version=v"11", lock_microarchitecture=false, julia_compat="1.6")

# Build trigger: 1
# Build counter: 1
37 changes: 21 additions & 16 deletions B/blis/common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# `julia build_tarballs.jl --help` to see a usage message.
using BinaryBuilder, Pkg

version = v"1.0.0"
version = v"1.1.0"

# Collection of sources required to complete build
sources = [
GitSource("https://github.com/flame/blis.git", "6d0ab74f6975fdf4d19cee06d946b09b6ca89656"),
GitSource("https://github.com/flame/blis.git", "464180ff28e6a3f74f7c754ec01ed8a6a2f978df"),
DirectorySource("../bundled")
]

Expand All @@ -32,21 +32,25 @@ function blis_script(;blis32::Bool=false)

case ${target} in

*"x86_64"*"linux"*)
*"x86_64"*"linux"*)
export BLI_CONFIG=x86_64
export BLI_THREAD=openmp
;;
*"x86_64"*"w64"*)
*"aarch64"*"linux"*)
export BLI_CONFIG=arm64
export BLI_THREAD=openmp
;;
*"arm"*"linux"*)
export BLI_CONFIG=arm32
export BLI_THREAD=none
;;
*"x86_64"*"w64"*)
# MinGW doesn't support savexmm instructions
# Build only for AMD processors.
export BLI_CONFIG=amd64
export BLI_THREAD=openmp
;;
*"x86_64"*"apple"*)
export BLI_CONFIG=x86_64
export BLI_THREAD=openmp
;;
*"x86_64"*"freebsd"*)
*"x86_64"*"apple"*)
export BLI_CONFIG=x86_64
export BLI_THREAD=openmp
;;
Expand All @@ -56,19 +60,19 @@ function blis_script(;blis32::Bool=false)
export BLI_CONFIG=firestorm
export BLI_THREAD=openmp
;;
*"aarch64"*"linux"*)
export BLI_CONFIG=arm64
*"x86_64"*"freebsd"*)
export BLI_CONFIG=x86_64
export BLI_THREAD=openmp
;;
*"arm"*"linux"*)
export BLI_CONFIG=arm32
export BLI_THREAD=none
*"aarch64"*"freebsd"*)
export BLI_CONFIG=arm64
export BLI_THREAD=openmp
;;
*)
# Default (Generic) configuration without optimized kernel.
export BLI_CONFIG=generic
export BLI_THREAD=none
;;
;;

esac

Expand Down Expand Up @@ -153,7 +157,8 @@ platforms = [
Platform("x86_64", "linux"; libc="glibc"),
Platform("aarch64", "linux"; libc="glibc"),
Platform("aarch64", "macos"),
Platform("x86_64", "freebsd")
Platform("x86_64", "freebsd"),
Platform("aarch64", "freebsd"),
]

# Dependencies that must be installed before this package can be built
Expand Down