[RELEASE] cusignal v22.06

.pre-commit-config.yaml

@@ -0,0 +1,20 @@
+repos:
+      - repo: https://github.com/pycqa/isort
+        rev: 5.6.4
+        hooks:
+              - id: isort
+                args: ["--settings-path=python/setup.cfg"]
+                files: python/.*
+      - repo: https://github.com/ambv/black
+        rev: 22.3.0
+        hooks:
+              - id: black
+                files: python/.*
+      - repo: https://gitlab.com/pycqa/flake8
+        rev: 3.8.3
+        hooks:
+              - id: flake8
+                args: ["--config=python/setup.cfg"]
+                files: python/.*
+default_language_version:
+      python: python3

CHANGELOG.md

@@ -1,3 +1,16 @@
+# cuSignal 22.06.00 (7 Jun 2022)
+
+## 🛠️ Improvements
+
+- Simplify conda recipes ([#484](https://github.com/rapidsai/cusignal/pull/484)) [@Ethyling](https://github.com/Ethyling)
+- Use conda to build python packages during GPU tests ([#480](https://github.com/rapidsai/cusignal/pull/480)) [@Ethyling](https://github.com/Ethyling)
+- Fix pinned buffer IO issues ([#479](https://github.com/rapidsai/cusignal/pull/479)) [@charlesbluca](https://github.com/charlesbluca)
+- Use pre-commit to enforce Python style checks ([#478](https://github.com/rapidsai/cusignal/pull/478)) [@charlesbluca](https://github.com/charlesbluca)
+- Extend `get_pinned_mem` to work with more dtype / shapes ([#477](https://github.com/rapidsai/cusignal/pull/477)) [@charlesbluca](https://github.com/charlesbluca)
+- Add/fix installation sections for SDR example notebooks ([#476](https://github.com/rapidsai/cusignal/pull/476)) [@charlesbluca](https://github.com/charlesbluca)
+- Use conda compilers ([#461](https://github.com/rapidsai/cusignal/pull/461)) [@Ethyling](https://github.com/Ethyling)
+- Build packages using mambabuild ([#453](https://github.com/rapidsai/cusignal/pull/453)) [@Ethyling](https://github.com/Ethyling)
+
 # cuSignal 22.04.00 (6 Apr 2022)
 
 ## 🐛 Bug Fixes

ci/benchmark/build.sh

@@ -1,6 +1,5 @@
-
 #!/usr/bin/env bash
-# Copyright (c) 2018-2020, NVIDIA CORPORATION.
+# Copyright (c) 2018-2022, NVIDIA CORPORATION.
 #############################################
 # cuSignal's Benchmark test script for CI   #
 #############################################
@@ -57,7 +56,7 @@ gpuci_logger "Activate conda env"
 conda activate rapids
 
 gpuci_logger "Install required packages"
-gpuci_conda_retry install -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge \
+gpuci_mamba_retry install -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge \
 	"cudatoolkit=$CUDA_REL" \
 	"rapids-build-env=${MINOR_VERSION}" \
 	rapids-pytest-benchmark
@@ -110,4 +109,4 @@ time pytest ../python -k TestWavelets -v -m "not cpu" \
 	--benchmark-asv-output-dir="${S3_ASV_DIR}" \
     --benchmark-asv-metadata="${BENCHMARK_META}"
 
-EXITCODE=$?
+EXITCODE=$?

ci/checks/style.sh

@@ -12,19 +12,14 @@ PATH=/opt/conda/bin:$PATH
 . /opt/conda/etc/profile.d/conda.sh
 conda activate rapids
 
-cd "$WORKSPACE/python"
+# Run pre-commit hooks and get results/return code
+pre-commit run --hook-stage manual --all-files
+PRE_COMMIT_RETVAL=$?
 
-# Run flake8 and get results/return code
-FLAKE=`flake8`
-RETVAL=$?
-
-# Output results if failure otherwise show pass
-if [ "$FLAKE" != "" ]; then
-  echo -e "\n\n>>>> FAILED: flake8 style check; begin output\n\n"
-  echo -e "$FLAKE"
-  echo -e "\n\n>>>> FAILED: flake8 style check; end output\n\n"
-else
-  echo -e "\n\n>>>> PASSED: flake8 style check\n\n"
-fi
+RETVALS=(
+  $PRE_COMMIT_RETVAL
+)
+IFS=$'\n'
+RETVAL=`echo "${RETVALS[*]}" | sort -nr | head -n1`
 
 exit $RETVAL

ci/cpu/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2020, NVIDIA CORPORATION.
+# Copyright (c) 2020-2022, NVIDIA CORPORATION.
 ##########################################
 # cuSignal CPU conda build script for CI #
 ##########################################
@@ -52,6 +52,9 @@ conda list --show-channel-urls
 # FIX Added to deal with Anancoda SSL verification issues during conda builds
 conda config --set ssl_verify False
 
+# FIXME: Remove
+gpuci_mamba_retry install -c conda-forge boa
+
 ################################################################################
 # BUILD - Conda package build
 ################################################################################
@@ -61,7 +64,7 @@ export GPUCI_CONDA_RETRY_MAX=1
 export GPUCI_CONDA_RETRY_SLEEP=30
 
 gpuci_logger "Build conda pkg for cuSignal"
-gpuci_conda_retry build conda/recipes/cusignal --python=${PYTHON}
+gpuci_conda_retry mambabuild conda/recipes/cusignal --python=${PYTHON}
 
 ################################################################################
 # UPLOAD - Conda packages

ci/gpu/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2018-2020, NVIDIA CORPORATION.
+# Copyright (c) 2018-2022, NVIDIA CORPORATION.
 #############################################
 # cuSignal GPU build and test script for CI #
 #############################################
@@ -24,6 +24,7 @@ export HOME="$WORKSPACE"
 cd "$WORKSPACE"
 export GIT_DESCRIBE_TAG=`git describe --tags`
 export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
+unset GIT_DESCRIBE_TAG
 
 ################################################################################
 # SETUP - Check environment
@@ -38,14 +39,6 @@ nvidia-smi
 gpuci_logger "Activate conda env"
 . /opt/conda/etc/profile.d/conda.sh
 conda activate rapids
-gpuci_conda_retry install -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge \
-    cudatoolkit=${CUDA_REL} \
-    "rapids-build-env=$MINOR_VERSION.*" \
-    "rapids-notebook-env=$MINOR_VERSION."
-
-# https://docs.rapids.ai/maintainers/depmgmt/ 
-# conda remove -f rapids-build-env rapids-notebook-env
-# conda install "your-pkg=1.0.0"
 
 gpuci_logger "Check versions"
 python --version
@@ -61,8 +54,14 @@ conda list --show-channel-urls
 # BUILD - Build cusignal
 ################################################################################
 
-gpuci_logger "Build cusignal"
-"$WORKSPACE/build.sh" clean cusignal
+# TODO: Move boa install to gpuci/rapidsai
+gpuci_mamba_retry install boa
+
+gpuci_logger "Build and install cusignal"
+cd "${WORKSPACE}"
+CONDA_BLD_DIR="${WORKSPACE}/.conda-bld"
+gpuci_conda_retry mambabuild --croot "${CONDA_BLD_DIR}" conda/recipes/cusignal --python=${PYTHON}
+gpuci_mamba_retry install -c "${CONDA_BLD_DIR}" cusignal
 
 ################################################################################
 # TEST - Run GoogleTest and py.tests for cusignal
@@ -89,5 +88,3 @@ pytest --cache-clear --junitxml="$WORKSPACE/junit-cusignal.xml" -v -s -m "not cp
 python ${WORKSPACE}/ci/utils/nbtestlog2junitxml.py nbtest.log
 
 return ${EXITCODE}
-
-

conda/recipes/cusignal/conda_build_config.yaml

@@ -0,0 +1,11 @@
+c_compiler_version:
+  - 9
+
+cxx_compiler_version:
+  - 9
+
+cuda_compiler:
+  - nvcc
+
+sysroot_version:
+  - "2.17"

conda/recipes/cusignal/meta.yaml

@@ -9,20 +9,23 @@ package:
   version: {{ version }}
 
 source:
-  path: ../../..
+  git_url: ../../..
 
 build:
   number: {{ GIT_DESCRIBE_NUMBER }}
   string: py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
   noarch: python
   script_env:
     - VERSION_SUFFIX
-    - CC
-    - CXX
-    - CUDAHOSTCXX
+  ignore_run_exports_from:
+    - {{ compiler('cuda') }}
 
 requirements:
   build:
+    - {{ compiler('cxx') }}
+    - {{ compiler('cuda') }} {{ cuda_version }}
+    - sysroot_{{ target_platform }} {{ sysroot_version }}
+  host:
     - python
     - setuptools
   run:

docs/source/conf.py

@@ -68,9 +68,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '22.04'
+version = '22.06'
 # The full version, including alpha/beta/rc tags.
-release = '22.04.00'
+release = '22.06.00'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

notebooks/sdr/sdr_wfm_demod.ipynb

@@ -1,8 +1,40 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "#### [First-Run Only] Environment Setup\n",
+    "\n",
+    "The use of this notebook requires an SDR device to be connected to the local machine."
+   ]
+  },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
+   "metadata": {
+    "scrolled": true,
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "# SoapySDR module corresponds to SDR selection, e.g.\n",
+    "# soapy-module-lms7 -> lime\n",
+    "# soapy-module-rtlsdr -> rtlsdr\n",
+    "\n",
+    "!mamba install -y soapysdr-module-lms7 pyaudio"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "#### Import Dependencies"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -24,7 +56,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -43,7 +75,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -62,7 +94,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -79,7 +111,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -104,20 +136,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "<function _signal.default_int_handler>"
-      ]
-     },
-     "execution_count": 6,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "def signal_handler(signum, frame):\n",
     "    stream.stop_stream()\n",
@@ -151,13 +172,6 @@
     "    que.put(buff.astype(cp.complex64).copy())"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -168,7 +182,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -182,9 +196,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.5"
+   "version": "3.9.7"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }