Skip to content

Commit 3414c78

Browse files
raydouglassraydouglass
authoredMay 29, 2024
Merge pull request rapidsai#1390 from trxcllnt/branch-24.08-merge-24.06
Fix forward-merge `branch-24.06` into `branch-24.08`
2 parents f4ec75f + efee9f7 commit 3414c78

17 files changed

+327
-91
lines changed
 

‎ci/build_docs.sh

+6-12
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,21 @@ set -euo pipefail
66
rapids-logger "Create test conda environment"
77
. /opt/conda/etc/profile.d/conda.sh
88

9+
rapids-logger "Downloading artifacts from previous jobs"
10+
CPP_CHANNEL="$(rapids-download-conda-from-s3 cpp)"
11+
PYTHON_CHANNEL="$(rapids-download-conda-from-s3 python)"
12+
913
rapids-dependency-file-generator \
1014
--output conda \
1115
--file_key docs \
12-
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
16+
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \
17+
--prepend-channel "${CPP_CHANNEL}" --prepend-channel "${PYTHON_CHANNEL}" | tee env.yaml
1318

1419
rapids-mamba-retry env create --yes -f env.yaml -n docs
1520
conda activate docs
1621

1722
rapids-print-env
1823

19-
rapids-logger "Downloading artifacts from previous jobs"
20-
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
21-
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
22-
23-
rapids-mamba-retry install \
24-
--channel "${CPP_CHANNEL}" \
25-
--channel "${PYTHON_CHANNEL}" \
26-
libcuspatial \
27-
cuspatial \
28-
cuproj
29-
3024
export RAPIDS_VERSION="$(rapids-version)"
3125
export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
3226
export RAPIDS_VERSION_NUMBER="24.08"

‎ci/release/update-version.sh

+3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; prin
4545
DEPENDENCIES=(
4646
cudf
4747
cuml
48+
cuspatial
4849
libcudf
50+
libcuspatial
51+
libcuspatial-tests
4952
librmm
5053
rmm
5154
cuspatial

‎ci/test_cpp.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ set -euo pipefail
55

66
. /opt/conda/etc/profile.d/conda.sh
77

8+
9+
rapids-logger "Downloading artifacts from previous jobs"
10+
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
11+
812
rapids-logger "Generate C++ testing dependencies"
913
rapids-dependency-file-generator \
1014
--output conda \
11-
--file_key test_cpp \
12-
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml
15+
--file-key test_cpp \
16+
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" \
17+
--prepend-channel "${CPP_CHANNEL}" | tee env.yaml
1318

1419
rapids-mamba-retry env create --yes -f env.yaml -n test
1520

@@ -18,7 +23,6 @@ set +u
1823
conda activate test
1924
set -u
2025

21-
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
2226
RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
2327
mkdir -p "${RAPIDS_TESTS_DIR}"
2428

@@ -27,10 +31,6 @@ export CUSPATIAL_HOME="${PWD}"
2731

2832
rapids-print-env
2933

30-
rapids-mamba-retry install \
31-
--channel "${CPP_CHANNEL}" \
32-
libcuspatial libcuspatial-tests
33-
3434
rapids-logger "Check GPU usage"
3535
nvidia-smi
3636

‎ci/test_notebooks.sh

+7-11
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ set -euo pipefail
55

66
. /opt/conda/etc/profile.d/conda.sh
77

8+
rapids-logger "Downloading artifacts from previous jobs"
9+
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
10+
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
11+
812
rapids-logger "Generate notebook testing dependencies"
913
rapids-dependency-file-generator \
1014
--output conda \
11-
--file_key test_notebooks \
12-
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
15+
--file-key test_notebooks \
16+
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \
17+
--prepend-channel "${CPP_CHANNEL}" --prepend-channel "${PYTHON_CHANNEL}" | tee env.yaml
1318

1419
rapids-mamba-retry env create --yes -f env.yaml -n test
1520

@@ -20,15 +25,6 @@ set -u
2025

2126
rapids-print-env
2227

23-
rapids-logger "Downloading artifacts from previous jobs"
24-
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
25-
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
26-
27-
rapids-mamba-retry install \
28-
--channel "${CPP_CHANNEL}" \
29-
--channel "${PYTHON_CHANNEL}" \
30-
cuspatial libcuspatial cuproj
31-
3228
NBTEST="$(realpath "$(dirname "$0")/utils/nbtest.sh")"
3329
pushd notebooks
3430

‎ci/test_python.sh

+7-11
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ set -euo pipefail
55

66
. /opt/conda/etc/profile.d/conda.sh
77

8+
rapids-logger "Downloading artifacts from previous jobs"
9+
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
10+
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
11+
812
rapids-logger "Generate Python testing dependencies"
913
rapids-dependency-file-generator \
1014
--output conda \
11-
--file_key test_python \
12-
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
15+
--file-key test_python \
16+
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \
17+
--prepend-channel "${CPP_CHANNEL}" --prepend-channel "${PYTHON_CHANNEL}" | tee env.yaml
1318

1419
rapids-mamba-retry env create --yes -f env.yaml -n test
1520

@@ -18,10 +23,6 @@ set +u
1823
conda activate test
1924
set -u
2025

21-
rapids-logger "Downloading artifacts from previous jobs"
22-
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
23-
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
24-
2526
RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
2627
RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}
2728
mkdir -p "${RAPIDS_TESTS_DIR}" "${RAPIDS_COVERAGE_DIR}"
@@ -31,11 +32,6 @@ export CUSPATIAL_HOME="${PWD}"
3132

3233
rapids-print-env
3334

34-
rapids-mamba-retry install \
35-
--channel "${CPP_CHANNEL}" \
36-
--channel "${PYTHON_CHANNEL}" \
37-
libcuspatial cuspatial cuproj
38-
3935
rapids-logger "Check GPU usage"
4036
nvidia-smi
4137

‎conda/environments/all_cuda-118_arch-x86_64.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ dependencies:
2323
- ipython
2424
- ipywidgets
2525
- libcudf==24.8.*
26+
- libcuspatial-tests==24.8.*
27+
- libcuspatial==24.8.*
2628
- librmm==24.8.*
2729
- myst-parser
2830
- nbsphinx

‎conda/environments/all_cuda-122_arch-x86_64.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ dependencies:
2626
- ipython
2727
- ipywidgets
2828
- libcudf==24.8.*
29+
- libcuspatial-tests==24.8.*
30+
- libcuspatial==24.8.*
2931
- librmm==24.8.*
3032
- myst-parser
3133
- nbsphinx

‎cpp/benchmarks/CMakeLists.txt

+21-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2019-2021, NVIDIA CORPORATION.
2+
# Copyright (c) 2019-2024, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -23,6 +23,17 @@ add_library(cuspatial_benchmark_common OBJECT
2323

2424
target_compile_features(cuspatial_benchmark_common PUBLIC cxx_std_17 cuda_std_17)
2525

26+
set_target_properties(cuspatial_benchmark_common
27+
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "$<BUILD_INTERFACE:${CUSPATIAL_BINARY_DIR}/benchmarks>"
28+
INSTALL_RPATH "\$ORIGIN/../../../lib"
29+
CXX_STANDARD 17
30+
CXX_STANDARD_REQUIRED ON
31+
CUDA_STANDARD 17
32+
CUDA_STANDARD_REQUIRED ON
33+
POSITION_INDEPENDENT_CODE ON
34+
INTERFACE_POSITION_INDEPENDENT_CODE ON
35+
)
36+
2637
target_link_libraries(cuspatial_benchmark_common
2738
PUBLIC benchmark::benchmark
2839
cudf::cudftestutil
@@ -43,6 +54,10 @@ function(ConfigureBench CMAKE_BENCH_NAME)
4354
set_target_properties(${CMAKE_BENCH_NAME}
4455
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "$<BUILD_INTERFACE:${CUSPATIAL_BINARY_DIR}/benchmarks>"
4556
INSTALL_RPATH "\$ORIGIN/../../../lib"
57+
CXX_STANDARD 17
58+
CXX_STANDARD_REQUIRED ON
59+
CUDA_STANDARD 17
60+
CUDA_STANDARD_REQUIRED ON
4661
)
4762
target_link_libraries(${CMAKE_BENCH_NAME} PRIVATE benchmark::benchmark_main cuspatial_benchmark_common)
4863
install(
@@ -61,7 +76,11 @@ function(ConfigureNVBench CMAKE_BENCH_NAME)
6176
${CMAKE_BENCH_NAME}
6277
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "$<BUILD_INTERFACE:${CUSPATIAL_BINARY_DIR}/benchmarks>"
6378
INSTALL_RPATH "\$ORIGIN/../../../lib"
64-
)
79+
CXX_STANDARD 17
80+
CXX_STANDARD_REQUIRED ON
81+
CUDA_STANDARD 17
82+
CUDA_STANDARD_REQUIRED ON
83+
)
6584
target_link_libraries(
6685
${CMAKE_BENCH_NAME} PRIVATE cuspatial_benchmark_common nvbench::main
6786
)

‎cpp/include/cuspatial/detail/index/construction/phase_2.cuh

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ inline rmm::device_uvector<uint32_t> flatten_point_keys(
8585
keys_and_levels + num_valid_nodes,
8686
flattened_keys.begin(),
8787
[last_level = max_depth - 1] __device__(auto const& val) {
88-
bool is_parent{false};
89-
uint32_t key{}, level{};
90-
thrust::tie(key, level, is_parent) = val;
88+
auto& key = thrust::get<0>(val);
89+
auto& level = thrust::get<1>(val);
90+
auto& is_parent = thrust::get<2>(val);
9191
// if this is a parent node, return max_key. otherwise
9292
// compute the key for one level up the tree. Leaf nodes
9393
// whose keys are zero will be removed in a subsequent

0 commit comments

Comments
 (0)
Please sign in to comment.