Skip to content

Commit

Permalink
Update rattler-build recipe with assorted small fixes (#1832)
Browse files Browse the repository at this point in the history
Removes the `.` from the `py_version` context variable and standardizes whitespace and section ordering

Authors:
  - Gil Forsyth (https://github.com/gforsyth)
  - https://github.com/apps/pre-commit-ci
  - Bradley Dice (https://github.com/bdice)
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - James Lamb (https://github.com/jameslamb)
  - Bradley Dice (https://github.com/bdice)

URL: #1832
  • Loading branch information
gforsyth authored Feb 21, 2025
1 parent 1032c10 commit aa5d0b2
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 25 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ dependencies:
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- rapids-logger==0.1.*,>=0.0.0a0
- scikit-build-core >=0.10.0
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx<8.2.0
- sphinx_rtd_theme
- sysroot_linux-64==2.28
name: all_cuda-118_arch-x86_64
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-128_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ dependencies:
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- rapids-logger==0.1.*,>=0.0.0a0
- scikit-build-core >=0.10.0
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx<8.2.0
- sphinx_rtd_theme
- sysroot_linux-64==2.28
name: all_cuda-128_arch-x86_64
3 changes: 0 additions & 3 deletions conda/recipes/librmm/build.sh

This file was deleted.

24 changes: 12 additions & 12 deletions conda/recipes/librmm/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,14 @@ cache:
source:
path: ../../..

requirements:
build:
- cmake ${{ cmake_version }}
- ninja
- ${{ compiler("c") }}
- ${{ compiler("cxx") }}
- ${{ compiler("cuda") }}
- cuda-version =${{ cuda_version }}
- ${{ stdlib("c") }}

build:
script:
file: build.sh
content:
- ./build.sh -n -v clean librmm tests benchmarks --cmake-args=\"-DCMAKE_INSTALL_LIBDIR=lib\"
secrets:
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- AWS_SESSION_TOKEN

env:
CMAKE_C_COMPILER_LAUNCHER: ${{ env.get("CMAKE_C_COMPILER_LAUNCHER") }}
CMAKE_CUDA_COMPILER_LAUNCHER: ${{ env.get("CMAKE_CUDA_COMPILER_LAUNCHER") }}
Expand All @@ -47,6 +37,16 @@ cache:
SCCACHE_S3_NO_CREDENTIALS: ${{ env.get("SCCACHE_S3_NO_CREDENTIALS") }}
SCCACHE_S3_KEY_PREFIX: librmm-${{ env.get("RAPIDS_CONDA_ARCH") }}

requirements:
build:
- cmake ${{ cmake_version }}
- ninja
- ${{ compiler("c") }}
- ${{ compiler("cxx") }}
- ${{ compiler("cuda") }}
- cuda-version =${{ cuda_version }}
- ${{ stdlib("c") }}

outputs:
- package:
name: librmm
Expand Down
4 changes: 0 additions & 4 deletions conda/recipes/rmm/build.sh

This file was deleted.

6 changes: 3 additions & 3 deletions conda/recipes/rmm/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ context:
cuda_version: ${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[:2] | join(".") }}
cuda_major: ${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[0] }}
date_string: ${{ env.get("RAPIDS_DATE_STRING") }}
py_version: ${{ env.get("RAPIDS_PY_VERSION") }}
py_version: ${{ env.get("RAPIDS_PY_VERSION") | version_to_buildstring }}
head_rev: ${{ git.head_rev(".")[:8] }}

package:
Expand All @@ -19,12 +19,12 @@ source:
build:
string: cuda${{ cuda_major }}_py${{ py_version }}_${{ date_string }}_${{ head_rev }}
script:
file: build.sh
content:
- ./build.sh -v clean rmm --cmake-args=\"-DCMAKE_INSTALL_LIBDIR=lib\"
secrets:
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- AWS_SESSION_TOKEN

env:
CMAKE_C_COMPILER_LAUNCHER: ${{ env.get("CMAKE_C_COMPILER_LAUNCHER") }}
CMAKE_CUDA_COMPILER_LAUNCHER: ${{ env.get("CMAKE_CUDA_COMPILER_LAUNCHER") }}
Expand Down
3 changes: 2 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,8 @@ dependencies:
- nbsphinx
- numba>=0.59.1,<0.61.0a0
- numpydoc
- sphinx
# this pin can be reverted when https://github.com/spatialaudio/nbsphinx/issues/825 is resolved
- sphinx<8.2.0
- sphinx_rtd_theme
- sphinx-copybutton
- sphinx-markdown-tables
Expand Down

0 comments on commit aa5d0b2

Please sign in to comment.