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

[RELEASE] cuspatial v0.19 #380

Merged
merged 21 commits into from
Apr 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
beba4fb
DOC v0.19 Updates
raydouglass Jan 27, 2021
8fe7232
Merge branch-0.18 into branch-0.19
ajschmidt8 Feb 3, 2021
1a606f3
Merge pull request #349 from ajschmidt8/branch-0.19-merge-0.18
ajschmidt8 Feb 8, 2021
721850c
Merge pull request #356 from rapidsai/branch-0.18
GPUtester Feb 16, 2021
429ecd3
Merge pull request #358 from rapidsai/branch-0.18
GPUtester Feb 17, 2021
d3c3cd8
Update make_counting_transform_iterator namespace in tests (#353)
trxcllnt Feb 23, 2021
4c38aa8
ENH Build with `cmake --build` & Pass ccache variables to conda recip…
jjacobelli Feb 23, 2021
d039470
fix changelog conflicts
ajschmidt8 Feb 26, 2021
66f7605
Merge pull request #363 from ajschmidt8/branch-0.19-merge-0.18
ajschmidt8 Feb 26, 2021
68e7072
prepare changelog (#364)
ajschmidt8 Mar 1, 2021
738ac78
Pin gdal to 3.2.x (#347)
weiji14 Mar 5, 2021
d5535a9
Update Changelog Link (#366)
ajschmidt8 Mar 10, 2021
d43f506
Eliminate literals passed to device_uvector::set_element_async (#367)
harrism Mar 18, 2021
8233d69
Auto-label PRs based on their content (#337)
jolorunyomi Mar 19, 2021
5dedd86
Rename cartesian_product_group_index_iterator_test.cpp to .cu (#369)
trxcllnt Mar 25, 2021
09817f0
Rework libcuspatial CMakeLists.txt to export targets for CPM (#365)
trxcllnt Mar 30, 2021
dbd86c1
Update conda recipes pinning of repo dependencies (#370)
mike-wendt Mar 30, 2021
cce2be3
Revert "Update conda recipes pinning of repo dependencies" (#372)
raydouglass Apr 1, 2021
29d5db6
Set `install_rpath` for libcuspatial (#375)
trxcllnt Apr 8, 2021
52da71c
ENH Reduce cuspatial library size (#373)
dillon-cullinan Apr 8, 2021
f73e0bf
update changelog
raydouglass Apr 21, 2021
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
24 changes: 24 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# https://github.com/actions/labeler#common-examples
# Adapted from https://github.com/rapidsai/cuspatial/blob/main/.github/CODEOWNERS
# Labels culled from https://github.com/rapidsai/cuspatial/labels

Python:
- 'python/**'
- 'notebooks/**'

cpp:
- 'cpp/**'

CMake:
- '**/CMakeLists.txt'
- '**/cmake/**'

gpuCI:
- 'ci/**'

conda:
- 'conda/**'

Java:
- 'java/**'

11 changes: 11 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: "Pull Request Labeler"
on:
- pull_request_target

jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@main
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
# cuSpatial 0.19.0 (21 Apr 2021)

## 🐛 Bug Fixes

- Revert "Update conda recipes pinning of repo dependencies" ([#372](https://github.com//rapidsai/cuspatial/pull/372)) [@raydouglass](https://github.com/raydouglass)
- Update conda recipes pinning of repo dependencies ([#370](https://github.com//rapidsai/cuspatial/pull/370)) [@mike-wendt](https://github.com/mike-wendt)
- Rename cartesian_product_group_index_iterator_test.cpp to .cu ([#369](https://github.com//rapidsai/cuspatial/pull/369)) [@trxcllnt](https://github.com/trxcllnt)

## 🚀 New Features

- Auto-label PRs based on their content ([#337](https://github.com//rapidsai/cuspatial/pull/337)) [@jolorunyomi](https://github.com/jolorunyomi)

## 🛠️ Improvements

- Set `install_rpath` for libcuspatial ([#375](https://github.com//rapidsai/cuspatial/pull/375)) [@trxcllnt](https://github.com/trxcllnt)
- ENH Reduce cuspatial library size ([#373](https://github.com//rapidsai/cuspatial/pull/373)) [@dillon-cullinan](https://github.com/dillon-cullinan)
- Eliminate literals passed to device_uvector::set_element_async ([#367](https://github.com//rapidsai/cuspatial/pull/367)) [@harrism](https://github.com/harrism)
- Update Changelog Link ([#366](https://github.com//rapidsai/cuspatial/pull/366)) [@ajschmidt8](https://github.com/ajschmidt8)
- Rework libcuspatial CMakeLists.txt to export targets for CPM ([#365](https://github.com//rapidsai/cuspatial/pull/365)) [@trxcllnt](https://github.com/trxcllnt)
- Prepare Changelog for Automation ([#364](https://github.com//rapidsai/cuspatial/pull/364)) [@ajschmidt8](https://github.com/ajschmidt8)
- Update 0.18 changelog entry ([#363](https://github.com//rapidsai/cuspatial/pull/363)) [@ajschmidt8](https://github.com/ajschmidt8)
- ENH Build with `cmake --build` & Pass ccache variables to conda recipe & use Ninja in CI ([#359](https://github.com//rapidsai/cuspatial/pull/359)) [@Ethyling](https://github.com/Ethyling)
- Update make_counting_transform_iterator namespace in tests ([#353](https://github.com//rapidsai/cuspatial/pull/353)) [@trxcllnt](https://github.com/trxcllnt)
- Fix merge conflicts in #348 ([#349](https://github.com//rapidsai/cuspatial/pull/349)) [@ajschmidt8](https://github.com/ajschmidt8)
- Pin gdal to 3.2.x ([#347](https://github.com//rapidsai/cuspatial/pull/347)) [@weiji14](https://github.com/weiji14)

# cuSpatial 0.18.0 (24 Feb 2021)

## Documentation 📖
Expand Down
34 changes: 26 additions & 8 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ARGS=$*
# script, and that this script resides in the repo dir!
REPODIR=$(cd $(dirname $0); pwd)

VALIDARGS="clean libcuspatial cuspatial tests -v -g -n -h --show_depr_warn"
VALIDARGS="clean libcuspatial cuspatial tests -v -g -n -h --allgpuarch --show_depr_warn"
HELP="$0 [clean] [libcuspatial] [cuspatial] [tests] [-v] [-g] [-n] [-h] [-l] [--show_depr_warn]
clean - remove all existing build artifacts and configuration (start
over)
Expand All @@ -29,6 +29,7 @@ HELP="$0 [clean] [libcuspatial] [cuspatial] [tests] [-v] [-g] [-n] [-h] [-l] [--
-g - build for debug
-n - no install step
-h - print this text
--allgpuarch - build for all supported GPU architectures
--show_depr_warn - show cmake deprecation warnings
default action (no args) is to build and install 'libcuspatial' then
'cuspatial' targets
Expand All @@ -38,9 +39,10 @@ CUSPATIAL_BUILD_DIR=${REPODIR}/python/cuspatial/build
BUILD_DIRS="${LIBCUSPATIAL_BUILD_DIR} ${CUSPATIAL_BUILD_DIR}"

# Set defaults for vars modified by flags to this script
VERBOSE=""
VERBOSE_FLAG=""
BUILD_TESTS=OFF
BUILD_TYPE=Release
BUILD_ALL_GPU_ARCH=0
INSTALL_TARGET=install
BUILD_DISABLE_DEPRECATION_WARNING=ON

Expand Down Expand Up @@ -71,15 +73,18 @@ fi

# Process flags
if hasArg -v; then
VERBOSE=1
VERBOSE_FLAG="-v"
fi
if hasArg -g; then
BUILD_TYPE=Debug
fi
if hasArg -n; then
INSTALL_TARGET=""
fi
if hasArg --show-_depr_warn; then
if hasArg --allgpuarch; then
BUILD_ALL_GPU_ARCH=1
fi
if hasArg --show_depr_warn; then
BUILD_DISABLE_DEPRECATION_WARNING=OFF
fi

Expand All @@ -101,18 +106,32 @@ if hasArg clean; then
done
fi

if (( ${BUILD_ALL_GPU_ARCH} == 0 )); then
CUSPATIAL_CMAKE_CUDA_ARCHITECTURES="-DCMAKE_CUDA_ARCHITECTURES="
echo "Building for the architecture of the GPU in the system..."
else
CUSPATIAL_CMAKE_CUDA_ARCHITECTURES=""
echo "Building for *ALL* supported GPU architectures..."
fi

################################################################################
# Configure, build, and install libcuspatial
if (( ${NUMARGS} == 0 )) || hasArg libcuspatial; then

mkdir -p ${LIBCUSPATIAL_BUILD_DIR}
cd ${LIBCUSPATIAL_BUILD_DIR}
cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
${CUSPATIAL_CMAKE_CUDA_ARCHITECTURES} \
-DCMAKE_CXX11_ABI=ON \
-DBUILD_TESTS=${BUILD_TESTS} \
-DDISABLE_DEPRECATION_WARNING=${BUILD_DISABLE_DEPRECATION_WARNING} \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
make -j ${PARALLEL_LEVEL} install VERBOSE=${VERBOSE}
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
..

cmake --build . -j ${PARALLEL_LEVEL} ${VERBOSE_FLAG}

if [[ ${INSTALL_TARGET} != "" ]]; then
cmake --build . -j ${PARALLEL_LEVEL} --target install ${VERBOSE_FLAG}
fi
fi

# Build and install the cuspatial Python package
Expand All @@ -126,4 +145,3 @@ if (( ${NUMARGS} == 0 )) || hasArg cuspatial; then
PARALLEL_LEVEL=${PARALLEL_LEVEL} python setup.py build_ext --inplace --library-dir=${LIBCUSPATIAL_BUILD_DIR}
fi
fi

5 changes: 4 additions & 1 deletion ci/cpu/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2018, NVIDIA CORPORATION.
# Copyright (c) 2018-2021, NVIDIA CORPORATION.
######################################
# cuSpatial CPU conda build script for CI #
######################################
Expand All @@ -23,6 +23,9 @@ export CUDA_REL=${CUDA_VERSION%.*}
export GPUCI_CONDA_RETRY_MAX=1
export GPUCI_CONDA_RETRY_SLEEP=30

# Use Ninja to build
export CMAKE_GENERATOR="Ninja"

# Switch to project root; also root of repo checkout
cd $WORKSPACE

Expand Down
1 change: 0 additions & 1 deletion ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,3 @@ else

exit ${SUITEERROR}
fi

2 changes: 2 additions & 0 deletions conda/environments/cuspatial_dev_cuda10.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ dependencies:
- geopandas=0.7.0
- cmake>=3.14
- cython>=0.29,<0.30
- gtest
- gmock
2 changes: 2 additions & 0 deletions conda/environments/cuspatial_dev_cuda10.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ dependencies:
- geopandas=0.7.0
- cmake>=3.14
- cython>=0.29,<0.30
- gtest
- gmock
2 changes: 2 additions & 0 deletions conda/environments/cuspatial_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ dependencies:
- geopandas=0.7.0
- cmake>=3.14
- cython>=0.29,<0.30
- gtest
- gmock
2 changes: 1 addition & 1 deletion conda/recipes/cuspatial/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ requirements:
- python
- cudf {{ minor_version }}.*
- rmm {{ minor_version }}.*
- gdal >=3.1.0,<3.2.0a0
- gdal >=3.2.0,<3.3.0a0

test:
commands:
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/libcuspatial/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# build cuspatial with verbose output
if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
./build.sh -v libcuspatial
./build.sh -v libcuspatial --allgpuarch
else
./build.sh -v libcuspatial tests
./build.sh -v libcuspatial tests --allgpuarch
fi
12 changes: 9 additions & 3 deletions conda/recipes/libcuspatial/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,24 @@ build:
- PARALLEL_LEVEL
- VERSION_SUFFIX
- PROJECT_FLASH
- CCACHE_DIR
- CCACHE_NOHASHDIR
- CCACHE_COMPILERCHECK
- CMAKE_GENERATOR
- CMAKE_C_COMPILER_LAUNCHER
- CMAKE_CXX_COMPILER_LAUNCHER
- CMAKE_CUDA_COMPILER_LAUNCHER
run_exports:
- {{ pin_subpackage("libcuspatial", max_pin="x.x") }}

requirements:
build:
- cmake >=3.12.4
- cmake >=3.18
host:
- libcudf {{ minor_version }}.*
- librmm {{ minor_version }}.*
- cudatoolkit {{ cuda_version }}.*
- gdal >=3.1.0,<3.2.0a0
- gdal >=3.2.0,<3.3.0a0
run:
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}

Expand All @@ -45,4 +52,3 @@ about:
license_family: Apache
license_file: LICENSE
summary: libcuspatial library

Loading