merge/resolve

Author: brandon-b-miller

.github/workflows/conda-python-tests.yaml

@@ -113,6 +113,15 @@ jobs:
       - name: Setup proxy cache
         uses: nv-gha-runners/setup-proxy-cache@main
         continue-on-error: true
+      - name: Compute pixi environment name
+        run: |
+          set -euo pipefail
+          PIXI_ENV="cu-$(cut -d. -f1-2 <<< "${{ matrix.CUDA_VER }}" | tr . -)"
+          echo "PIXI_ENV=${PIXI_ENV}" >> "${GITHUB_ENV}"
+      - name: Setup pixi
+        uses: prefix-dev/setup-pixi@fef5c9568ca6c4ff7707bf840ab0692ba3f08293
+        with:
+          environments: ${{ env.PIXI_ENV }}
       - name: Python tests
         run: ${{ inputs.script }}
         env:

.github/workflows/pr.yaml

@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - "pull-request/[0-9]+"
+      - "main"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}

.github/workflows/simulator-test.yaml

@@ -101,6 +101,15 @@ jobs:
           echo "RAPIDS_NIGHTLY_DATE=${{ inputs.date }}" >> "${GITHUB_ENV}"
       - name: Setup proxy cache
         uses: nv-gha-runners/setup-proxy-cache@main
+      - name: Compute pixi environment name
+        run: |
+          set -euo pipefail
+          PIXI_ENV="cu-$(cut -d. -f1-2 <<< "${{ matrix.CUDA_VER }}" | tr . -)"
+          echo "PIXI_ENV=${PIXI_ENV}" >> "${GITHUB_ENV}"
+      - name: Setup pixi
+        uses: prefix-dev/setup-pixi@fef5c9568ca6c4ff7707bf840ab0692ba3f08293
+        with:
+          environments: ${{ env.PIXI_ENV }}
       - name: Python tests
         run: ${{ inputs.script }}
         env:

ci/test_conda.sh

@@ -4,16 +4,6 @@
 
 set -euo pipefail
 
-. /opt/conda/etc/profile.d/conda.sh
-
-CTK_PACKAGE_DEPENDENCIES=(
-    "cuda-cccl"
-    "cuda-nvcc-impl"
-    "cuda-nvrtc"
-    "libcurand-dev"
-    "cuda-cuobjdump"
-)
-
 DISTRO=`cat /etc/os-release | grep "^ID=" | awk 'BEGIN {FS="="} { print $2 }'`
 
 if [ "$DISTRO" = "ubuntu" ]; then
@@ -22,67 +12,30 @@ if [ "$DISTRO" = "ubuntu" ]; then
   apt remove --purge `dpkg --get-selections | grep cuda-nvrtc | awk '{print $1}'` -y
 fi
 
-rapids-logger "Install testing dependencies"
-# TODO: Replace with rapids-dependency-file-generator
-DEPENDENCIES=(
-    "c-compiler"
-    "cxx-compiler"
-    "${CTK_PACKAGE_DEPENDENCIES[@]}"
-    "cuda-python"
-    "cuda-version=${CUDA_VER%.*}"
-    "make"
-    "numba-cuda"
-    "psutil"
-    "pytest"
-    "pytest-xdist"
-    "pytest-benchmark"
-    "cffi"
-    "ml_dtypes"
-    "python=${RAPIDS_PY_VERSION}"
-)
 # Constrain oldest supported dependencies for testing
 if [ "${RAPIDS_DEPENDENCIES:-}" = "oldest" ]; then
-    DEPENDENCIES+=("numba==0.60.0")
+    # add to the default environment's dependencies
+    pixi add "numba=0.60.0"
 fi
 
-rapids-mamba-retry create \
-    -n test \
-    --strict-channel-priority \
-    --channel "`pwd`/conda-repo" \
-    --channel conda-forge \
-    "${DEPENDENCIES[@]}"
-
-# Temporarily allow unbound variables for conda activation.
-set +u
-conda activate test
-set -u
-
-pip install filecheck
-
-rapids-print-env
-
 rapids-logger "Check GPU usage"
 nvidia-smi
 
-rapids-logger "Build test binaries"
-export NUMBA_CUDA_TEST_BIN_DIR=`pwd`/testing
-pushd $NUMBA_CUDA_TEST_BIN_DIR
-make -j $(nproc)
-
-rapids-logger "Show Numba system info"
-python -m numba --sysinfo
-
 EXITCODE=0
 trap "EXITCODE=1" ERR
 set +e
 
+rapids-logger "Show Numba system info"
+pixi run -e "${PIXI_ENV}" python -m numba --sysinfo
+
 rapids-logger "Test importing numba.cuda"
-python -c "from numba import cuda"
+pixi run -e "${PIXI_ENV}" python -c "from numba import cuda"
 
 rapids-logger "Run Tests"
-pytest -v
-
-popd
+pixi run -e "${PIXI_ENV}" test -n auto \
+  --dist loadscope \
+  --loadscope-reorder \
+  -v
 
 rapids-logger "Test script exiting with value: $EXITCODE"
 exit ${EXITCODE}

ci/test_simulator.sh

@@ -4,56 +4,21 @@
 
 set -euo pipefail
 
-. /opt/conda/etc/profile.d/conda.sh
-
-rapids-logger "Install testing dependencies"
-# TODO: Replace with rapids-dependency-file-generator
-DEPENDENCIES=(
-    "psutil"
-    "pytest"
-    "pytest-xdist"
-    "pytest-benchmark"
-    "cffi"
-    "ml_dtypes"
-    "python=${RAPIDS_PY_VERSION}"
-    "numba-cuda"
-)
-rapids-mamba-retry create \
-    -n test \
-    --strict-channel-priority \
-    --channel "`pwd`/conda-repo" \
-    --channel conda-forge \
-    "${DEPENDENCIES[@]}"
-
-# Temporarily allow unbound variables for conda activation.
-set +u
-conda activate test
-set -u
-
-pip install filecheck
-
-rapids-print-env
-
-# The simulator doesn't actually use the test binaries, but we move into the
-# test binaries folder so that we're not in the root of the repo, and therefore
-# numba-cuda code from the installed package will be tested, instead of the
-# code in the source repo.
-rapids-logger "Move to test binaries folder"
-export NUMBA_CUDA_TEST_BIN_DIR=`pwd`/testing
-pushd $NUMBA_CUDA_TEST_BIN_DIR
-
-rapids-logger "Show Numba system info"
-python -m numba --sysinfo
-
 EXITCODE=0
 trap "EXITCODE=1" ERR
 set +e
 
-rapids-logger "Run Tests"
-export NUMBA_ENABLE_CUDASIM=1
-pytest -v
+rapids-logger "Show Numba system info"
+pixi run -e "${PIXI_ENV}" python -m numba --sysinfo
+
+rapids-logger "Test importing numba.cuda"
+pixi run -e "${PIXI_ENV}" python -c "from numba import cuda"
 
-popd
+rapids-logger "Run Tests"
+pixi run -e "${PIXI_ENV}" simtest -n auto \
+  --dist loadscope \
+  --loadscope-reorder \
+  -v
 
 rapids-logger "Test script exiting with value: $EXITCODE"
 exit ${EXITCODE}

docs/source/user/cudapysupported.rst

@@ -225,6 +225,7 @@ The following functions from the :mod:`math` module are supported:
 * :func:`math.log2`
 * :func:`math.log10`
 * :func:`math.log1p`
+* :func:`math.nextafter` (Excluding the ``steps`` keyword argument)
 * :func:`math.sqrt`
 * :func:`math.remainder`
 * :func:`math.pow`

numba_cuda/numba/cuda/__init__.py

@@ -7,12 +7,14 @@
 import warnings
 import sys
 
+
 # Re-export types itself
 import numba.cuda.types as types
 
 # Re-export all type names
 from numba.cuda.types import *
 
+HAS_NUMBA = importlib.util.find_spec("numba") is not None
 
 # Require NVIDIA CUDA bindings at import time
 if not (

numba_cuda/numba/cuda/_internal/cuda_bf16.py

@@ -60,7 +60,7 @@
     uint64,
     void,
 )
-from numba.cuda.ext_types import bfloat16
+from numba.cuda.types.ext_types import bfloat16
 
 float32x2 = vector_types["float32x2"]
 __half = float16

numba_cuda/numba/cuda/cg.py

@@ -6,7 +6,7 @@
 from numba.cuda.typing import signature
 from numba.cuda import nvvmutils
 from numba.cuda.extending import intrinsic
-from numba.cuda.ext_types import grid_group, GridGroup as GridGroupClass
+from numba.cuda.types.ext_types import grid_group, GridGroup as GridGroupClass
 
 
 class GridGroup:

numba_cuda/numba/cuda/compiler.py

@@ -10,7 +10,7 @@
 from numba.cuda.core import bytecode
 from numba.cuda import types
 from numba.cuda.core.options import ParallelOptions
-from numba.core.compiler_lock import global_compiler_lock
+from numba.cuda.core.compiler_lock import global_compiler_lock
 from numba.cuda.core.errors import NumbaWarning, NumbaInvalidConfigWarning
 from numba.cuda.core.interpreter import Interpreter
 
@@ -446,7 +446,7 @@ def run_pass(self, state):
 @register_pass(mutates_CFG=True, analysis_only=False)
 class CUDANativeLowering(BaseNativeLowering):
     """Lowering pass for a CUDA native function IR described solely in terms of
-    Numba's standard `numba.core.ir` nodes."""
+    Numba's standard `numba.cuda.core.ir` nodes."""
 
     _name = "cuda_native_lowering"