From 772a34e1c5b0c7f3a163651db2773b9ef197c7ff Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 6 Jan 2023 19:11:14 -0600 Subject: [PATCH 1/5] Update workflows. --- .github/workflows/build.yaml | 6 +++--- .github/workflows/pr.yaml | 12 ++++++------ .github/workflows/test.yaml | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 620a13fe1..d7e81bcd3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 }} @@ -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 }} @@ -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 }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 3ddb08dd7..be1c89255 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -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 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index bd201e987..c586ac769 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ 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 }} @@ -24,7 +24,7 @@ jobs: 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 }} From fc147572189257e25017e6e336c780bbfdcad9fc Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 6 Jan 2023 19:14:19 -0600 Subject: [PATCH 2/5] Update dependencies. --- ..._64.yaml => all_cuda-118_arch-x86_64.yaml} | 20 ++++++------- .../libcuspatial/conda_build_config.yaml | 6 ++-- dependencies.yaml | 30 ++++++++++++------- 3 files changed, 33 insertions(+), 23 deletions(-) rename conda/environments/{all_cuda-115_arch-x86_64.yaml => all_cuda-118_arch-x86_64.yaml} (70%) diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml similarity index 70% rename from conda/environments/all_cuda-115_arch-x86_64.yaml rename to conda/environments/all_cuda-118_arch-x86_64.yaml index bed979caf..7ecacf07b 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -8,8 +8,8 @@ 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.* @@ -17,21 +17,21 @@ dependencies: - 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,<12 +- libcusparse>=11.7.5.86,<12 +- 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 diff --git a/conda/recipes/libcuspatial/conda_build_config.yaml b/conda/recipes/libcuspatial/conda_build_config.yaml index 3fcdc166b..5cc0c3ea7 100644 --- a/conda/recipes/libcuspatial/conda_build_config.yaml +++ b/conda/recipes/libcuspatial/conda_build_config.yaml @@ -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" diff --git a/dependencies.yaml b/dependencies.yaml index 60c499331..38ebee7ee 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ files: all: output: conda matrix: - cuda: ["11.5"] + cuda: ["11.8"] arch: [x86_64] includes: - build_cpp @@ -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 @@ -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 @@ -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: @@ -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] From 7740c6b0597bde590e5c7265ea3a602c6fb7df9e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 6 Jan 2023 19:14:24 -0600 Subject: [PATCH 3/5] Update Python classifiers. --- python/cuspatial/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/cuspatial/setup.py b/python/cuspatial/setup.py index 3c271cbad..1e7ccb0b1 100644 --- a/python/cuspatial/setup.py +++ b/python/cuspatial/setup.py @@ -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"]}, From 849e02fab426ad74ff4cadbfc5b1062cefd13877 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 6 Jan 2023 19:16:46 -0600 Subject: [PATCH 4/5] Update environment. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 7ecacf07b..3df135ece 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -18,8 +18,8 @@ dependencies: - gmock=1.10.0 - gtest=1.10.0 - libcudf=23.02 -- libcusparse-dev>=11.7.5.86,<12 -- libcusparse>=11.7.5.86,<12 +- libcusparse-dev=11.7.5.86 +- libcusparse=11.7.5.86 - librmm=23.02 - myst-parser - ninja From fec355ef511d62c3a7ee75f943f878f2c101db52 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 9 Jan 2023 20:26:59 -0600 Subject: [PATCH 5/5] Rerun CI.