Merge pull request #1 from rmhowe425/main

rebase

Author: rmhowe425

.circleci/config.yml

@@ -63,7 +63,7 @@ jobs:
             . venv/bin/activate
             pip install --progress-bar=off -r test_requirements.txt
             pip install --progress-bar=off -r doc_requirements.txt
-            pip install .
+            pip install . --config-settings=setup-args="-Dallow-noblas=true"
 
       - run:
           name: create release notes

.cirrus.star

@@ -24,7 +24,7 @@ def main(ctx):
     # only contains the actual commit message on a non-PR trigger event.
     # For a PR event it contains the PR title and description.
     SHA = env.get("CIRRUS_CHANGE_IN_REPO")
-    url = "https://api.github.com/repos/scipy/scipy/git/commits/" + SHA
+    url = "https://api.github.com/repos/numpy/numpy/git/commits/" + SHA
     dct = http.get(url).json()
     # if "[wheel build]" in dct["message"]:
     #     return fs.read("ci/cirrus_wheels.yml")

.github/workflows/build_test.yml

@@ -181,13 +181,12 @@ jobs:
         python-version: ${{ env.PYTHON_VERSION }}
     - uses: ./.github/actions
 
-  debug_and_cython3:
+  debug:
     needs: [smoke_test]
     runs-on: ubuntu-latest
     if: github.event_name != 'push'
     env:
       USE_DEBUG: 1
-      USE_CYTHON3: 1
     steps:
     - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       with:
@@ -343,11 +342,10 @@ jobs:
         sudo apt update
         sudo apt install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf gfortran-arm-linux-gnueabihf
 
-        # Keep the `test_requirements.txt` dependency-subset synced
-        docker run --name the_container --interactive -v /:/host arm32v7/ubuntu:22.04 /bin/bash -c "
+        docker run --name the_container --interactive -v /:/host -v $(pwd):/numpy arm32v7/ubuntu:22.04 /bin/bash -c "
           apt update &&
           apt install -y git python3 python3-dev python3-pip  &&
-          python3 -m pip install cython==0.29.34 setuptools\<49.2.0 hypothesis==6.23.3 pytest==6.2.5 'typing_extensions>=4.2.0' &&
+          python3 -m pip install -r /numpy/test_requirements.txt
           ln -s /host/lib64 /lib64 &&
           ln -s /host/lib/x86_64-linux-gnu /lib/x86_64-linux-gnu &&
           ln -s /host/usr/arm-linux-gnueabihf /usr/arm-linux-gnueabihf &&
@@ -425,7 +423,7 @@ jobs:
         python-version: ${{ env.PYTHON_VERSION }}
     - name: Install Intel SDE
       run: |
-        curl -o /tmp/sde.tar.xz https://downloadmirror.intel.com/751535/sde-external-9.14.0-2022-10-25-lin.tar.xz
+        curl -o /tmp/sde.tar.xz https://downloadmirror.intel.com/784319/sde-external-9.24.0-2023-07-13-lin.tar.xz
         mkdir /tmp/sde && tar -xvf /tmp/sde.tar.xz -C /tmp/sde/
         sudo mv /tmp/sde/* /opt/sde && sudo ln -s /opt/sde/sde64 /usr/bin/sde
     - name: Install dependencies
@@ -442,8 +440,6 @@ jobs:
         python -c "import numpy as np; np.show_config()"
     # Run only a few tests, running everything in an SDE takes a long time
     # Using pytest directly, unable to use python runtests.py -n -t ...
-    # Disabled running in the SDE because of an SDE bug
     - name: Run linalg/ufunc/umath tests
       run: |
-        python -m pytest numpy/core/tests/test_umath* numpy/core/tests/test_ufunc.py numpy/linalg/tests/test_*
-        #sde -spr -- python -m pytest numpy/core/tests/test_umath* numpy/core/tests/test_ufunc.py numpy/linalg/tests/test_*
+        sde -spr -- python -m pytest numpy/core/tests/test_umath* numpy/core/tests/test_ufunc.py numpy/linalg/tests/test_*

.github/workflows/circleci.yml

@@ -17,7 +17,7 @@ jobs:
       statuses: write
     steps:
       - name: GitHub Action step
-        uses: larsoner/circleci-artifacts-redirector-action@443f056c4757600f1452146a7ce1627d1c034029 # master
+        uses: larsoner/circleci-artifacts-redirector-action@7e80b26b4c58b5d3272effc05491c18296b1ad6e # master
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           api-token: ${{ secrets.CIRCLE_TOKEN }}

.github/workflows/linux_compiler_sanitizers.yml

@@ -0,0 +1,55 @@
+name: Test with compiler sanitizers (Linux)
+
+on:
+  pull_request:
+    branches:
+      - main
+      - maintenance/**
+
+defaults:
+  run:
+    shell: bash
+
+env:
+  PYTHON_VERSION: 3.11
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  gcc_sanitizers:
+    if: "github.repository == 'numpy/numpy'"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
+      with:
+        python-version: ${{ env.PYTHON_VERSION }}
+    - name: Install dependencies
+      run: |
+        pip install -r build_requirements.txt
+        sudo apt-get install -y libopenblas-serial-dev
+    - name: Build
+      shell: 'script -q -e -c "bash --noprofile --norc -eo pipefail {0}"'
+      env:
+        TERM: xterm-256color
+      run:
+        spin build -- --werror -Db_sanitize=address,undefined
+    - name: Test
+      shell: 'script -q -e -c "bash --noprofile --norc -eo pipefail {0}"'
+      env:
+        TERM: xterm-256color
+      run: |
+        pip install pytest pytest-xdist hypothesis typing_extensions
+        ASAN_OPTIONS=detect_leaks=0:symbolize=1:strict_init_order=true:allocator_may_return_null=1:halt_on_error=1 \
+        LD_PRELOAD=$(gcc --print-file-name=libasan.so) \
+        python -m spin test -- -v -s
+        
+  

.github/workflows/wheels.yml

@@ -111,7 +111,7 @@ jobs:
           python-version: "3.x"
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@66b46d086804a9e9782354100d96a3a445431bca # v2.14.0
+        uses: pypa/cibuildwheel@f21bb8376a051ffb6cb5604b28ccaef7b90e8ab7 # v2.14.1
         env:
           CIBW_PRERELEASE_PYTHONS: True
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
@@ -186,12 +186,13 @@ jobs:
           python-version: "3.9"
       - name: Build sdist
         run: |
-          python setup.py sdist
+          python -m pip install -U pip build
+          python -m build --sdist -Csetup-args=-Dallow-noblas=true
       - name: Test the sdist
         run: |
           # TODO: Don't run test suite, and instead build wheels from sdist
           # Depends on pypa/cibuildwheel#1020
-          python -m pip install dist/*.gz
+          python -m pip install dist/*.gz -Csetup-args=-Dallow-noblas=true
           pip install ninja
           pip install -r test_requirements.txt
           cd .. # Can't import numpy within numpy src directory

.github/workflows/windows_meson.yml

@@ -17,10 +17,10 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-  meson:
-    name: Meson windows build/test
+  msvc_64bit_python_openblas:
+    name: MSVC, x86-64, LP64 OpenBLAS
     runs-on: windows-2019
-    # if: "github.repository == 'numpy/numpy'"
+    if: "github.repository == 'numpy/numpy'"
     steps:
     - name: Checkout
       uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -86,3 +86,38 @@ jobs:
         echo "LASTEXITCODE is '$LASTEXITCODE'"
         python -c "import numpy, sys; sys.exit(numpy.test(verbose=3) is False)"
         echo "LASTEXITCODE is '$LASTEXITCODE'"
+
+  msvc_32bit_python_openblas:
+    name: MSVC, 32-bit Python, no BLAS
+    runs-on: windows-2019
+    if: "github.repository == 'numpy/numpy'"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Setup Python (32-bit)
+        uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
+        with:
+          python-version: '3.10'
+          architecture: 'x86'
+
+      - name: Setup MSVC (32-bit)
+        uses: bus1/cabuild/action/msdevshell@e22aba57d6e74891d059d66501b6b5aed8123c4d  # v1
+        with:
+          architecture: 'x86'
+
+      - name: Build and install
+        run: |
+          python -m pip install . -v -Ccompile-args="-j2" -Csetup-args="-Dallow-noblas=true"
+
+      - name: Install test dependencies
+        run: |
+          python -m pip install -r test_requirements.txt
+
+      - name: Run test suite (fast)
+        run: |
+          cd tools
+          python -m pytest --pyargs numpy -m "not slow" -n2

.spin/cmds.py

@@ -425,25 +425,12 @@ def ipython(ctx, ipython_args):
 
     ppath = meson._set_pythonpath()
 
-    # Get NumPy version
-    p = util.run([
-        sys.executable, '-c',
-        'import sys; sys.path.pop(0); import numpy; print(numpy.__version__)'],
-        output=False, echo=False
-    )
-    np_ver = p.stdout.strip().decode('ascii')
-
-    with tempfile.TemporaryDirectory() as d:
-        profile_dir = os.path.join(d, f'numpy_{np_ver}')
-        startup_dir = os.path.join(profile_dir, 'startup')
-
-        pathlib.Path(startup_dir).mkdir(parents=True)
-        with open(os.path.join(startup_dir, '00_numpy.py'), 'w') as f:
-            f.write('import numpy as np\n')
-
-        print(f'💻 Launching IPython with PYTHONPATH="{ppath}"')
-        util.run(["ipython", "--profile-dir", profile_dir, "--ignore-cwd"] +
-                 list(ipython_args))
+    print(f'💻 Launching IPython with PYTHONPATH="{ppath}"')
+    preimport = (r"import numpy as np; "
+                 r"print(f'\nPreimported NumPy {np.__version__} as np')")
+    util.run(["ipython", "--ignore-cwd",
+              f"--TerminalIPythonApp.exec_lines={preimport}"] +
+             list(ipython_args))
 
 
 @click.command(context_settings={"ignore_unknown_options": True})

INSTALL.rst

@@ -20,7 +20,7 @@ Building NumPy requires the following installed software:
    e.g., on Debian/Ubuntu one needs to install both `python3` and
    `python3-dev`. On Windows and macOS this is normally not an issue.
 
-2) Cython >= 0.29.30 but < 3.0
+2) Cython >= 0.29.35
 
 3) pytest__ (optional)
 

azure-pipelines.yml

@@ -220,15 +220,15 @@ stages:
             PYTHON_ARCH: 'x64'
             TEST_MODE: full
             BITS: 64
-            # NPY_USE_BLAS_ILP64: '1'
-            # TODO: failing because of an issue with ILP64 BLAS being downloaded,
-            #       and that not being handled automatically yet
-            # PyPy39-64bit-fast:
-              # PYTHON_VERSION: 'pypy3.9'
-              # PYTHON_ARCH: 'x64'
-              # TEST_MODE: fast
-              # BITS: 64
-              # NPY_USE_BLAS_ILP64: '1'
+            NPY_USE_BLAS_ILP64: '1'
+          PyPy39-64bit-fast:
+            PYTHON_VERSION: 'pypy3.9'
+            PYTHON_ARCH: 'x64'
+            TEST_MODE: fast
+            BITS: 64
+            NPY_USE_BLAS_ILP64: '1'
+            # Broken - it builds but _multiarray_umath doesn't import - needs investigating
+            DISABLE_BLAS: '1'
 
     steps:
     - template: azure-steps-windows.yml