Skip to content
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
1 change: 1 addition & 0 deletions conda/environments/raft_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
- rapids-doc-env=22.02.*
- rmm=22.02.*
- dask-cuda=22.02.*
- ucx>=1.12.1
- ucx-py=0.26.*
- ucx-proc=*=gpu
- doxygen>=1.8.20
Expand Down
1 change: 1 addition & 0 deletions conda/environments/raft_dev_cuda11.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
- rapids-doc-env=22.02.*
- rmm=22.02.*
- dask-cuda=22.02.*
- ucx>=1.12.1
- ucx-py=0.26.*
- ucx-proc=*=gpu
- doxygen>=1.8.20
Expand Down
1 change: 1 addition & 0 deletions conda/environments/raft_dev_cuda11.4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
- rapids-doc-env=22.02.*
- rmm=22.02.*
- dask-cuda=22.02.*
- ucx>=1.12.1
- ucx-py=0.26.*
- ucx-proc=*=gpu
- doxygen>=1.8.20
Expand Down
1 change: 1 addition & 0 deletions conda/environments/raft_dev_cuda11.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
- rapids-doc-env=22.02.*
- rmm=22.02.*
- dask-cuda=22.02.*
- ucx>=1.12.1
- ucx-py=0.26.*
- ucx-proc=*=gpu
- doxygen>=1.8.20
Expand Down
2 changes: 2 additions & 0 deletions conda/recipes/pyraft/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ucx_version:
- "1.12.1"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be >=1.12.1

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intent here is to ensure we have a fixed version at build time so that this sets a minimum version at runtime.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I thought we wanted to build using the latest version available. What's the difference between doing this and using pin_compatible for the runtime dependency?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using the latest version since 1.12.1 is latest. However we may want more flexibility if a later 1.12.x breaks something and we need to pin an older version in the metapackage. Also we may want to control which version we build against to make it easier to align with other packages that have ucx constraints as well.

FWIW am proposing something similar in conda-forge ( conda-forge/conda-forge-pinning-feedstock#2847 ) though maybe we can wait to see what others think about that and update if needed.

2 changes: 2 additions & 0 deletions conda/recipes/pyraft/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ requirements:
- cudatoolkit {{ cuda_version }}.*
- cuda-python >=11.5,<12.0
- nccl>=2.9.9
- ucx {{ ucx_version }}
- ucx-py {{ ucx_py_version }}
- ucx-proc=*=gpu
run:
Expand All @@ -42,6 +43,7 @@ requirements:
- libraft-headers {{ version }}
- nccl>=2.9.9
- rmm {{ minor_version }}
- ucx >={{ ucx_version }}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should remove the >= here

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see comment above

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That said, we can probably drop this line as the feedstock has run_exports, which covers adding and pinning this.

- ucx-py {{ ucx_py_version }}
- ucx-proc=*=gpu
- dask>=2022.03.0
Expand Down