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.

Sign up for GitHub

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

Update rapids-cmake ci to support conda-forge CUDA 12 #437

Merged
merged 12 commits into from
Jul 13, 2023
Merged

Update rapids-cmake ci to support conda-forge CUDA 12 #437

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
656a709
Update rapids-cmake ci to support conda-forge CUDA 12
robertmaynard Jul 12, 2023
0224098
Update test and pr yaml
robertmaynard Jul 12, 2023
e34181f
Add explicit rapids-dependency matrix value to style env
robertmaynard Jul 12, 2023
f04edcc
Update the rapids_core_dependencies/meta.yaml for cuda 12
robertmaynard Jul 12, 2023
008a68f
Update the rapids_core_dependencies/meta.yaml for cuda 12
robertmaynard Jul 12, 2023
fa319ab
Update conda/recipes/rapids_core_dependencies/meta.yaml
robertmaynard Jul 12, 2023
861ac8f
Update ci/check_style.sh
robertmaynard Jul 12, 2023
93e22a2
Add gcc constraints based on the CUDA version
robertmaynard Jul 12, 2023
8dfbd70
Update dependencies.yaml
robertmaynard Jul 12, 2023
c78274b
Correct typo in meta.yaml
robertmaynard Jul 12, 2023
2745b46
Fix indentation.
bdice Jul 12, 2023
82fe232
Ensure we have cupti in our cuda-12 env
robertmaynard Jul 13, 2023
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
View file
Open in desktop
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-build.yaml@branch-23.08
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-120
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -37,7 +37,7 @@ jobs:
upload-conda:
needs: [cpp-build]
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.06
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-120
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -46,7 +46,7 @@ jobs:
docs-build:
if: github.ref_type == 'branch'
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.08
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120
with:
arch: "amd64"
branch: ${{ inputs.branch }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@ jobs:
- conda-cpp-tests
- docs-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.08
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-120
checks:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.08
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-120
conda-cpp-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.08
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-120
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@branch-23.08
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120
with:
build_type: pull-request
docs-build:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.08
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120
with:
build_type: pull-request
node_type: "cpu4"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
cpp-tests:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.08
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand Down
2 changes: 1 addition & 1 deletion ci/check_style.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rapids-logger "Create checks conda environment"
rapids-dependency-file-generator \
--output conda \
--file_key checks \
--matrix "" | tee env.yaml
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml

rapids-mamba-retry env create --force -f env.yaml -n checks

Expand Down
6 changes: 6 additions & 0 deletions conda/recipes/rapids_core_dependencies/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ cxx_compiler_version:
- 11

cuda_compiler:
- cuda-nvcc

cuda11_compiler:
- nvcc

cmake_version:
- ">=3.26.4"

sysroot_version:
- "2.17"
17 changes: 13 additions & 4 deletions conda/recipes/rapids_core_dependencies/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,27 @@ build:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
ignore_run_exports_from:
- {{ compiler('cuda') }}
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% endif %}

requirements:
build:
- cmake>=3.23.1,!=3.25.0
- cmake {{ cmake_version }}
- {{ compiler('cxx') }}
- {{ compiler('cuda') }} {{ cuda_version }}
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }} {{ cuda_version }}
{% else %}
- {{ compiler('cuda') }}
{% endif %}
- cuda-version ={{ cuda_version }}
- make
- ninja
- sysroot_{{ target_platform }} {{ sysroot_version }}
host:
- cudatoolkit ={{ cuda_version }}
- cuda-version ={{ cuda_version }}
robertmaynard marked this conversation as resolved.
Show resolved Hide resolved
run:
bdice marked this conversation as resolved.
Show resolved Hide resolved
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}

about:
home: https://rapids.ai/
Expand Down
38 changes: 33 additions & 5 deletions dependencies.yaml
View file
Open in desktop
robertmaynard marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -32,36 +32,64 @@ dependencies:
- c-compiler
- cxx-compiler
- make
specific:
- output_types: conda
matrices:
- matrix:
arch: x86_64
cuda: "11.8"
packages:
- nvcc_linux-64=11.8
- matrix:
arch: aarch64
cuda: "11.8"
packages:
- nvcc_linux-aarch64=11.8
robertmaynard marked this conversation as resolved.
Show resolved Hide resolved
- matrix:
cuda: "12.0"
packages:
- cuda-version=12.0
- cuda-nvcc
cudatoolkit:
specific:
- output_types: conda
matrices:
- matrix:
cuda: "11.2"
packages:
- cudatoolkit=11.2
- cuda-version=11.2
- cudatoolkit
- gcc<11.0.0
- sysroot_linux-64==2.17
- matrix:
cuda: "11.4"
packages:
- cudatoolkit=11.4
- cuda-version=11.4
- cudatoolkit
- gcc<11.0.0
- sysroot_linux-64==2.17
- matrix:
cuda: "11.5"
packages:
- cudatoolkit=11.5
- cuda-version=11.5
- cudatoolkit
- sysroot_linux-64==2.17
- matrix:
cuda: "11.6"
packages:
- cudatoolkit=11.6
- cuda-version=11.6
- cudatoolkit
- sysroot_linux-64==2.17
- matrix:
cuda: "11.8"
packages:
- cudatoolkit=11.8
- cuda-version=11.8
- cudatoolkit
robertmaynard marked this conversation as resolved.
Show resolved Hide resolved
- sysroot_linux-64==2.17
- matrix:
cuda: "12.0"
packages:
- cuda-version=12.0
- sysroot_linux-64==2.17
docs:
common:
Expand Down