pyomp 0.5.1__tar.gz → 0.5.2__tar.gz

{pyomp-0.5.1 → pyomp-0.5.2}/.github/workflows/build-upload-conda.yml

@@ -24,7 +24,7 @@ jobs:
       matrix:
         # TODO: Add windows.
         os: [ubuntu-latest, macos-latest, ubuntu-24.04-arm]
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.14t"]
     steps:
       - name: Determine conda label
         run: |
@@ -42,10 +42,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Create and activate conda env
-        uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167
+      - name: Setup and activate base conda env
+        uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
         with:
-          python-version: "3.12"
+          # Keep Conda and conda-build on conda-forge so its build plugin loads.
+          miniforge-version: "26.3.2-3"
+          conda-remove-defaults: true
+          activate-environment: ""
+          auto-activate: true
           auto-update-conda: false
           show-channel-urls: true
 
@@ -53,24 +57,31 @@ jobs:
         # This ensures conda env is active.
         shell: bash -l {0}
         run: |
-          # Setup the anaconda environment.
-          conda remove --name base conda-anaconda-telemetry
-          conda install -q -y -c conda-forge conda-build conda-verify anaconda-client
+          # Setup the conda-forge environment.
+          conda install -n base -q -y --override-channels -c conda-forge conda-build anaconda-client
           conda config --set anaconda_upload no
+          conda build --version
+
+          # Select the python variant; 3.14t needs the free-threaded ABI.
+          if [[ "${{ matrix.python-version }}" == "3.14t" ]]; then
+            PY_ARGS=(--python "3.14.* *_cp314t" -m buildscripts/conda-recipes/pyomp/freethreading.yaml)
+          else
+            PY_ARGS=(--python ${{ matrix.python-version }})
+          fi
 
           # Build the package.
           conda build \
             -c conda-forge \
-            --python ${{ matrix.python-version }} \
+            "${PY_ARGS[@]}" \
             buildscripts/conda-recipes/pyomp
 
           # Get the output file path.
           OUTPUT=$(conda build -c conda-forge --output \
-            --python ${{ matrix.python-version }} \
+            "${PY_ARGS[@]}" \
             buildscripts/conda-recipes/pyomp)
 
           # Upload the package.
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload \
+          conda run -n base anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload \
             --user python-for-hpc --label ${{ env.CONDA_LABEL}} \
             --force "$OUTPUT"
 

{pyomp-0.5.1 → pyomp-0.5.2}/.github/workflows/build-upload-wheels.yml

@@ -6,9 +6,20 @@ permissions:
 on:
   release:
     types: [published]
+  push:
+    branches: [main]
+    paths:
+      - "buildscripts/cibuildwheel/**"
+      - "buildscripts/modal/**"
+      - ".github/workflows/build-upload-wheels.yml"
+      - "src/**"
+      - setup.py
+      - MANIFEST.in
+      - pyproject.toml
   pull_request:
     paths:
       - "buildscripts/cibuildwheel/**"
+      - "buildscripts/modal/**"
       - ".github/workflows/build-upload-wheels.yml"
       - "src/**"
       - setup.py
@@ -73,13 +84,24 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, ubuntu-24.04-arm]
-        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
-        numba-version: ['0.62.0', '0.62.1', '0.63.0', '0.63.1']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
+        numba-version: ['0.62.0', '0.62.1', '0.63.0', '0.63.1', '0.64.0', '0.65.0', '0.65.1']
         exclude:
           - python-version: '3.14'
             numba-version: '0.62.0'
           - python-version: '3.14'
             numba-version: '0.62.1'
+          # Numba supports free-threaded Python starting with 0.65.
+          - python-version: '3.14t'
+            numba-version: '0.62.0'
+          - python-version: '3.14t'
+            numba-version: '0.62.1'
+          - python-version: '3.14t'
+            numba-version: '0.63.0'
+          - python-version: '3.14t'
+            numba-version: '0.63.1'
+          - python-version: '3.14t'
+            numba-version: '0.64.0'
 
     steps:
       - name: Download built wheels
@@ -110,9 +132,61 @@ jobs:
           OMP_TARGET_OFFLOAD=mandatory TEST_DEVICE=host RUN_TARGET=1 \
             python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget
 
+  # Test Linux wheels on a real NVIDIA GPU. Fork PRs run after merging to main,
+  # where Modal credentials are available to trusted code.
+  test-modal-gpu:
+    needs: build-wheels
+    if: >-
+      github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.full_name == github.repository
+    runs-on: ubuntu-latest
+    concurrency:
+      group: modal-gpu-${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+    env:
+      MODAL_TOKEN_ID: ${{ secrets.MODAL_TOKEN_ID }}
+      MODAL_TOKEN_SECRET: ${{ secrets.MODAL_TOKEN_SECRET }}
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
+
+      - name: Download Linux wheels
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        with:
+          pattern: cibw-wheels-ubuntu-latest-*
+          path: dist
+          merge-multiple: true
+
+      - name: Setup Python
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
+        with:
+          python-version: "3.12"
+
+      - name: Validate Modal credentials
+        shell: bash
+        run: |
+          if [[ -z "$MODAL_TOKEN_ID" || -z "$MODAL_TOKEN_SECRET" ]]; then
+            echo "::error::MODAL_TOKEN_ID and MODAL_TOKEN_SECRET must be configured"
+            exit 1
+          fi
+
+      - name: Run GPU tests on Modal
+        run: |
+          python -m pip install modal==1.5.3
+          set +e
+          timeout --signal=TERM --kill-after=30s 20m \
+            modal run --timestamps buildscripts/modal/test_gpu.py
+          modal_status=$?
+          set -e
+
+          if [[ $modal_status -eq 124 ]]; then
+            echo "::error::Modal GPU tests exceeded the 20-minute timeout"
+            exit 1
+          fi
+          exit "$modal_status"
+
   # Only on pre-release: Publish to TestPyPI for testing.
   publish-testpypi:
-    needs: [build-wheels, test-wheels, build-sdist]
+    needs: [build-wheels, test-wheels, test-modal-gpu, build-sdist]
     if: github.event.release.prerelease
     runs-on: ubuntu-latest
     environment: testpypi
@@ -133,7 +207,7 @@ jobs:
 
   # Only on full release: Publish to production PyPI.
   publish-pypi:
-    needs: [build-wheels, test-wheels, build-sdist]
+    needs: [build-wheels, test-wheels, test-modal-gpu, build-sdist]
     if: github.event_name == 'release' && !github.event.release.prerelease
     runs-on: ubuntu-latest
     environment: pypi

{pyomp-0.5.1 → pyomp-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyomp
-Version: 0.5.1
+Version: 0.5.2
 Summary: Python OpenMP library based on Numba
 Maintainer-email: Giorgis Georgakoudis <georgakoudis1@llnl.gov>
 License-Expression: BSD-2-Clause
@@ -15,7 +15,7 @@ Requires-Python: <3.15,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSE-OPENMP.txt
-Requires-Dist: numba<0.64,>=0.62
+Requires-Dist: numba<0.66,>=0.62
 Requires-Dist: lark
 Requires-Dist: cffi
 Requires-Dist: setuptools
@@ -68,10 +68,12 @@ conda install -c python-for-hpc -c conda-forge pyomp
 
 | PyOMP | Numba           |
 | ----- | --------------- |
-| 0.5.x | 0.62.x - 0.63.x |
+| 0.5.x | 0.62.x - 0.65.x |
 | 0.4.x | 0.61.x          |
 | 0.3.x | 0.57.x - 0.60.x |
 
+Python 3.14t (free-threaded) requires Numba 0.65.x.
+
 Besides a standard installation, we also provide the following options to
 quickly try out PyOMP online or through a container.
 

{pyomp-0.5.1 → pyomp-0.5.2}/README.md

@@ -45,10 +45,12 @@ conda install -c python-for-hpc -c conda-forge pyomp
 
 | PyOMP | Numba           |
 | ----- | --------------- |
-| 0.5.x | 0.62.x - 0.63.x |
+| 0.5.x | 0.62.x - 0.65.x |
 | 0.4.x | 0.61.x          |
 | 0.3.x | 0.57.x - 0.60.x |
 
+Python 3.14t (free-threaded) requires Numba 0.65.x.
+
 Besides a standard installation, we also provide the following options to
 quickly try out PyOMP online or through a container.
 

pyomp-0.5.2/buildscripts/cibuildwheel/setup-miniforge3.sh

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+MINIFORGE_VERSION="26.3.2-3"
+
+# Read LLVM_VERSION from environment and error if not set
+if [ -z "${LLVM_VERSION:-}" ]; then
+    echo "Error: LLVM_VERSION environment variable is not set." >&2
+    exit 1
+fi
+
+if [ "$(uname)" = "Darwin" ]; then
+    OS_NAME="MacOSX"
+else
+    OS_NAME="Linux"
+fi
+ARCH_NAME="$(uname -m)"
+
+case "${OS_NAME}-${ARCH_NAME}" in
+    Linux-x86_64)
+        MINIFORGE_SHA256="848194851a98903134187fbb4ab50efe87b003e0c0f808f97644b7524a62bf2c"
+        ;;
+    Linux-aarch64)
+        MINIFORGE_SHA256="2c113a69297e612b01ca0f320c22a3107a11f2ab9b573d79ac868a175945ce29"
+        ;;
+    Linux-ppc64le)
+        MINIFORGE_SHA256="df7e80ee070ccc6031e2710eb4cf81ee0012264b587306b5aa3890d3d89edd97"
+        ;;
+    MacOSX-x86_64)
+        MINIFORGE_SHA256="39273e4c89a0a1af4538010615d44ae8f44e1af41007e02def593d20f316b003"
+        ;;
+    MacOSX-arm64)
+        MINIFORGE_SHA256="59168f1e24d0a4ad9932021170809fca836cd240e183eeeb331d5bcfc0098168"
+        ;;
+    *)
+        echo "Unsupported Miniforge platform: ${OS_NAME}-${ARCH_NAME}" >&2
+        exit 1
+        ;;
+esac
+
+echo "Installing Miniforge..."
+MINIFORGE_INSTALLER="Miniforge3-${MINIFORGE_VERSION}-${OS_NAME}-${ARCH_NAME}.sh"
+MINIFORGE_RELEASE_URL="https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERSION}"
+MINIFORGE_URL="${MINIFORGE_RELEASE_URL}/${MINIFORGE_INSTALLER}"
+mkdir -p _downloads
+curl -fsSL "${MINIFORGE_URL}" -o _downloads/miniforge3.sh
+if command -v sha256sum >/dev/null 2>&1; then
+    printf '%s  %s\n' "${MINIFORGE_SHA256}" _downloads/miniforge3.sh | sha256sum --check -
+elif command -v shasum >/dev/null 2>&1; then
+    printf '%s  %s\n' "${MINIFORGE_SHA256}" _downloads/miniforge3.sh | shasum -a 256 --check -
+else
+    echo "No SHA256 verification command is available" >&2
+    exit 1
+fi
+mkdir -p _stage
+bash _downloads/miniforge3.sh -b -f -p "_stage/miniforge3"
+echo "Miniforge installed"
+source "_stage/miniforge3/bin/activate" base
+
+# Create conda environment with tools and libraries for the LLVM_VERSION.
+echo "Installing llvmdev ${LLVM_VERSION}..."
+conda create -n llvmdev-${LLVM_VERSION} --override-channels -c conda-forge -q -y clang=${LLVM_VERSION} clangxx=${LLVM_VERSION} clang-tools=${LLVM_VERSION} llvmdev=${LLVM_VERSION} zstd

{pyomp-0.5.1 → pyomp-0.5.2}/buildscripts/conda-recipes/pyomp/conda_build_config.yaml

@@ -1,3 +1,8 @@
+# --- Free-threading ---
+# Default for the is_freethreading selector in meta.yaml; override for 3.14t.
+is_freethreading:
+  - false
+
 # --- Compilers ---
 c_compiler_version:
   - 9                       # [linux]

pyomp-0.5.2/buildscripts/conda-recipes/pyomp/freethreading.yaml

@@ -0,0 +1,4 @@
+# Variant for free-threaded Python (3.14t) builds, passed with -m. Use this
+# instead of --variants, which `conda build --output` ignores.
+is_freethreading:
+  - true

{pyomp-0.5.1 → pyomp-0.5.2}/buildscripts/conda-recipes/pyomp/meta.yaml

@@ -45,22 +45,26 @@ requirements:
     - sysroot_linux-aarch64  # [aarch64]
     - setuptools
     - setuptools_scm
-    - numba >=0.62, <0.64
+    - numba >=0.62, <0.66
+    - numba >=0.65, <0.66  # [is_freethreading]
     - clang {{ LLVM_VERSION }}
     - clangxx {{ LLVM_VERSION }}
     - clang-tools {{ LLVM_VERSION }}
     - llvmdev {{ LLVM_VERSION }}
     - zlib
     # require llvm-openmp for the openmp cpu runtime.
-    - llvm-openmp {{ LLVM_VERSION }}
+    - llvm-openmp 21.1.8.* # [osx]
+    - llvm-openmp {{ LLVM_VERSION }} # [not osx]
     - elfutils # [linux]
     - libffi # [linux]
   run:
     - python
     - setuptools
-    - numba >=0.62, <0.64
+    - numba >=0.62, <0.66
+    - numba >=0.65, <0.66  # [is_freethreading]
     # require llvm-openmp for the openmp cpu runtime.
-    - llvm-openmp {{ LLVM_VERSION }}
+    - llvm-openmp 21.1.8.* # [osx]
+    - llvm-openmp {{ LLVM_VERSION }} # [not osx]
     - lark
     - cffi
 

pyomp-0.5.2/buildscripts/modal/test_gpu.py

@@ -0,0 +1,151 @@
+from __future__ import annotations
+
+import os
+from pathlib import Path
+import subprocess
+
+import modal
+
+
+PYTHON_VERSIONS = ("3.10", "3.11", "3.12", "3.13", "3.14")
+NUMBA_VERSION = "0.65.1"
+MINIFORGE_VERSION = "26.3.2-3"
+MINIFORGE_SHA256 = "848194851a98903134187fbb4ab50efe87b003e0c0f808f97644b7524a62bf2c"
+WHEEL_DIRECTORY = (
+    Path(__file__).resolve().parents[2] / "dist"
+    if modal.is_local()
+    else Path("/wheels")
+)
+MINIFORGE_PREFIX = "/opt/miniforge3"
+
+
+def find_linux_wheels() -> dict[str, Path]:
+    if not WHEEL_DIRECTORY.is_dir():
+        raise RuntimeError(f"Linux wheel directory does not exist: {WHEEL_DIRECTORY}")
+
+    wheels = {}
+    for python_version in PYTHON_VERSIONS:
+        abi = python_version.replace(".", "")
+        # Match the ABI tag too, so cp314 does not also match cp314t wheels.
+        matches = sorted(WHEEL_DIRECTORY.glob(f"*-cp{abi}-cp{abi}-*x86_64.whl"))
+        if len(matches) != 1:
+            raise RuntimeError(
+                f"Expected one cp{abi} Linux x86-64 wheel in {WHEEL_DIRECTORY}, "
+                f"found {len(matches)}: {matches}"
+            )
+        wheels[python_version] = matches[0]
+    return wheels
+
+
+LINUX_WHEELS = find_linux_wheels()
+
+
+def image_build_commands() -> tuple[list[str], list[str]]:
+    environment_commands = []
+    wheel_commands = []
+    for python_version, wheel in LINUX_WHEELS.items():
+        environment = f"py{python_version.replace('.', '')}"
+        python = f"{MINIFORGE_PREFIX}/envs/{environment}/bin/python"
+        environment_commands.extend(
+            [
+                (
+                    f"{MINIFORGE_PREFIX}/bin/conda create -q -y "
+                    f"--override-channels -c conda-forge -n {environment} "
+                    f"python={python_version} pip"
+                ),
+                (
+                    f"{python} -m pip install "
+                    f"numba=={NUMBA_VERSION} lark cffi setuptools"
+                ),
+                (
+                    f'{python} -c "import numba; '
+                    f"assert numba.__version__ == '{NUMBA_VERSION}'\""
+                ),
+            ]
+        )
+        wheel_commands.append(
+            f"{python} -m pip install --no-deps /wheels/{wheel.name}"
+        )
+    return environment_commands, wheel_commands
+
+
+ENVIRONMENT_COMMANDS, WHEEL_COMMANDS = image_build_commands()
+
+
+image = (
+    modal.Image.from_registry(
+        "nvidia/cuda:12.8.1-devel-ubuntu22.04", add_python="3.12"
+    )
+    .entrypoint([])
+    .apt_install("ca-certificates", "curl")
+    .run_commands(
+        f"curl -fsSL https://github.com/conda-forge/miniforge/releases/download/"
+        f"{MINIFORGE_VERSION}/Miniforge3-{MINIFORGE_VERSION}-Linux-x86_64.sh "
+        "-o /tmp/miniforge3.sh",
+        f"printf '%s  %s\\n' {MINIFORGE_SHA256} /tmp/miniforge3.sh "
+        "| sha256sum --check -",
+        f"bash /tmp/miniforge3.sh -b -p {MINIFORGE_PREFIX}",
+    )
+    .run_commands(*ENVIRONMENT_COMMANDS)
+    .add_local_dir(WHEEL_DIRECTORY, "/wheels", copy=True)
+    .run_commands(*WHEEL_COMMANDS)
+)
+
+app = modal.App("pyomp-gpu-ci")
+
+
+@app.function(
+    image=image,
+    gpu="T4",
+    timeout=60 * 60,
+    restrict_modal_access=True,
+    single_use_containers=True,
+    block_network=True,
+)
+def test_gpu_wheels() -> None:
+    subprocess.run(["nvidia-smi", "--list-gpus"], check=True)
+
+    test_environment = os.environ.copy()
+    test_environment.update(
+        {
+            "NUMBA_DEVELOPER_MODE": "1",
+            "NUMBA_DISABLE_ERROR_MESSAGE_HIGHLIGHTING": "1",
+            "NUMBA_CAPTURED_ERRORS": "new_style",
+            "PYTHONFAULTHANDLER": "1",
+            "OMP_TARGET_OFFLOAD": "mandatory",
+            "TEST_DEVICE": "gpu",
+            "RUN_TARGET": "1",
+        }
+    )
+
+    for python_version in PYTHON_VERSIONS:
+        environment = f"py{python_version.replace('.', '')}"
+        python = f"{MINIFORGE_PREFIX}/envs/{environment}/bin/python"
+        print(f"Running GPU tests with Python {python_version} and Numba {NUMBA_VERSION}")
+        subprocess.run(
+            [
+                python,
+                "-c",
+                "from numba.openmp import print_offloading_info; "
+                "print_offloading_info()",
+            ],
+            check=True,
+            env=test_environment,
+        )
+        subprocess.run(
+            [
+                python,
+                "-m",
+                "numba.runtests",
+                "-v",
+                "--",
+                "numba.openmp.tests.test_openmp.TestOpenmpTarget",
+            ],
+            check=True,
+            env=test_environment,
+        )
+
+
+@app.local_entrypoint()
+def main() -> None:
+    test_gpu_wheels.remote()

{pyomp-0.5.1 → pyomp-0.5.2}/docs/source/installation.rst

@@ -24,13 +24,15 @@ supported.
 +--------+---------------------+
 | PyOMP  | Numba               |
 +========+=====================+
-| 0.5.x  | 0.62.x - 0.63.x     |
+| 0.5.x  | 0.62.x - 0.65.x     |
 +--------+---------------------+
 | 0.4.x  | 0.61.x              |
 +--------+---------------------+
 | 0.3.x  | 0.57.x - 0.60.x     |
 +--------+---------------------+
 
+Python 3.14t (free-threaded) requires Numba 0.65.x.
+
 Additional options
 ------------------
 

{pyomp-0.5.1 → pyomp-0.5.2}/pyproject.toml

@@ -17,7 +17,7 @@ classifiers = [
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Compilers",
 ]
-dependencies = ["numba>=0.62, <0.64", "lark", "cffi", "setuptools"]
+dependencies = ["numba>=0.62, <0.66", "lark", "cffi", "setuptools"]
 maintainers = [
     { name = "Giorgis Georgakoudis", email = "georgakoudis1@llnl.gov" },
 ]
@@ -42,8 +42,7 @@ archs = ["native"]
 environment-pass = ["LLVM_VERSION"]
 # We use miniconda3 to get the clang/llvm toolchain on Linux.
 before-build = ["rm -rf build dist src/*.egg-info"]
-# Skip building 3.14t wheels as they are not supported by the current numba/llvmlite version.
-skip = ["*-musllinux_*", "cp38-*", "cp314t-*"]
+skip = ["*-musllinux_*", "cp38-*"]
 test-command = [
     # Run host OpenMP tests.
     "RUN_TARGET=0 python -m numba.runtests -v -- numba.openmp.tests.test_openmp",
@@ -68,15 +67,15 @@ CC = "/usr/bin/clang"
 CXX = "/usr/bin/clang++"
 
 [tool.cibuildwheel.macos]
-before-all = ["bash buildscripts/cibuildwheel/setup-miniconda3.sh"]
+before-all = ["bash buildscripts/cibuildwheel/setup-miniforge3.sh"]
 
 [tool.cibuildwheel.macos.environment]
 ENABLE_BUNDLED_LIBOMP = "1"
-LLVM_DIR = "${PWD}/_stage/miniconda3/envs/llvmdev-${LLVM_VERSION}/lib/cmake/llvm"
-CC = "${PWD}/_stage/miniconda3/envs/llvmdev-${LLVM_VERSION}/bin/clang"
-CXX = "${PWD}/_stage/miniconda3/envs/llvmdev-${LLVM_VERSION}/bin/clang++"
+LLVM_DIR = "${PWD}/_stage/miniforge3/envs/llvmdev-${LLVM_VERSION}/lib/cmake/llvm"
+CC = "${PWD}/_stage/miniforge3/envs/llvmdev-${LLVM_VERSION}/bin/clang"
+CXX = "${PWD}/_stage/miniforge3/envs/llvmdev-${LLVM_VERSION}/bin/clang++"
 # Set the deplioyment target to macOS 11.0.
 MACOSX_DEPLOYMENT_TARGET = "11.0"
 # Set the cmake prefix path to find libraries in the conda environment which is
 # compatible with the macos target.
-CMAKE_PREFIX_PATH = "${PWD}/_stage/miniconda3/envs/llvmdev-${LLVM_VERSION}/"
+CMAKE_PREFIX_PATH = "${PWD}/_stage/miniforge3/envs/llvmdev-${LLVM_VERSION}/"

{pyomp-0.5.1 → pyomp-0.5.2}/src/numba/openmp/__init__.py

@@ -1,5 +1,17 @@
 import llvmlite.binding as ll
 import sys
+import sysconfig
+
+import numba
+
+# Numba supports free-threaded Python starting with 0.65.
+if sysconfig.get_config_var("Py_GIL_DISABLED") and tuple(
+    int(x) for x in numba.__version__.split(".")[:2]
+) < (0, 65):
+    raise ImportError(
+        f"PyOMP on free-threaded Python requires numba>=0.65, found {numba.__version__}"
+    )
+
 from ._version import version as __version__  # noqa: F401
 
 from .config import (

pyomp-0.5.2/src/numba/openmp/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.5.2'
+__version_tuple__ = version_tuple = (0, 5, 2)
+
+__commit_id__ = commit_id = 'g473dcf5af'

{pyomp-0.5.1 → pyomp-0.5.2}/src/numba/openmp/omp_grammar.py

@@ -54,12 +54,41 @@ openmp_grammar = r"""
                     | ordered_construct
     for_simd_construct: for_simd_directive
     for_simd_directive: FOR SIMD [for_simd_clause*]
-    for_simd_clause: for_clause
-                   | simd_clause
+    // LALR: avoid ambiguity from overlapping expansions in for_clause vs simd_clause
+    for_simd_clause: ORDERED
+                   | schedule_clause
+                   | collapse_clause
+                   | private_clause
+                   | copyprivate_clause
+                   | firstprivate_clause
+                   | lastprivate_clause
+                   | data_sharing_clause
+                   | data_default_clause
+                   | copyin_clause
+                   | reduction_clause
+                   | NOWAIT
+                   | aligned_clause
+                   | linear_clause
+                   | uniform_clause
+                   | inbranch_clause
     parallel_for_simd_construct: parallel_for_simd_directive
     parallel_for_simd_directive: PARALLEL FOR SIMD [parallel_for_simd_clause*]
-    parallel_for_simd_clause: parallel_for_clause
-                            | simd_clause
+    // LALR: avoid ambiguity from overlapping expansions in parallel_for_clause vs simd_clause
+    parallel_for_simd_clause: if_clause
+                            | num_threads_clause
+                            | ORDERED
+                            | schedule_clause
+                            | collapse_clause
+                            | data_default_clause
+                            | private_clause
+                            | firstprivate_clause
+                            | lastprivate_clause
+                            | data_sharing_clause
+                            | reduction_clause
+                            | aligned_clause
+                            | linear_clause
+                            | uniform_clause
+                            | inbranch_clause
     distribute_construct: distribute_directive
     distribute_simd_construct: distribute_simd_directive
     distribute_directive: DISTRIBUTE [distribute_clause*]
@@ -509,10 +538,9 @@ openmp_grammar = r"""
                         | device_clause
                         | if_clause
     motion_clause: update_motion_type "(" variable_array_section_list ")"
-    variable_array_section_list: PYTHON_NAME
+    // LALR: name_slice already covers bare PYTHON_NAME, so avoid the ambiguous PYTHON_NAME alternatives.
+    variable_array_section_list: name_slice
                            //    | array_section
-                               | name_slice
-                               | variable_array_section_list "," PYTHON_NAME
                                | variable_array_section_list "," name_slice
                            //    | variable_array_section_list "," array_section
     //array_section: PYTHON_NAME array_section_subscript
@@ -690,7 +718,3 @@ openmp_grammar = r"""
     %import common.WS
     %ignore WS
     """
-
-"""
-    name_slice: PYTHON_NAME [ "[" slice ["," slice]* "]" ]
-"""

{pyomp-0.5.1 → pyomp-0.5.2}/src/numba/openmp/omp_lower.py

@@ -2867,6 +2867,15 @@ class OpenmpVisitor(Transformer):
         else:
             return NameSlice(args[0], args[1:])
 
+    def variable_array_section_list(self, args):
+        if DEBUG_OPENMP >= 1:
+            print("visit variable_array_section_list", args, type(args))
+        if len(args) == 1:
+            return args
+        else:
+            args[0].append(args[1])
+            return args[0]
+
     def var_list(self, args):
         if DEBUG_OPENMP >= 1:
             print("visit var_list", args, type(args))