Skip to content

Commit 0ccfd06

Browse files
jameslambjameslamb
committed
use rmm/librmm wheels from rapidsai/rmm#1644, temporarily skip conda jobs
1 parent 4052116 commit 0ccfd06

File tree

4 files changed

+158
-90
lines changed

4 files changed

+158
-90
lines changed

‎.github/workflows/pr.yaml‎

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ jobs:
1313
pr-builder:
1414
needs:
1515
- checks
16-
- conda-cpp-build
17-
- conda-cpp-checks
18-
- conda-cpp-tests
19-
- conda-python-build
20-
- conda-python-cudf-tests
21-
- conda-python-other-tests
22-
- conda-java-tests
16+
# - conda-cpp-build
17+
# - conda-cpp-checks
18+
# - conda-cpp-tests
19+
# - conda-python-build
20+
# - conda-python-cudf-tests
21+
# - conda-python-other-tests
22+
# - conda-java-tests
2323
- static-configure
24-
- conda-notebook-tests
25-
- docs-build
24+
# - conda-notebook-tests
25+
# - docs-build
2626
- wheel-build-cpp
2727
- wheel-build-python
2828
- wheel-tests-python
2929
- wheel-build-cudf-polars
3030
- wheel-tests-cudf-polars
3131
- wheel-build-dask-cudf
3232
- wheel-tests-dask-cudf
33-
- devcontainer
33+
# - devcontainer
3434
- unit-tests-cudf-pandas
3535
- pandas-tests
3636
- pandas-tests-diff
@@ -41,56 +41,56 @@ jobs:
4141
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
4242
with:
4343
enable_check_generated_files: false
44-
conda-cpp-build:
45-
needs: checks
46-
secrets: inherit
47-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
48-
with:
49-
build_type: pull-request
50-
conda-cpp-checks:
51-
needs: conda-cpp-build
52-
secrets: inherit
53-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
54-
with:
55-
build_type: pull-request
56-
enable_check_symbols: true
57-
conda-cpp-tests:
58-
needs: conda-cpp-build
59-
secrets: inherit
60-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
61-
with:
62-
build_type: pull-request
63-
conda-python-build:
64-
needs: conda-cpp-build
65-
secrets: inherit
66-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
67-
with:
68-
build_type: pull-request
69-
conda-python-cudf-tests:
70-
needs: conda-python-build
71-
secrets: inherit
72-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
73-
with:
74-
build_type: pull-request
75-
script: "ci/test_python_cudf.sh"
76-
conda-python-other-tests:
77-
# Tests for dask_cudf, custreamz, cudf_kafka are separated for CI parallelism
78-
needs: conda-python-build
79-
secrets: inherit
80-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
81-
with:
82-
build_type: pull-request
83-
script: "ci/test_python_other.sh"
84-
conda-java-tests:
85-
needs: conda-cpp-build
86-
secrets: inherit
87-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
88-
with:
89-
build_type: pull-request
90-
node_type: "gpu-v100-latest-1"
91-
arch: "amd64"
92-
container_image: "rapidsai/ci-conda:latest"
93-
run_script: "ci/test_java.sh"
44+
# conda-cpp-build:
45+
# needs: checks
46+
# secrets: inherit
47+
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
48+
# with:
49+
# build_type: pull-request
50+
# conda-cpp-checks:
51+
# needs: conda-cpp-build
52+
# secrets: inherit
53+
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
54+
# with:
55+
# build_type: pull-request
56+
# enable_check_symbols: true
57+
# conda-cpp-tests:
58+
# needs: conda-cpp-build
59+
# secrets: inherit
60+
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
61+
# with:
62+
# build_type: pull-request
63+
# conda-python-build:
64+
# needs: conda-cpp-build
65+
# secrets: inherit
66+
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
67+
# with:
68+
# build_type: pull-request
69+
# conda-python-cudf-tests:
70+
# needs: conda-python-build
71+
# secrets: inherit
72+
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
73+
# with:
74+
# build_type: pull-request
75+
# script: "ci/test_python_cudf.sh"
76+
# conda-python-other-tests:
77+
# # Tests for dask_cudf, custreamz, cudf_kafka are separated for CI parallelism
78+
# needs: conda-python-build
79+
# secrets: inherit
80+
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
81+
# with:
82+
# build_type: pull-request
83+
# script: "ci/test_python_other.sh"
84+
# conda-java-tests:
85+
# needs: conda-cpp-build
86+
# secrets: inherit
87+
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
88+
# with:
89+
# build_type: pull-request
90+
# node_type: "gpu-v100-latest-1"
91+
# arch: "amd64"
92+
# container_image: "rapidsai/ci-conda:latest"
93+
# run_script: "ci/test_java.sh"
9494
static-configure:
9595
needs: checks
9696
secrets: inherit
@@ -101,26 +101,26 @@ jobs:
101101
# primary static consumers (Spark) are not in conda anyway.
102102
container_image: "rapidsai/ci-wheel:latest"
103103
run_script: "ci/configure_cpp_static.sh"
104-
conda-notebook-tests:
105-
needs: conda-python-build
106-
secrets: inherit
107-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
108-
with:
109-
build_type: pull-request
110-
node_type: "gpu-v100-latest-1"
111-
arch: "amd64"
112-
container_image: "rapidsai/ci-conda:latest"
113-
run_script: "ci/test_notebooks.sh"
114-
docs-build:
115-
needs: conda-python-build
116-
secrets: inherit
117-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
118-
with:
119-
build_type: pull-request
120-
node_type: "gpu-v100-latest-1"
121-
arch: "amd64"
122-
container_image: "rapidsai/ci-conda:latest"
123-
run_script: "ci/build_docs.sh"
104+
# conda-notebook-tests:
105+
# needs: conda-python-build
106+
# secrets: inherit
107+
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
108+
# with:
109+
# build_type: pull-request
110+
# node_type: "gpu-v100-latest-1"
111+
# arch: "amd64"
112+
# container_image: "rapidsai/ci-conda:latest"
113+
# run_script: "ci/test_notebooks.sh"
114+
# docs-build:
115+
# needs: conda-python-build
116+
# secrets: inherit
117+
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
118+
# with:
119+
# build_type: pull-request
120+
# node_type: "gpu-v100-latest-1"
121+
# arch: "amd64"
122+
# container_image: "rapidsai/ci-conda:latest"
123+
# run_script: "ci/build_docs.sh"
124124
wheel-build-cpp:
125125
needs: checks
126126
secrets: inherit
@@ -181,16 +181,16 @@ jobs:
181181
matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]))
182182
build_type: pull-request
183183
script: ci/test_wheel_dask_cudf.sh
184-
devcontainer:
185-
secrets: inherit
186-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
187-
with:
188-
arch: '["amd64"]'
189-
cuda: '["12.5"]'
190-
build_command: |
191-
sccache -z;
192-
build-all -DBUILD_BENCHMARKS=ON --verbose;
193-
sccache -s;
184+
# devcontainer:
185+
# secrets: inherit
186+
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
187+
# with:
188+
# arch: '["amd64"]'
189+
# cuda: '["12.5"]'
190+
# build_command: |
191+
# sccache -z;
192+
# build-all -DBUILD_BENCHMARKS=ON --verbose;
193+
# sccache -s;
194194
unit-tests-cudf-pandas:
195195
needs: wheel-build-python
196196
secrets: inherit

‎ci/build_wheel_cpp.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,28 @@ set -euo pipefail
55

66
package_dir="python/libcudf"
77

8+
# --- start of section to remove ---#
9+
# TODO: remove this before merging
10+
# use librmm and rmm from
11+
RAPIDS_REPOSITORY=rmm \
12+
RAPIDS_BUILD_TYPE=pull-requst \
13+
RAPIDS_REF_NAME=1644 \
14+
RAPIDS_SHA=0701559 \
15+
RAPIDS_PY_WHEEL_NAME="librmm_${RAPIDS_PY_CUDA_SUFFIX}" \
16+
rapids-download-wheels-from-s3 cpp /tmp/libcudf_dist
17+
18+
RAPIDS_REPOSITORY=rmm \
19+
RAPIDS_BUILD_TYPE=pull-requst \
20+
RAPIDS_REF_NAME=1644 \
21+
RAPIDS_SHA=0701559 \
22+
RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" \
23+
rapids-download-wheels-from-s3 python /tmp/libcudf_dist
24+
25+
echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcudf_dist/librmm_*.whl)" >> /tmp/constraints.txt
26+
echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcudf_dist/librmm_*.whl)" >> /tmp/constraints.txt
27+
export PIP_CONSTRAINT=/tmp/constraints.txt
28+
# --- end of section to remove ---#
29+
830
./ci/build_wheel.sh ${package_dir}
931

1032
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"

‎ci/build_wheel_python.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,28 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
1818
RAPIDS_PY_WHEEL_NAME="libcudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcudf_dist
1919

2020
echo "libcudf-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcudf_dist/libcudf_*.whl)" > /tmp/constraints.txt
21+
22+
# --- start of section to remove ---#
23+
# TODO: remove this before merging
24+
# use librmm and rmm from
25+
RAPIDS_REPOSITORY=rmm \
26+
RAPIDS_BUILD_TYPE=pull-requst \
27+
RAPIDS_REF_NAME=1644 \
28+
RAPIDS_SHA=0701559 \
29+
RAPIDS_PY_WHEEL_NAME="librmm_${RAPIDS_PY_CUDA_SUFFIX}" \
30+
rapids-download-wheels-from-s3 cpp /tmp/libcudf_dist
31+
32+
RAPIDS_REPOSITORY=rmm \
33+
RAPIDS_BUILD_TYPE=pull-requst \
34+
RAPIDS_REF_NAME=1644 \
35+
RAPIDS_SHA=0701559 \
36+
RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" \
37+
rapids-download-wheels-from-s3 python /tmp/libcudf_dist
38+
39+
echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcudf_dist/librmm_*.whl)" >> /tmp/constraints.txt
40+
echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcudf_dist/librmm_*.whl)" >> /tmp/constraints.txt
41+
# --- end of section to remove ---#
42+
2143
export PIP_CONSTRAINT="/tmp/constraints.txt"
2244
./ci/build_wheel.sh ${package_dir}
2345

‎ci/cudf_pandas_scripts/run_tests.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,30 @@ else
3838
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
3939
RAPIDS_PY_WHEEL_NAME="libcudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp ./local-cudf-dep
4040
RAPIDS_PY_WHEEL_NAME="cudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python ./local-cudf-dep
41+
42+
# --- start of section to remove ---#
43+
# TODO: remove this before merging
44+
# use librmm and rmm from
45+
RAPIDS_REPOSITORY=rmm \
46+
RAPIDS_BUILD_TYPE=pull-requst \
47+
RAPIDS_REF_NAME=1644 \
48+
RAPIDS_SHA=0701559 \
49+
RAPIDS_PY_WHEEL_NAME="librmm_${RAPIDS_PY_CUDA_SUFFIX}" \
50+
rapids-download-wheels-from-s3 cpp /tmp/local-rmm-dep
51+
52+
RAPIDS_REPOSITORY=rmm \
53+
RAPIDS_BUILD_TYPE=pull-requst \
54+
RAPIDS_REF_NAME=1644 \
55+
RAPIDS_SHA=0701559 \
56+
RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" \
57+
rapids-download-wheels-from-s3 python /tmp/local-rmm-dep
58+
59+
echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/local-rmm-dep/librmm_*.whl)" >> /tmp/constraints.txt
60+
echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/local-rmm-dep/librmm_*.whl)" >> /tmp/constraints.txt
61+
62+
export PIP_CONSTRAINT=/tmp/constraints.txt
63+
# --- end of section to remove ---#
64+
4165
python -m pip install "$(echo ./local-cudf-dep/libcudf_${RAPIDS_PY_CUDA_SUFFIX}*.whl)"
4266
python -m pip install --find-links $(pwd)/local-cudf-dep "$(echo ./local-cudf-dep/cudf_${RAPIDS_PY_CUDA_SUFFIX}*.whl)[test,cudf-pandas-tests]"
4367
fi

0 commit comments

Comments
 (0)