Merge pull request numpy#24785 from charris/backport-24753

BLD: add libquadmath to licences and other tweaks (numpy#24753)

Author: charris

.github/workflows/windows_meson.yml renamed to .github/workflows/windows.yml

@@ -1,14 +1,11 @@
-name: Test Meson build (Windows)
+name: Windows tests
 
 on:
   pull_request:
     branches:
       - main
       - maintenance/**
 
-env:
-  PYTHON_VERSION: 3.11
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -17,10 +14,13 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-  msvc_64bit_python_openblas:
-    name: MSVC, x86-64, LP64 OpenBLAS
+  python64bit_openblas:
+    name: x86-64, LP64 OpenBLAS
     runs-on: windows-2019
     if: "github.repository == 'numpy/numpy'"
+    strategy:
+      matrix:
+        compiler: ["MSVC", "Clang-cl"]
     steps:
     - name: Checkout
       uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
@@ -31,7 +31,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
       with:
-        python-version: ${{ env.PYTHON_VERSION }}
+        python-version: '3.11'
 
     - name: Install build dependencies from PyPI
       run: |
@@ -48,16 +48,28 @@ jobs:
         unzip -d c:\opt openblas-v0.3.21-win_amd64-gcc_10_3_0.zip
         echo "PKG_CONFIG_PATH=c:\opt\64\lib\pkgconfig;" >> $env:GITHUB_ENV
 
-    - name: Install NumPy
+    - name: Install Clang-cl
+      if: matrix.compiler == 'Clang-cl'
+      run: |
+        choco install llvm -y --version=16.0.6
+
+    - name: Install NumPy (MSVC)
+      if: matrix.compiler == 'MSVC'
       run: |
         spin build -j2 -- --vsenv
 
+    - name: Install NumPy (Clang-cl)
+      if: matrix.compiler == 'Clang-cl'
+      run: |
+        "[binaries]","c = 'clang-cl'","cpp = 'clang-cl'","ar = 'llvm-lib'","c_ld = 'lld-link'","cpp_ld = 'lld-link'" | Out-File $PWD/clang-cl-build.ini -Encoding ascii
+        spin build -j2 -- --vsenv --native-file=$PWD/clang-cl-build.ini
+
     - name: Copy OpenBLAS DLL, write _distributor_init.py
       run: |
         # Getting the OpenBLAS DLL to the right place so it loads
         $installed_path = "$PWD\build-install\usr\Lib\site-packages"
         $numpy_path = "${installed_path}\numpy"
-        $libs_path = "${numpy_path}\.libs"
+        $libs_path = "${installed_path}\numpy.libs"
         mkdir ${libs_path}
         $ob_path = "C:/opt/64/bin/"
         cp $ob_path/*.dll $libs_path

.github/workflows/windows_clangcl.yml

@@ -49,11 +49,11 @@ steps:
   displayName: 'Build NumPy'
 
 - powershell: |
-    # copy from c:/opt/openblas/openblas_dll to numpy/.libs to ensure it can
+    # copy from c:/opt/openblas/openblas_dll to numpy/../numpy.libs to ensure it can
     # get loaded when numpy is imported (no RPATH on Windows)
     $target = $(python -c "import sysconfig; print(sysconfig.get_path('platlib'))")
-    mkdir $target/numpy/.libs
-    copy C:/opt/openblas/openblas_dll/*.dll $target/numpy/.libs
+    mkdir $target/numpy.libs
+    copy C:/opt/openblas/openblas_dll/*.dll $target/numpy.libs
   displayName: 'Copy OpenBLAS DLL to site-packages'
 
 - script: |

azure-steps-windows.yml

@@ -41,7 +41,7 @@ linux_aarch64_task:
     apt update
     apt install -y python3-venv python-is-python3 gfortran libatlas-base-dev libgfortran5 eatmydata
     git fetch origin
-    ./tools/travis-before-install.sh
+    bash ./tools/wheels/cibw_before_build.sh ${PWD}
     which python
     echo $CIRRUS_CHANGE_MESSAGE
   <<: *BUILD_AND_STORE_WHEELS

tools/ci/cirrus_wheels.yml

@@ -238,6 +238,9 @@ def get_members():
 def make_init(dirname):
     '''
     Create a _distributor_init.py file for OpenBlas
+
+    Obsoleted by the use of delvewheel in wheel building, which
+    adds an equivalent snippet to numpy/__init__.py, but still useful in CI
     '''
     with open(os.path.join(dirname, '_distributor_init.py'), 'w') as fid:
         fid.write(textwrap.dedent("""
@@ -246,19 +249,20 @@ def make_init(dirname):
             Once a DLL is preloaded, its namespace is made available to any
             subsequent DLL. This file originated in the numpy-wheels repo,
             and is created as part of the scripts that build the wheel.
+
             '''
             import os
             import glob
             if os.name == 'nt':
-                # convention for storing / loading the DLL from
-                # numpy/.libs/, if present
+                # load any DLL from numpy/../numpy.libs/, if present
                 try:
                     from ctypes import WinDLL
-                    basedir = os.path.dirname(__file__)
                 except:
                     pass
                 else:
-                    libs_dir = os.path.abspath(os.path.join(basedir, '.libs'))
+                    basedir = os.path.dirname(__file__)
+                    libs_dir = os.path.join(basedir, os.pardir, 'numpy.libs')
+                    libs_dir = os.path.abspath(libs_dir)
                     DLL_filenames = []
                     if os.path.isdir(libs_dir):
                         for filename in glob.glob(os.path.join(libs_dir,

tools/openblas_support.py

@@ -5,10 +5,10 @@ This binary distribution of NumPy also bundles the following software:
 
 
 Name: OpenBLAS
-Files: .libs/libopenb*.so
+Files: numpy.libs/libopenblas*.so
 Description: bundled as a dynamically linked library
-Availability: https://github.com/xianyi/OpenBLAS/
-License: 3-clause BSD
+Availability: https://github.com/OpenMathLib/OpenBLAS/
+License: BSD-3-Clause-Attribution
   Copyright (c) 2011-2014, The OpenBLAS Project
   All rights reserved.
 
@@ -41,10 +41,10 @@ License: 3-clause BSD
 
 
 Name: LAPACK
-Files: .libs/libopenb*.so
+Files: numpy.libs/libopenblas*.so
 Description: bundled in OpenBLAS
-Availability: https://github.com/xianyi/OpenBLAS/
-License 3-clause BSD
+Availability: https://github.com/OpenMathLib/OpenBLAS/
+License: BSD-3-Clause-Attribution
   Copyright (c) 1992-2013 The University of Tennessee and The University
                           of Tennessee Research Foundation.  All rights
                           reserved.
@@ -96,10 +96,10 @@ License 3-clause BSD
 
 
 Name: GCC runtime library
-Files: .libs/libgfortran*.so
+Files: numpy.libs/libgfortran*.so
 Description: dynamically linked to files compiled with gcc
-Availability: https://gcc.gnu.org/viewcvs/gcc/
-License: GPLv3 + runtime exception
+Availability: https://gcc.gnu.org/git/?p=gcc.git;a=tree;f=libgfortran
+License: GPL-3.0-with-GCC-exception
   Copyright (C) 2002-2017 Free Software Foundation, Inc.
 
   Libgfortran is free software; you can redistribute it and/or modify
@@ -878,3 +878,25 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+Name: libquadmath
+Files: numpy.libs/libquadmath*.so
+Description: dynamically linked to files compiled with gcc
+Availability: https://gcc.gnu.org/git/?p=gcc.git;a=tree;f=libquadmath
+License: LGPL-2.1-or-later
+
+    GCC Quad-Precision Math Library
+    Copyright (C) 2010-2019 Free Software Foundation, Inc.
+    Written by Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+    This file is part of the libquadmath library.
+    Libquadmath is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    Libquadmath is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+    https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html