Skip to content

Commit

Permalink
Merge pull request cupy#8970 from jakirkham/use_rapids_25.02
Browse files Browse the repository at this point in the history
Fix `cupyx.scipy.spatial.distance`'s `cdist` for RAPIDS 24.12 compatibility
  • Loading branch information
kmaehashi authored and chainer-ci committed Feb 22, 2025
1 parent f5e36bf commit d7313aa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .pfnci/linux/tests/cuda-rapids.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
ARG BASE_IMAGE="rapidsai/base:25.02a-cuda12.5-py3.11"
ARG BASE_IMAGE="rapidsai/base:25.02-cuda12.8-py3.11"
FROM ${BASE_IMAGE}

USER root

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get -qqy update && \
apt-get -qqy install build-essential cuda-toolkit-12-5 ccache git curl
apt-get -qqy install build-essential cuda-toolkit-12-8 ccache git curl

ENV CUDA_PATH "/usr/local/cuda"
ENV PATH "/usr/lib/ccache:${PATH}"
2 changes: 1 addition & 1 deletion cupyx/scipy/spatial/distance.py
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ def cdist(XA, XB, metric='euclidean', out=None, **kwargs):
output_arr = out if out is not None else cupy.zeros((mA, mB),
dtype=XA.dtype,
order=XA_order)
pairwise_distance(XA, XB, output_arr, metric, p=p)
pairwise_distance(XA, XB, output_arr, metric, p)
return output_arr
else:
raise ValueError('Unknown Distance Metric: %s' % mstr)
Expand Down

0 comments on commit d7313aa

Please sign in to comment.