diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b3c2470..b0a7984 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,8 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.7.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.7.____cpython + linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython: @@ -20,8 +20,8 @@ jobs: CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_ppc64le_python3.7.____cpython: - CONFIG: linux_ppc64le_python3.7.____cpython + linux_ppc64le_python3.10.____cpython: + CONFIG: linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 linux_ppc64le_python3.8.____cpython: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython.yaml index 78b207a..3085128 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.10.* *_cpython spdlog: - '1.10' target_platform: diff --git a/.ci_support/linux_aarch64_python3.7.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_aarch64_python3.7.____cpython.yaml rename to .ci_support/linux_aarch64_python3.10.____cpython.yaml index 279fa54..4716bd9 100644 --- a/.ci_support/linux_aarch64_python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -27,7 +27,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.10.* *_cpython spdlog: - '1.10' target_platform: diff --git a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_python3.7.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.10.____cpython.yaml index a7551ee..07762cd 100644 --- a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.10.* *_cpython spdlog: - '1.10' target_platform: diff --git a/.ci_support/migrations/python310.yaml b/.ci_support/migrations/python310.yaml new file mode 100644 index 0000000..c31e991 --- /dev/null +++ b/.ci_support/migrations/python310.yaml @@ -0,0 +1,34 @@ +migrator_ts: 1634137107 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + paused: false + longterm: True + pr_limit: 40 + max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.10.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.21 +python_impl: + - cpython diff --git a/.travis.yml b/.travis.yml index d7add44..c8fe9d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ language: generic matrix: include: - - env: CONFIG=linux_aarch64_python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 + - env: CONFIG=linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 os: linux arch: arm64 dist: focal diff --git a/README.md b/README.md index 799fd71..f33b682 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,10 @@ Current build status - + @@ -55,10 +55,10 @@ Current build status - + @@ -76,10 +76,10 @@ Current build status - + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 751134c..4a1e779 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "rmm" %} -{% set version = "22.02.00" %} +{% set version = "22.04.01" %} package: name: {{ name|lower }} @@ -7,20 +7,17 @@ package: source: url: https://github.com/rapidsai/rmm/archive/refs/tags/v{{ version }}.tar.gz - sha256: 90ed8e21e3e82b9d55fe2f45afd836489c2d07b842d4cf9eadf5ff07849ff768 + sha256: 2989ecac7d29f1104f3bd8bf328f3345398faaf2164eea86a755ff204e4214fb folder: rmm - patches: - - py_ver.diff build: - number: 1 - skip: true # [(not linux) or (cuda_compiler_version != "11.2")] + number: 0 + skip: true # [(not linux) or (cuda_compiler_version != "11.2") or py<38] script_env: - INSTALL_PREFIX=${PREFIX} - - CUDA_HOME # [ppc64le or aarch64] script: - cd rmm/python - - {{ PYTHON }} -m pip install . --no-deps -vv + - SKBUILD_CONFIGURE_OPTIONS="-DFIND_RMM_CPP=ON -DThrust_ROOT=${PREFIX}/include/rapids/thrust/" {{ PYTHON }} -m pip install . --no-deps -vv missing_dso_whitelist: - '*/libcuda.*' # [linux] ignore_run_exports: @@ -36,12 +33,10 @@ requirements: - librmm ={{ version }} - python - pip - - setuptools - cython >=0.29,<0.30 - spdlog >=1.8.5,<2 - cuda-python 11.6 - - thrust 1.15.* - - cub 1.15.* + - scikit-build >=0.13.1 run: - python - numba >=0.49 diff --git a/recipe/py_ver.diff b/recipe/py_ver.diff deleted file mode 100644 index 0771f8d..0000000 --- a/recipe/py_ver.diff +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/python/setup.cfg b/python/setup.cfg -index 8722e91..1df2c9e 100644 ---- a/python/setup.cfg -+++ b/python/setup.cfg -@@ -54,4 +54,3 @@ packages = find: - install_requires = - numpy - numba>=0.49 --python_requires = >=3.7,<3.9
VariantStatus
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.7.____cpythonlinux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython - variant + variant
linux_aarch64_python3.7.____cpythonlinux_aarch64_python3.10.____cpython - variant + variant
linux_ppc64le_python3.7.____cpythonlinux_ppc64le_python3.10.____cpython - variant + variant