pyomp 0.3.2__tar.gz → 0.5.0__tar.gz

{pyomp-0.3.2 → pyomp-0.5.0}/.github/workflows/build-containers.yml

@@ -8,20 +8,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push pyomp container
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         with:
           platforms: linux/amd64,linux/arm64
           file: buildscripts/containers/Dockerfile

{pyomp-0.3.2 → pyomp-0.5.0}/.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.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Determine conda label
         run: |
@@ -36,16 +36,16 @@ jobs:
             echo "CONDA_LABEL=main" >> $GITHUB_ENV
           fi
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
         # Checkout the repo with history to get the commit hash for the build
         # string.
         with:
           fetch-depth: 0
 
       - name: Create and activate conda env
-        uses: conda-incubator/setup-miniconda@v3
+        uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167
         with:
-          python-version: "3.10"
+          python-version: "3.12"
           auto-update-conda: false
           show-channel-urls: true
 

{pyomp-0.3.2 → pyomp-0.5.0}/.github/workflows/build-upload-wheels.yml

@@ -1,5 +1,8 @@
 name: pypi
 
+permissions:
+  contents: read
+
 on:
   release:
     types: [published]
@@ -22,22 +25,26 @@ jobs:
         # TODO: Add windows.
         os: [ubuntu-latest, macos-latest, ubuntu-24.04-arm]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
         # Checkout the repo with history to get the commit hash for the build
         # string.
         with:
           fetch-depth: 0
 
        # Used to host cibuildwheel.
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==3.1.4
+        run: python -m pip install cibuildwheel==3.3.1
 
-      - name: Build wheels
+      - name: Build wheels {{ matrix.os }}
+        # Set LLVM_VERSION for the host to forward to the cibuildwheel
+        # environment.
+        env:
+          LLVM_VERSION: "20.1.8"
         run: python -m cibuildwheel --output-dir wheelhouse
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
@@ -45,14 +52,16 @@ jobs:
   build-sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
         with:
           fetch-depth: 0
 
       - name: Build sdist
+        env:
+          LLVM_VERSION: "20.1.8"
         run: pipx run build --sdist
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: cibw-sdist
           path: dist/*.tar.gz
@@ -64,31 +73,24 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, ubuntu-24.04-arm]
-        python-version: ['3.9', '3.10', '3.11', '3.12']
-        numba-version: ['0.57.0', '0.57.1', '0.58.0', '0.58.1', '0.59.0', '0.59.1', '0.60.0']
+        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']
         exclude:
-        # Known incompatibilities based on numba's official support
-        # Numba 0.57 supports Python 3.8-3.11
-        - python-version: '3.12'
-          numba-version: '0.57.0'
-        - python-version: '3.12'
-          numba-version: '0.57.1'
-
-        # Numba 0.58 supports Python 3.8-3.11
-        - python-version: '3.12'
-          numba-version: '0.58.0'
-        - python-version: '3.12'
-          numba-version: '0.58.1'
+          - python-version: '3.14'
+            numba-version: '0.62.0'
+          - python-version: '3.14'
+            numba-version: '0.62.1'
+
     steps:
       - name: Download built wheels
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
         with:
           pattern: cibw-*
           path: dist
           merge-multiple: true
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -117,14 +119,14 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
         with:
           pattern: cibw-*
           path: dist
           merge-multiple: true
 
       - name: Publish testpypi
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
         with:
           repository-url: https://test.pypi.org/legacy/
           verbose: true
@@ -138,13 +140,13 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
         with:
           pattern: cibw-*
           path: dist
           merge-multiple: true
 
       - name: Publish pypi
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
         with:
           verbose: true

{pyomp-0.3.2 → pyomp-0.5.0}/.gitignore

@@ -3,6 +3,7 @@
 docs/build*
 *.egg-info
 .vscode
+.cache
 __pycache__
 *.a
 *.so

{pyomp-0.3.2 → pyomp-0.5.0}/.gitlab/jobs/tioga.yml

@@ -52,10 +52,11 @@ variables:
   parallel:
     matrix:
       - PYOMP_CI_PYTHON_VERSION:
-        - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"
+        - "3.13"
+        - "3.14"
 
 build-and-test-tioga:
   extends: [.base-job, .python-variants]

pyomp-0.5.0/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include src/numba/openmp/libs *.py *.so *.a *.bc

{pyomp-0.3.2 → pyomp-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyomp
-Version: 0.3.2
+Version: 0.5.0
 Summary: Python OpenMP library based on Numba
 Maintainer-email: Giorgis Georgakoudis <georgakoudis1@llnl.gov>
 License-Expression: BSD-2-Clause
@@ -11,11 +11,11 @@ Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Compilers
-Requires-Python: <3.13,>=3.8
+Requires-Python: <3.15,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSE-OPENMP.txt
-Requires-Dist: numba<0.61,>=0.57
+Requires-Dist: numba<0.64,>=0.62
 Requires-Dist: lark
 Requires-Dist: cffi
 Requires-Dist: setuptools
@@ -36,14 +36,17 @@ compiler based on LLVM, which is competitive with equivalent C/C++ implementatio
 
 PyOMP is developed and distributed as an *extension* to Numba, so it uses
 Numba as a dependency.
-It is currently tested with Numba versions 0.57.x, 0.58.x, 0.59.x, 0.60.x on the
-following architecture and operating system combinations: linux-64 (x86_64),
-osx-arm64 (mac), linux-arm64, and linux-ppc64le.
+It is currently tested with several Numba versions on the following
+architecture and operating system combinations: linux-64 (x86_64), osx-arm64
+(mac), and linux-arm64.
+The [compatibility matrix](#compatibility-matrix) with Numba versions records
+the possible combinations.
+
 Installation is possible through `pip` or `conda`, detailed in the next section.
 
 As PyOMP builds on top of the LLVM OpenMP infrastructure, it also inherits its
 limitations: GPU support is only available on Linux.
-Also, PyOMP currently supports only NVIDIA GPUs with AMD GPU support planned for.
+Also, PyOMP currently supports only NVIDIA GPUs with AMD GPU support in development.
 
 ## Installation
 
@@ -61,6 +64,14 @@ PyOMP is also distributed through Conda, installable using the following command
 conda install -c python-for-hpc -c conda-forge pyomp
 ```
 
+### Compatibility matrix
+
+| PyOMP | Numba           |
+| ----- | --------------- |
+| 0.5.x | 0.62.x - 0.63.x |
+| 0.4.x | 0.61.x          |
+| 0.3.x | 0.57.x - 0.60.x |
+
 Besides a standard installation, we also provide the following options to
 quickly try out PyOMP online or through a container.
 

{pyomp-0.3.2 → pyomp-0.5.0}/README.md

@@ -13,14 +13,17 @@ compiler based on LLVM, which is competitive with equivalent C/C++ implementatio
 
 PyOMP is developed and distributed as an *extension* to Numba, so it uses
 Numba as a dependency.
-It is currently tested with Numba versions 0.57.x, 0.58.x, 0.59.x, 0.60.x on the
-following architecture and operating system combinations: linux-64 (x86_64),
-osx-arm64 (mac), linux-arm64, and linux-ppc64le.
+It is currently tested with several Numba versions on the following
+architecture and operating system combinations: linux-64 (x86_64), osx-arm64
+(mac), and linux-arm64.
+The [compatibility matrix](#compatibility-matrix) with Numba versions records
+the possible combinations.
+
 Installation is possible through `pip` or `conda`, detailed in the next section.
 
 As PyOMP builds on top of the LLVM OpenMP infrastructure, it also inherits its
 limitations: GPU support is only available on Linux.
-Also, PyOMP currently supports only NVIDIA GPUs with AMD GPU support planned for.
+Also, PyOMP currently supports only NVIDIA GPUs with AMD GPU support in development.
 
 ## Installation
 
@@ -38,6 +41,14 @@ PyOMP is also distributed through Conda, installable using the following command
 conda install -c python-for-hpc -c conda-forge pyomp
 ```
 
+### Compatibility matrix
+
+| PyOMP | Numba           |
+| ----- | --------------- |
+| 0.5.x | 0.62.x - 0.63.x |
+| 0.4.x | 0.61.x          |
+| 0.3.x | 0.57.x - 0.60.x |
+
 Besides a standard installation, we also provide the following options to
 quickly try out PyOMP online or through a container.
 

{pyomp-0.3.2 → pyomp-0.5.0}/buildscripts/cibuildwheel/setup-miniconda3.sh

@@ -2,6 +2,12 @@
 
 set -euxo pipefail
 
+# 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
@@ -17,10 +23,6 @@ echo "Miniconda installed"
 source "_stage/miniconda3/bin/activate" base
 export CONDA_PLUGINS_AUTO_ACCEPT_TOS=true
 
-# Create llvmdev environment and install llvmdev 14.0.6.
-echo "Installing manylinux llvmdev 14.0.6..."
-conda create -n llvmdev -c conda-forge -y llvmdev=14.0.6
-
-# Create clang14 environment and install clang 14.0.6.
-echo "Installing clang 14.0.6..."
-conda create -n clang14 -c conda-forge -y clang=14.0.6
+# Create conda environment with tools and libraries for the LLVM_VERSION.
+echo "Installing llvmdev ${LLVM_VERSION}..."
+conda create -n llvmdev-${LLVM_VERSION} -c conda-forge -q -y clang=${LLVM_VERSION} clangxx=${LLVM_VERSION} clang-tools=${LLVM_VERSION} llvmdev=${LLVM_VERSION} zstd

pyomp-0.5.0/buildscripts/conda-recipes/pyomp/conda_build_config.yaml

@@ -0,0 +1,34 @@
+# --- Compilers ---
+c_compiler_version:
+  - 9                       # [linux]
+  - 14                      # [osx]
+
+cxx_compiler_version:
+  - 9                       # [linux]
+  - 14                      # [osx]
+
+fortran_compiler_version:
+  - 9                       # [linux]
+
+cxx_compiler:        # [osx]
+  - clang_bootstrap  # [osx]
+
+c_compiler:          # [osx]
+  - clang_bootstrap  # [osx]
+
+# Sysroots for compatibility on Linux builds.
+sysroot_linux_64:
+  - 2.17             # [linux64]
+
+sysroot_linux_aarch64:
+  - 2.17             # [aarch64]
+
+# --- MACOS DEPLOYMENT TARGET ---
+# Sets minimum OS version to Big Sur (11.0) for Mac builds.
+MACOSX_DEPLOYMENT_TARGET:
+  - 11.0             # [osx]
+
+# --- MACOS SDK ---
+# We use a newer SDK (e.g. 11.3) to build, even if targeting 11.0
+MACOSX_SDK_VERSION:
+  - 11.3             # [osx]

pyomp-0.5.0/buildscripts/conda-recipes/pyomp/meta.yaml

@@ -0,0 +1,77 @@
+{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0').lstrip('v') %}
+{% set LLVM_VERSION = environ.get('LLVM_VERSION', '20.1.8') %}
+
+package:
+  name: pyomp
+  version: {{ version }}
+
+source:
+   path: ../../..
+
+build:
+  string: py{{ PY_VER }}h{{ PKG_HASH }}_{{GIT_DESCRIBE_HASH}}_{{ GIT_DESCRIBE_NUMBER }}
+  script_env:
+    - PY_VCRUNTIME_REDIST # [win]
+  script:
+    - export LLVM_VERSION={{ LLVM_VERSION }}
+    - export LLVM_DIR=${PREFIX}
+    - export CC=${PREFIX}/bin/clang
+    - export CXX=${PREFIX}/bin/clang++
+    - export VERBOSE=1
+    - export CPPFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -isystem ${PREFIX}/include -D_FORTIFY_SOURCE=2" # [osx]
+    - export ENABLE_BUNDLED_LIBOMPTARGET=1 # [linux]
+    - rm -rf build dist src/*.egg-info
+    - {{ PYTHON }} -m pip install -v .
+
+requirements:
+  build:
+    - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
+    # Add sysroot to ensure compatibility on linux builds.
+    - sysroot_linux-64       # [linux64]
+    - sysroot_linux-aarch64  # [aarch64]
+    - cmake
+    - ninja
+    - setuptools_scm
+    - elfutils # [linux]
+    - libffi # [linux]
+  host:
+    - python
+    - pip
+    # Add sysroot to ensure compatibility on linux builds.
+    - sysroot_linux-64       # [linux64]
+    - sysroot_linux-aarch64  # [aarch64]
+    - setuptools
+    - setuptools_scm
+    - numba >=0.62, <0.64
+    - 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 }}
+    - elfutils # [linux]
+    - libffi # [linux]
+  run:
+    - python
+    - setuptools
+    - numba >=0.62, <0.64
+    # require llvm-openmp for the openmp cpu runtime.
+    - llvm-openmp {{ LLVM_VERSION }}
+    - lark
+    - cffi
+
+test:
+  commands:
+    - test -f $SP_DIR/numba/openmp/libs/pass/libIntrinsicsOpenMP.dylib                 # [osx]
+    - test -f $SP_DIR/numba/openmp/libs/pass/libIntrinsicsOpenMP.so                    # [linux]
+    - test -f $SP_DIR/numba/openmp/libs/openmp/lib/libomptarget-amdgpu.bc        # [linux]
+    - test -f $SP_DIR/numba/openmp/libs/openmp/lib/libomptarget-nvptx.bc         # [linux]
+    - test -f $SP_DIR/numba/openmp/libs/openmp/lib/libomptarget.so               # [linux]
+
+about:
+  home: https://github.com/Python-for-HPC/PyOMP
+  license: BSD-2-Clause
+  license_file: LICENSE
+  summary: "PyOMP: OpenMP for portable CPU/GPU parallel programming in Python using Numba."

{pyomp-0.3.2 → pyomp-0.5.0}/buildscripts/conda-recipes/pyomp/run_test.sh

@@ -54,8 +54,13 @@ TEST_DEVICES=0 RUN_TARGET=0 $SEGVCATCH python -m numba.runtests -v -- numba.open
 echo "=> Run OpenMP offloading tests on CPU (device 1)"
 echo "=> Running: TEST_DEVICES=1 RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget"
 OMP_TARGET_OFFLOAD=mandatory TEST_DEVICES=1 RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget 2>&1
-if nvidia-smi --list-gpus; then
-  echo "=> Found NVIDIA GPU, Run OpenMP offloading tests on GPU (device 0)"
-  echo "=> Running: TEST_DEVICES=0 RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget"
-  OMP_TARGET_OFFLOAD=mandatory TEST_DEVICES=0 RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget 2>&1
+# Check if NVIDIA GPU is present.
+if command -v nvidia-smi >/dev/null 2>&1; then
+  # `nvidia-smi --list-gpus` exits non-zero when no GPUs are present; run
+  # it in a conditional so `set -e` does not cause the script to exit.
+  if nvidia-smi --list-gpus >/dev/null 2>&1; then
+    echo "=> Found NVIDIA GPU, Run OpenMP offloading tests on GPU (device 0)"
+    echo "=> Running: TEST_DEVICES=0 RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget"
+    OMP_TARGET_OFFLOAD=mandatory TEST_DEVICES=0 RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget 2>&1
+  fi
 fi

{pyomp-0.3.2 → pyomp-0.5.0}/buildscripts/gitlab/build-and-test.sh

@@ -4,24 +4,32 @@ set -e
 
 # Create a unique temporary directory for this job.
 TMPDIR=/tmp/pyomp/${CI_JOB_ID}
+rm -rf ${TMPDIR}
 mkdir -p ${TMPDIR}
 pushd ${TMPDIR}
 
+# Set the LLVM_VERSION to use.
+export LLVM_VERSION="20.1.8"
+
 # Set the envs directory under the temporary directory.
 export CONDA_ENVS_DIRS="${TMPDIR}/_stage/miniconda3/envs"
 
-# Install miniconda and llvmdev, clang14 environments.
+# Install miniconda and llvmdev environment.
 source ${CI_PROJECT_DIR}/buildscripts/cibuildwheel/setup-miniconda3.sh
 
 # Export environment variables for building and testing.
-export LLVM_DIR="${CONDA_ENVS_DIRS}/llvmdev"
-export CLANG_TOOL="${CONDA_ENVS_DIRS}/clang14/bin/clang"
+export ENABLE_BUNDLED_LIBOMP="1"
+export ENABLE_BUNDLED_LIBOMPTARGET="1"
+export LLVM_DIR="${CONDA_ENVS_DIRS}/llvmdev-${LLVM_VERSION}"
+export CMAKE_PREFIX_PATH="${CONDA_PREFIX}"
 export USE_CXX11_ABI="1"
 export PIP_NO_INPUT="1"
 
 # Create and activate a conda environment with the desired Python version.
 conda create -n py-${PYOMP_CI_PYTHON_VERSION} -c conda-forge -y python=${PYOMP_CI_PYTHON_VERSION}
 conda activate py-${PYOMP_CI_PYTHON_VERSION}
+# Add extra packages needed to build openmp libraries.
+conda install -c conda-forge -y zstd libffi
 
 # Clone and fetch the commit with history for package versioning.
 git clone https://github.com/${GITHUB_PROJECT_ORG}/${GITHUB_PROJECT_NAME}.git --single-branch
@@ -30,7 +38,7 @@ git fetch origin ${CI_COMMIT_SHA}
 git checkout ${CI_COMMIT_SHA}
 
 # Install pyomp.
-CC=gcc CXX=g++ python -m pip install -v .
+CC=clang CXX=clang++ python -m pip install -v .
 
 # Run host OpenMP tests.
 TEST_DEVICES=0 RUN_TARGET=0 python -m numba.runtests -v -- numba.openmp.tests.test_openmp

{pyomp-0.3.2 → pyomp-0.5.0}/examples/hello-target.py

@@ -2,9 +2,11 @@ from numba.openmp import njit
 from numba.openmp import openmp_context as openmp
 from numba.openmp import omp_get_num_threads, omp_get_thread_num
 
+
 @njit
 def hello():
-    with openmp("target device(1)"):
-        print("hello thread", omp_get_thread_num(),"of", omp_get_num_threads())
+    with openmp("target device(0)"):
+        print("hello thread", omp_get_thread_num(), "of", omp_get_num_threads())
+
 
 hello()

{pyomp-0.3.2 → pyomp-0.5.0}/examples/ploop.1.py

@@ -1,13 +1,14 @@
-import numba
+from numba.openmp import njit
 from numba.openmp import openmp_context as openmp
-from numba.openmp import omp_set_num_threads, omp_get_thread_num, omp_get_num_threads, omp_get_wtime
 import numpy as np
 
-@numba.njit
+
+@njit
 def simple(n, a, b):
     with openmp("parallel for"):
         for i in range(1, n):
-            b[i] = (a[i] + a[i-1]) / 2.0
+            b[i] = (a[i] + a[i - 1]) / 2.0
+
 
 a = np.ones(100)
 b = np.empty(len(a))

{pyomp-0.3.2 → pyomp-0.5.0}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=75.3", "wheel", "setuptools-scm>=8", "cmake>=3.20"]
+requires = ["setuptools>=75.3", "setuptools-scm>=8", "cmake>=3.20", "ninja"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -7,7 +7,7 @@ name = "pyomp"
 dynamic = ["version"]
 description = "Python OpenMP library based on Numba"
 readme = "README.md"
-requires-python = ">=3.8, <3.13"
+requires-python = ">=3.10, <3.15"
 license = "BSD-2-Clause"
 license-files = ["LICENSE", "LICENSE-OPENMP.txt"]
 classifiers = [
@@ -17,7 +17,7 @@ classifiers = [
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Compilers",
 ]
-dependencies = ["numba>=0.57, <0.61", "lark", "cffi", "setuptools"]
+dependencies = ["numba>=0.62, <0.64", "lark", "cffi", "setuptools"]
 maintainers = [
     { name = "Giorgis Georgakoudis", email = "georgakoudis1@llnl.gov" },
 ]
@@ -37,7 +37,7 @@ include = ["numba.openmp*"]
 
 # Bundle the CMake-installed artifacts into the wheel.
 [tool.setuptools.package-data]
-"numba.openmp.libs" = ["pass/*", "libomp/**/*"]
+"numba.openmp.libs" = ["pass/*", "openmp/**/*"]
 
 # setuptools-scm config
 [tool.setuptools_scm]
@@ -46,8 +46,9 @@ local_scheme = "no-local-version"
 
 [tool.cibuildwheel]
 archs = ["native"]
+# Pass LLVM_VERSION from the host environment to cibuildwheel.
+environment-pass = ["LLVM_VERSION"]
 # We use miniconda3 to get the clang/llvm toolchain on Linux.
-before-all = ["bash buildscripts/cibuildwheel/setup-miniconda3.sh"]
 before-build = ["rm -rf build dist src/*.egg-info"]
 skip = ["*-musllinux_*", "cp38-*"]
 test-command = [
@@ -57,14 +58,32 @@ test-command = [
     "OMP_TARGET_OFFLOAD=mandatory TEST_DEVICES=1 RUN_TARGET=1 python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget",
 ]
 
+[tool.cibuildwheel.environment]
+USE_CXX11_ABI = "1"
+PIP_NO_INPUT = "1"
+
 [tool.cibuildwheel.linux]
 before-all = [
-    "yum install -y elfutils-libelf-devel libffi-devel",
-    "bash buildscripts/cibuildwheel/setup-miniconda3.sh",
+    "yum install -y elfutils-libelf-devel libffi-devel clang-devel-20.1.8 llvm-devel-20.1.8",
 ]
 
-[tool.cibuildwheel.environment]
-LLVM_DIR = "_stage/miniconda3/envs/llvmdev"
-CLANG_TOOL = "_stage/miniconda3/envs/clang14/bin/clang"
-USE_CXX11_ABI = "1"
-PIP_NO_INPUT = "1"
+[tool.cibuildwheel.linux.environment]
+ENABLE_BUNDLED_LIBOMP = "1"
+ENABLE_BUNDLED_LIBOMPTARGET = "1"
+LLVM_DIR = "/usr/lib64/cmake/llvm"
+CC = "/usr/bin/clang"
+CXX = "/usr/bin/clang++"
+
+[tool.cibuildwheel.macos]
+before-all = ["bash buildscripts/cibuildwheel/setup-miniconda3.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++"
+# 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}/"