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

Generate pyproject dependencies using dfg #12906

Merged
merged 25 commits into from
Mar 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f010c90
Update dfg version.
vyasr Mar 8, 2023
7109f58
Remove now unnecessary streams lib build reqs in tests, library is bu…
vyasr Mar 8, 2023
f0fd46e
Make arrow pinnings more precise.
vyasr Mar 8, 2023
c7e3e3a
Fix pyarrow pinning.
vyasr Mar 9, 2023
396eec6
Remove unnecessary Java CMake flag.
vyasr Mar 8, 2023
19a361f
Move cuda-python to run requirements.
vyasr Mar 8, 2023
29f9398
Add numpy and move dlpack to conda-only.
vyasr Mar 9, 2023
641475b
Consistently use PEP 440 compatible versions for consistency between …
vyasr Mar 9, 2023
7eb87a2
Only use PEP 440 compliant versions for rmm.
vyasr Mar 9, 2023
7033697
Use to generate pyproject.toml dependencies.
vyasr Mar 9, 2023
ddd20c2
Generate cudf run dependencies.
vyasr Mar 9, 2023
a4a741a
Generate test deps.
vyasr Mar 9, 2023
0bfac4a
Generate dask_cudf dependencies.
vyasr Mar 9, 2023
eda3144
Move kafka data into pyproject to be able to leverage dfg.
vyasr Mar 9, 2023
aa6011a
Generate cudf_kafka.
vyasr Mar 9, 2023
5eee4ba
Generate custreamz.
vyasr Mar 9, 2023
de23ed1
Update update-version.sh.
vyasr Mar 9, 2023
33f088e
Use proper msgpack names for conda and pyproject.
vyasr Mar 9, 2023
ac77bbf
Add test_python_common to test_python.
vyasr Mar 10, 2023
8a6ecc7
Install dask/distributed/dask-cuda from source for dask_cudf testing.
vyasr Mar 10, 2023
2ee8afa
Put back accidentally deleted matrix fallback.
vyasr Mar 10, 2023
209a24b
Fix numpy pinnings in generated files.
vyasr Mar 10, 2023
0e75728
Merge remote-tracking branch 'origin/branch-23.04' into feat/pyprojec…
vyasr Mar 14, 2023
77ab35b
Add comments explaining that arrow versions must be kept in sync.
vyasr Mar 15, 2023
6be8467
Move pytest-cov to common.
vyasr Mar 15, 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
3 changes: 2 additions & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,6 @@ jobs:
with:
build_type: pull-request
package-name: dask_cudf
test-before: "RAPIDS_PY_WHEEL_NAME=cudf_cu11 rapids-download-wheels-from-s3 ./local-cudf-dep && python -m pip install --no-deps ./local-cudf-dep/cudf*.whl"
# Install the cudf we just built, and also test against latest dask/distributed/dask-cuda.
test-before: "RAPIDS_PY_WHEEL_NAME=cudf_cu11 rapids-download-wheels-from-s3 ./local-cudf-dep && python -m pip install --no-deps ./local-cudf-dep/cudf*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
vyasr marked this conversation as resolved.
Show resolved Hide resolved
test-unittest: "python -m pytest -v -n 8 ./python/dask_cudf/dask_cudf/tests"
2 changes: 2 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,6 @@ jobs:
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
package-name: dask_cudf
# Test against latest dask/distributed/dask-cuda.
test-before: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
test-unittest: "python -m pytest -v -n 8 ./python/dask_cudf/dask_cudf/tests"
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ repos:
^CHANGELOG.md$
)
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.4.0
rev: v1.5.1
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
Expand Down
16 changes: 10 additions & 6 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}')
NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
NEXT_UCX_PY_VERSION="$(curl -sL https://version.gpuci.io/rapids/${NEXT_SHORT_TAG}).*"

# Need to distutils-normalize the versions for some use cases
CURRENT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${CURRENT_SHORT_TAG}'))")
NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")
echo "current is ${CURRENT_SHORT_TAG_PEP440}, next is ${NEXT_SHORT_TAG_PEP440}"

echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"

# Inplace sed replace; workaround for Linux and Mac
Expand Down Expand Up @@ -70,9 +75,10 @@ sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/cudf/source/

# bump rmm & dask-cuda
for FILE in conda/environments/*.yaml dependencies.yaml; do
sed_runner "s/dask-cuda=${CURRENT_SHORT_TAG}/dask-cuda=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rmm=${CURRENT_SHORT_TAG}/rmm=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rmm-cu11=${CURRENT_SHORT_TAG}/rmm-cu11=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/dask-cuda==${CURRENT_SHORT_TAG_PEP440}/dask-cuda==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
sed_runner "s/rmm==${CURRENT_SHORT_TAG_PEP440}/rmm==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
sed_runner "s/cudf==${CURRENT_SHORT_TAG_PEP440}/cudf==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
sed_runner "s/cudf_kafka==${CURRENT_SHORT_TAG_PEP440}/cudf_kafka==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
done

# Doxyfile update
Expand All @@ -86,13 +92,11 @@ sed_runner "s/cudf=${CURRENT_SHORT_TAG}/cudf=${NEXT_SHORT_TAG}/g" README.md
sed_runner "s/CUDF_TAG branch-${CURRENT_SHORT_TAG}/CUDF_TAG branch-${NEXT_SHORT_TAG}/" cpp/examples/basic/CMakeLists.txt
sed_runner "s/CUDF_TAG branch-${CURRENT_SHORT_TAG}/CUDF_TAG branch-${NEXT_SHORT_TAG}/" cpp/examples/strings/CMakeLists.txt

# Need to distutils-normalize the original version
NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")

# Dependency versions in pyproject.toml
sed_runner "s/rmm==.*\",/rmm==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/cudf/pyproject.toml
sed_runner "s/cudf==.*\",/cudf==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/dask_cudf/pyproject.toml

for FILE in .github/workflows/*.yaml; do
sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" ${FILE};
done
2 changes: 1 addition & 1 deletion ci/test_java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ set +e

rapids-logger "Run Java tests"
pushd java
mvn test -B -DCUDF_JNI_ARROW_STATIC=OFF -DCUDF_JNI_ENABLE_PROFILING=OFF
mvn test -B -DCUDF_JNI_ENABLE_PROFILING=OFF
wence- marked this conversation as resolved.
Show resolved Hide resolved
popd

rapids-logger "Test script exiting with value: $EXITCODE"
Expand Down
13 changes: 7 additions & 6 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- cupy>=9.5.0,<12.0.0a0
- cxx-compiler
- cython>=0.29,<0.30
- dask-cuda=23.04.*
- dask-cuda==23.4.*
- dask>=2023.1.1
- distributed>=2023.1.1
- dlpack>=0.5,<0.6.0a0
Expand All @@ -32,11 +32,12 @@ dependencies:
- gcc_linux-64=11.*
- hypothesis
- ipython
- libarrow=10
- libarrow==10.0.1.*
- librdkafka=1.7.0
- librmm=23.04.*
- librmm==23.4.*
- mimesis>=4.1.0
- moto>=4.0.8
- msgpack-python
- myst-nb
- nbsphinx
- ninja
Expand All @@ -53,19 +54,19 @@ dependencies:
- pre-commit
- protobuf>=4.21.6,<4.22
- ptxcompiler
- pyarrow=10
- pyarrow==10.0.1.*
- pydata-sphinx-theme
- pyorc
- pytest
- pytest-benchmark
- pytest-cases
- pytest-cov
- pytest-xdist
- python-confluent-kafka=1.7.0
- python-confluent-kafka==1.7.0
- python-snappy>=0.6.0
- python>=3.8,<3.11
- pytorch<1.12.0
- rmm=23.04.*
- rmm==23.4.*
- s3fs>=2022.3.0
- scikit-build>=0.13.1
- scipy
Expand Down
2 changes: 2 additions & 0 deletions cpp/cmake/thirdparty/get_arrow.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,8 @@ endfunction()

if(NOT DEFINED CUDF_VERSION_Arrow)
set(CUDF_VERSION_Arrow
# This version must be kept in sync with the libarrow version pinned for builds in
# dependencies.yaml.
10.0.1
CACHE STRING "The version of Arrow to find (or build)"
)
Expand Down
Loading