From ae0870e3b3bdf03e0edaa9465c276273c7b79b0b Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Thu, 16 Jan 2025 15:38:28 +0000 Subject: [PATCH 1/5] Update to 1.1 --- B/blis/common.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/B/blis/common.jl b/B/blis/common.jl index 04507492f2c..5e961ddb21a 100644 --- a/B/blis/common.jl +++ b/B/blis/common.jl @@ -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") ] From a0077e19fd72e8cb0441e13c962102b409fe6b1e Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Thu, 16 Jan 2025 15:41:14 +0000 Subject: [PATCH 2/5] Organize configs by OS --- B/blis/common.jl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/B/blis/common.jl b/B/blis/common.jl index 5e961ddb21a..1defde3cfc9 100644 --- a/B/blis/common.jl +++ b/B/blis/common.jl @@ -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 ;; @@ -56,19 +60,15 @@ 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 - ;; *) # Default (Generic) configuration without optimized kernel. export BLI_CONFIG=generic export BLI_THREAD=none - ;; + ;; esac From a9f496b0fba14404408917d5b687111b1778619a Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Thu, 16 Jan 2025 15:43:08 +0000 Subject: [PATCH 3/5] Try building on aarch64 freebsd --- B/blis/common.jl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/B/blis/common.jl b/B/blis/common.jl index 1defde3cfc9..40d60214f08 100644 --- a/B/blis/common.jl +++ b/B/blis/common.jl @@ -64,6 +64,10 @@ function blis_script(;blis32::Bool=false) export BLI_CONFIG=x86_64 export BLI_THREAD=openmp ;; + *"aarch64"*"freebsd"*) + export BLI_CONFIG=arm64 + export BLI_THREAD=openmp + ;; *) # Default (Generic) configuration without optimized kernel. export BLI_CONFIG=generic @@ -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 From 596225edc05fc86dc43b2368d8bc7b609b5272de Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Thu, 16 Jan 2025 15:47:11 +0000 Subject: [PATCH 4/5] Actually trigger the new builds --- B/blis/blis/build_tarballs.jl | 5 ++++- B/blis/blis32/build_tarballs.jl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/B/blis/blis/build_tarballs.jl b/B/blis/blis/build_tarballs.jl index 0ef30a3e503..1073335292d 100644 --- a/B/blis/blis/build_tarballs.jl +++ b/B/blis/blis/build_tarballs.jl @@ -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 \ No newline at end of file diff --git a/B/blis/blis32/build_tarballs.jl b/B/blis/blis32/build_tarballs.jl index 7766dc74a4c..0002d01aeba 100644 --- a/B/blis/blis32/build_tarballs.jl +++ b/B/blis/blis32/build_tarballs.jl @@ -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 From 36d25b70de15069dfa446306c91a9f065ce62b21 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Thu, 16 Jan 2025 17:53:44 +0000 Subject: [PATCH 5/5] Update B/blis/blis/build_tarballs.jl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mosè Giordano <765740+giordano@users.noreply.github.com> --- B/blis/blis/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/B/blis/blis/build_tarballs.jl b/B/blis/blis/build_tarballs.jl index 1073335292d..d1dca5699ae 100644 --- a/B/blis/blis/build_tarballs.jl +++ b/B/blis/blis/build_tarballs.jl @@ -12,4 +12,4 @@ build_tarballs(ARGS, name, version, sources, script, platforms, products, depend preferred_gcc_version=v"11", lock_microarchitecture=false, julia_compat="1.6") -# Build counter: 1 \ No newline at end of file +# Build counter: 1