Merge pull request #163 from regro-cf-autotick-bot/0.3.28_ha22c70

openblas v0.3.28
conda-forge · Aug 17, 2024 · c850422 · c850422
2 parents 441b6ae + f4ee62d
commit c850422
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 39 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_SYMBOLSUFFIX64_USE_OPENMP0name_suffix-ilp64.yaml b/.ci_support/linux_64_SYMBOLSUFFIX64_USE_OPENMP0name_suffix-ilp64.yaml
@@ -7,13 +7,13 @@ USE_OPENMP:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '14'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -23,7 +23,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '14'
 name_suffix:
 - -ilp64
 perl:

diff --git a/.ci_support/linux_64_SYMBOLSUFFIX64_USE_OPENMP1name_suffix-ilp64.yaml b/.ci_support/linux_64_SYMBOLSUFFIX64_USE_OPENMP1name_suffix-ilp64.yaml
@@ -7,13 +7,13 @@ USE_OPENMP:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '14'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -23,7 +23,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '14'
 name_suffix:
 - -ilp64
 perl:

diff --git a/.ci_support/linux_64_SYMBOLSUFFIXUSE_OPENMP0name_suffix.yaml b/.ci_support/linux_64_SYMBOLSUFFIXUSE_OPENMP0name_suffix.yaml
@@ -7,13 +7,13 @@ USE_OPENMP:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '14'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -23,7 +23,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '14'
 name_suffix:
 - ''
 perl:

diff --git a/.ci_support/linux_64_SYMBOLSUFFIXUSE_OPENMP1name_suffix.yaml b/.ci_support/linux_64_SYMBOLSUFFIXUSE_OPENMP1name_suffix.yaml
@@ -7,13 +7,13 @@ USE_OPENMP:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '14'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -23,7 +23,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '14'
 name_suffix:
 - ''
 perl:

diff --git a/.ci_support/linux_aarch64_USE_OPENMP0.yaml b/.ci_support/linux_aarch64_USE_OPENMP0.yaml
@@ -9,7 +9,7 @@ USE_OPENMP:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '14'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -27,7 +27,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '14'
 name_suffix:
 - ''
 perl:

diff --git a/.ci_support/linux_aarch64_USE_OPENMP1.yaml b/.ci_support/linux_aarch64_USE_OPENMP1.yaml
@@ -9,7 +9,7 @@ USE_OPENMP:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '14'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -27,7 +27,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '14'
 name_suffix:
 - ''
 perl:

diff --git a/.ci_support/linux_ppc64le_SYMBOLSUFFIX64_USE_OPENMP0name_suffix-ilp64.yaml b/.ci_support/linux_ppc64le_SYMBOLSUFFIX64_USE_OPENMP0name_suffix-ilp64.yaml
@@ -7,7 +7,7 @@ USE_OPENMP:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '14'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -23,7 +23,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '14'
 name_suffix:
 - -ilp64
 perl:

diff --git a/.ci_support/linux_ppc64le_SYMBOLSUFFIX64_USE_OPENMP1name_suffix-ilp64.yaml b/.ci_support/linux_ppc64le_SYMBOLSUFFIX64_USE_OPENMP1name_suffix-ilp64.yaml
@@ -7,7 +7,7 @@ USE_OPENMP:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '14'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -23,7 +23,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '14'
 name_suffix:
 - -ilp64
 perl:

diff --git a/.ci_support/linux_ppc64le_SYMBOLSUFFIXUSE_OPENMP0name_suffix.yaml b/.ci_support/linux_ppc64le_SYMBOLSUFFIXUSE_OPENMP0name_suffix.yaml
@@ -7,7 +7,7 @@ USE_OPENMP:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '14'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -23,7 +23,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '14'
 name_suffix:
 - ''
 perl:

diff --git a/.ci_support/linux_ppc64le_SYMBOLSUFFIXUSE_OPENMP1name_suffix.yaml b/.ci_support/linux_ppc64le_SYMBOLSUFFIXUSE_OPENMP1name_suffix.yaml
@@ -7,7 +7,7 @@ USE_OPENMP:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '14'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -23,7 +23,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '14'
 name_suffix:
 - ''
 perl:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -21,6 +21,3 @@ if %ERRORLEVEL% neq 0 exit 1
 
 ctest -j2
 if %ERRORLEVEL% neq 0 exit 1
-
-utest\openblas_utest.exe
-if %ERRORLEVEL% neq 0 exit 1
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -ex
 
 # Fix ctest not automatically discovering tests
 LDFLAGS=$(echo "${LDFLAGS}" | sed "s/-Wl,--gc-sections//g")

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,3 +1,10 @@
+# gcc 12 cannot handle `-mtune=native` on aarch,
+# gcc 13 causes test failures on ppc
+c_compiler_version:         # [linux]
+  - 14                      # [linux]
+fortran_compiler_version:   # [linux]
+  - 14                      # [linux]
+
 SYMBOLSUFFIX:
   - ""
   - "64_"     # [not (win or aarch64)]

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,13 +1,16 @@
-{% set version = "0.3.27" %}
-{% set build_number = 1 %}
+{% set version = "0.3.28" %}
+{% set build_number = 0 %}
 
 package:
   name: openblas
   version: {{ version }}
 
 source:
   url: https://github.com/OpenMathLib/OpenBLAS/archive/v{{ version }}.tar.gz
-  sha256: aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897
+  sha256: f1003466ad074e9b0c8d421a204121100b0751c96fc6fcf3d1456bd12f8a00a1
+  patches:
+    # don't run test_fork in emulation, it has a tendency to hang indefinitely
+    - patches/0001-don-t-run-test_fork-in-cross-compilation.patch  # [build_platform != target_platform]
 
 build:
   number: {{ build_number }}

diff --git a/recipe/patches/0001-don-t-run-test_fork-in-cross-compilation.patch b/recipe/patches/0001-don-t-run-test_fork-in-cross-compilation.patch
@@ -0,0 +1,23 @@
+From 04ffe3be0b4e7ed5483ae20dc0eec2cfa7e98703 Mon Sep 17 00:00:00 2001
+From: "H. Vetinari" <[email protected]>
+Date: Sat, 17 Aug 2024 22:36:42 +1100
+Subject: [PATCH] don't run test_fork in cross-compilation
+
+---
+ utest/Makefile | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/utest/Makefile b/utest/Makefile
+index b82937093..bcb9572ee 100644
+--- a/utest/Makefile
++++ b/utest/Makefile
+@@ -44,9 +44,6 @@ endif
+ #this does not work with OpenMP nor with native Windows or Android threads
+ # FIXME TBD if this works on OSX, SunOS, POWER and zarch
+ ifeq ($(OSNAME), $(filter $(OSNAME),Linux CYGWIN_NT))
+-ifneq ($(USE_OPENMP), 1)
+-OBJS += test_fork.o
+-endif
+ OBJS += test_post_fork.o
+ endif
+