Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build CUDA 11.8 and Python 3.10 Packages #865

Merged
merged 5 commits into from
Jan 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
jobs:
cpp-build:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-matrix-build.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-118
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -37,7 +37,7 @@ jobs:
python-build:
needs: [cpp-build]
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-matrix-build.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-118
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -46,7 +46,7 @@ jobs:
upload-conda:
needs: [cpp-build, python-build]
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-118
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,31 @@ jobs:
- conda-python-build
- conda-python-tests
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-118
checks:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-118
conda-cpp-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-matrix-build.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-118
with:
build_type: pull-request
conda-cpp-tests:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-118
with:
build_type: pull-request
conda-python-build:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-matrix-build.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-118
with:
build_type: pull-request
conda-python-tests:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118
with:
build_type: pull-request
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ on:
jobs:
conda-cpp-tests:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-118
with:
build_type: nightly
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
conda-python-tests:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@ channels:
dependencies:
- c-compiler
- cmake>=3.23.1,!=3.25.0
- cudatoolkit=11.5
- cudf=22.12.*
- cudatoolkit=11.8
- cudf=23.02
- cxx-compiler
- cython>=0.29,<0.30
- gcc_linux-64=9.*
- gdal>3.5.0,<3.6.0
- geopandas>=0.11.0
- gmock=1.10.0
- gtest=1.10.0
- libcudf=22.12.*
- libcusparse-dev>=11.7.0.31,<=11.7.0.107
- libcusparse>=11.7.0.31,<=11.7.0.107
- librmm=22.12.*
- libcudf=23.02
- libcusparse-dev=11.7.5.86
- libcusparse=11.7.5.86
- librmm=23.02
- myst-parser
- ninja
- nvcc_linux-64=11.5
- nvcc_linux-64=11.8
- pre-commit
- pydata-sphinx-theme
- pytest
- pytest-cov
- pytest-xdist
- python>=3.8,<3.10
- rmm=22.12.*
- python>=3.8,<3.11
- rmm=23.02
- scikit-build>=0.13.1
- setuptools
- sysroot_linux-64==2.17
name: all_cuda-115_arch-x86_64
name: all_cuda-118_arch-x86_64
6 changes: 3 additions & 3 deletions conda/recipes/libcuspatial/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ sysroot_version:
- "2.17"

# The CTK libraries below are missing from the conda-forge::cudatoolkit
# package. The "*_host_*" version specifiers correspond to `11.5` packages and the
# package. The "*_host_*" version specifiers correspond to `11.8` packages and the
# "*_run_*" version specifiers correspond to `11.x` packages.

libcusparse_host_version:
- ">=11.7.0.31,<=11.7.0.107"
- "=11.7.5.86"

libcusparse_run_version:
- ">=11.6.0.43,<=11.7.5.86"
- ">=11.6.0.43,<12"
30 changes: 20 additions & 10 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ files:
all:
output: conda
matrix:
cuda: ["11.5"]
cuda: ["11.8"]
arch: [x86_64]
includes:
- build_cpp
Expand Down Expand Up @@ -45,8 +45,8 @@ dependencies:
- gdal>3.5.0,<3.6.0
- gmock=1.10.0
- gtest=1.10.0
- libcudf=22.12.*
- librmm=22.12.*
- libcudf=23.02
- librmm=23.02
- ninja
specific:
- output_types: conda
Expand All @@ -65,20 +65,20 @@ dependencies:
matrices:
- matrix:
arch: x86_64
cuda: "11.5"
cuda: "11.8"
packages:
- &nvcc_amd64_115 nvcc_linux-64=11.5
- nvcc_linux-64=11.8
- matrix:
arch: aarch64
cuda: "11.5"
cuda: "11.8"
packages:
- &nvcc_aarch64_115 nvcc_linux-aarch64=11.5
- nvcc_linux-aarch64=11.8
build_python:
common:
- output_types: [conda, requirements]
packages:
- *cmake_ver
- &cudf_ver cudf=22.12.*
- &cudf_ver cudf=23.02
- cython>=0.29,<0.30
- scikit-build>=0.13.1
- setuptools
Expand All @@ -99,6 +99,12 @@ dependencies:
specific:
- output_types: conda
matrices:
- matrix:
cuda: "11.8"
packages:
- cudatoolkit=11.8
- libcusparse-dev=11.7.5.86
- libcusparse=11.7.5.86
- matrix:
cuda: "11.5"
packages:
Expand Down Expand Up @@ -142,16 +148,20 @@ dependencies:
py: "3.9"
packages:
- python=3.9
- matrix:
py: "3.10"
packages:
- python=3.10
- matrix:
packages:
- python>=3.8,<3.10
- python>=3.8,<3.11
run_python:
common:
- output_types: [conda, requirements]
packages:
- *cudf_ver
- geopandas>=0.11.0
- rmm=22.12.*
- rmm=23.02
test_python:
common:
- output_types: [conda, requirements]
Expand Down
1 change: 1 addition & 0 deletions python/cuspatial/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
packages=find_packages(include=["cuspatial", "cuspatial.*"]),
package_data={"cuspatial._lib": ["*.pxd"]},
Expand Down