Skip to content

Commit 017f0cc

Browse files
authored
Updates conda versioning to install correct dependencies, changes CI script to better track deps from individual build installs (#3066)
* Updates versioning in conda recipes so the correct dependencies are installed, specifically UCX-Py and CTK. These were causing CI to fall back to installs from the nightly channel instead of the packages built from the PR sources, since the older nightlies were the only ones compatible. This also resulted in the wrong CTK version to be installed in some cases. * Changes CI script to install each built package individually so log output shows the deps installed for each one. If all packages are installed in one install line, developers debugging CI can't tell which packages caused certain dependencies to be installed. Authors: - Seunghwa Kang (https://github.com/seunghwak) - Rick Ratzel (https://github.com/rlratzel) Approvers: - Bradley Dice (https://github.com/bdice) - Ray Douglass (https://github.com/raydouglass) URL: #3066
1 parent c745570 commit 017f0cc

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

ci/gpu/build.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,18 @@ else
135135
gpuci_logger "Building and installing cugraph-pyg..."
136136
gpuci_conda_retry mambabuild conda/recipes/cugraph-pyg --no-build-id --croot ${CONDA_BLD_DIR} -c ${CONDA_ARTIFACT_PATH} --python=${PYTHON}
137137

138-
gpuci_logger "Installing pylibcugraph, cugraph, cugraph-pyg and cugraph-service from build / artifact dirs"
139-
gpuci_mamba_retry install -c ${CONDA_BLD_DIR} -c ${CONDA_ARTIFACT_PATH} pylibcugraph cugraph cugraph-pyg cugraph-service-server cugraph-service-client
138+
#gpuci_logger "Installing pylibcugraph, cugraph, cugraph-pyg and cugraph-service from build / artifact dirs"
139+
#gpuci_mamba_retry install -c ${CONDA_BLD_DIR} -c ${CONDA_ARTIFACT_PATH} pylibcugraph cugraph cugraph-pyg cugraph-service-server cugraph-service-client
140+
gpuci_logger "Installing pylibcugraph from build / artifact dirs"
141+
gpuci_mamba_retry install -c ${CONDA_BLD_DIR} -c ${CONDA_ARTIFACT_PATH} pylibcugraph
142+
gpuci_logger "Installing cugraph from build / artifact dirs"
143+
gpuci_mamba_retry install -c ${CONDA_BLD_DIR} -c ${CONDA_ARTIFACT_PATH} cugraph
144+
gpuci_logger "Installing cugraph-pyg from build / artifact dirs"
145+
gpuci_mamba_retry install -c ${CONDA_BLD_DIR} -c ${CONDA_ARTIFACT_PATH} cugraph-pyg
146+
gpuci_logger "Installing cugraph-service-server from build / artifact dirs"
147+
gpuci_mamba_retry install -c ${CONDA_BLD_DIR} -c ${CONDA_ARTIFACT_PATH} cugraph-service-server
148+
gpuci_logger "Installing cugraph-service-client from build / artifact dirs"
149+
gpuci_mamba_retry install -c ${CONDA_BLD_DIR} -c ${CONDA_ARTIFACT_PATH} cugraph-service-client
140150
fi
141151

142152
################################################################################

conda/recipes/cugraph-pyg/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ requirements:
3535
- numba>=0.56.2
3636
- numpy
3737
- pytorch
38-
- cudatoolkit=11.6
38+
- cudatoolkit {{ cuda_version }}.*
3939
# - pyg (uncomment once pyg 2.2 is released)
4040

4141
tests: # [linux64]

conda/recipes/cugraph-service/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# conda build -c nvidia -c rapidsai -c conda-forge .
55
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
66
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
7+
{% set ucx_py_version=environ.get('UCX_PY_VERSION') %}
78

89
package:
910
name: cugraph-service-split
@@ -53,7 +54,7 @@ outputs:
5354
- {{ pin_compatible('cugraph', exact=True) }}
5455
- cupy >=9.5.0,<12.0.0a0
5556
- numpy
56-
- ucx-py 0.29.*
57+
- ucx-py {{ ucx_py_version }}
5758
- distributed ==2022.11.1
5859
- dask-cuda {{ minor_version }}.*
5960
- cudf {{ minor_version }}.*

0 commit comments

Comments
 (0)