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.

Sign up for GitHub

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

Jump to bottom

Rework libcuspatial CMakeLists.txt to export targets for CPM #365

Merged
merged 58 commits into from
Mar 30, 2021
Merged

Rework libcuspatial CMakeLists.txt to export targets for CPM #365

merged 58 commits into from
Mar 30, 2021

Commits on Feb 3, 2021

  1. Update CMakeLists.txt to export cuspatial library targets, use CPM

    @trxcllnt
    trxcllnt committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    2e8f4e9 View commit details
    Browse the repository at this point in the history

  2. remove JITIFY_USE_CACHE target compile definition

    @trxcllnt
    trxcllnt committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    6b103cf View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2021

  1. Merge branch 'branch-0.19' of github.com:rapidsai/cuspatial into fix/… 

    …cmake-exports
    @trxcllnt
    trxcllnt committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    b715df6 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2021

  1. add CUDF binary dir to CMAKE_PREFIX_PATH

    @trxcllnt
    trxcllnt committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    da61c7a View commit details
    Browse the repository at this point in the history

  2. update CMake configuration to match libcudf's latest changes

    @trxcllnt
    trxcllnt committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    02d2696 View commit details
    Browse the repository at this point in the history

  3. Fix warnings surfaced by -Wall

    @trxcllnt
    trxcllnt committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    24ebc24 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. Merge branch 'branch-0.19' of github.com:rapidsai/cuspatial into fix/… 

    …cmake-exports
    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    cb9faba View commit details
    Browse the repository at this point in the history

  2. switch cudf to main RAPIDS repo

    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    7b48603 View commit details
    Browse the repository at this point in the history

  3. handle ALL result from evaluate_gpu_archs like cuDF does

    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    c1faa3d View commit details
    Browse the repository at this point in the history

  4. set CUSPATIAL_MIN_VERSION_cudf correctly

    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    c796358 View commit details
    Browse the repository at this point in the history

  5. use CPM to find or add RMM

    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    21c3799 View commit details
    Browse the repository at this point in the history

  6. Pass BUILD_TESTS and BUILD_BENCHMARKS down to libcudf build, so cudf:… 

    …:cudftestutil is built
    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    046cd09 View commit details
    Browse the repository at this point in the history

  7. set THREADS_PREFER_PTHREAD_FLAG because without it, GoogleBench break… 

    …s CMake
    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    cf77333 View commit details
    Browse the repository at this point in the history

  8. find RMM in cuspatial-target install config files

    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    15210f2 View commit details
    Browse the repository at this point in the history

  9. don't add GTest/GMock, because cudf::cudftestutil should have it

    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    ac10bc7 View commit details
    Browse the repository at this point in the history

  10. use CPMFindPackage to get GTest and GMock again

    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    fb6acbf View commit details
    Browse the repository at this point in the history

  11. fix typo

    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    cc02a83 View commit details
    Browse the repository at this point in the history

  12. add main targets to test/bench executables

    @trxcllnt
    trxcllnt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    67983a9 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. Merge branch 'branch-0.19' of github.com:rapidsai/cuspatial into fix/… 

    …cmake-exports
    @trxcllnt
    trxcllnt committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    46c39af View commit details
    Browse the repository at this point in the history

  2. Update cuSpatial to use cuDF branch with cudftestutil fix

    @trxcllnt
    trxcllnt committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    712bb71 View commit details
    Browse the repository at this point in the history

  3. inherit rmm::rmm target from cudf::cudf

    @trxcllnt
    trxcllnt committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    4fca5a0 View commit details
    Browse the repository at this point in the history

  4. set cudf_DIR for building locally

    @trxcllnt
    trxcllnt committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    7a2d58e View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2021

  1. don't pass CMAKE_CUDA_ARCHITECTURES to CPMFindPackage

    @trxcllnt
    trxcllnt committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    8b3d196 View commit details
    Browse the repository at this point in the history

  2. use OFF instead of NO

    @trxcllnt
    trxcllnt committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    49c7f7a View commit details
    Browse the repository at this point in the history

  3. inherit CUDA library link targets from cudf::cudf

    @trxcllnt
    trxcllnt committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    20bef1a View commit details
    Browse the repository at this point in the history

  4. switch fork/branch back to rapidsai

    @trxcllnt
    trxcllnt committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    ad7f56d View commit details
    Browse the repository at this point in the history

  5. use list(PREPEND) to modify CMAKE_PREFIX_PATH

    @trxcllnt
    trxcllnt committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    e6a8c55 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2021

  1. run CMake with log level TRACE to debug CI

    @trxcllnt
    trxcllnt committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    687d9d3 View commit details
    Browse the repository at this point in the history

  2. set conda block back to align with cudf

    @trxcllnt
    trxcllnt committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    157d3d3 View commit details
    Browse the repository at this point in the history

  3. switch back to cudf/pulls/7574 branch to test cmake install tweaks

    @trxcllnt
    trxcllnt committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    c9ad3fd View commit details
    Browse the repository at this point in the history

  4. switch cudf dependency back to rapidsai fork

    @trxcllnt
    trxcllnt committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    3d0578d View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. set GPU archs like cuDF does

    @trxcllnt
    trxcllnt committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    83b2afa View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. define -DCUDAToolkit_INCLUDE_DIR for CI

    @trxcllnt
    trxcllnt committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    3134c61 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-0.19' of github.com:rapidsai/cuspatial into fix/… 

    …cmake-exports
    @trxcllnt
    trxcllnt committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    38d132e View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. Merge branch 'branch-0.19' of github.com:rapidsai/cuspatial into fix/… 

    …cmake-exports
    @trxcllnt
    trxcllnt committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    de428b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2021

  1. print CUDAToolkit_ROOT for debugging CI

    @trxcllnt
    trxcllnt committed Mar 20, 2021
    Configuration menu
    Copy the full SHA
    62e2bcd View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2021

  1. allow CUDAToolkit_ROOT env var in conda builds

    @trxcllnt
    trxcllnt committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    dcb9532 View commit details
    Browse the repository at this point in the history

  2. remove explicit CUDAToolkit cmake args

    @trxcllnt
    trxcllnt committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    1984893 View commit details
    Browse the repository at this point in the history

  3. replace CPMFindPackage with find_package to test in CI

    @trxcllnt
    trxcllnt committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    9373b19 View commit details
    Browse the repository at this point in the history

  4. don't set CMAKE_PREFIX_PATH for now

    @trxcllnt
    trxcllnt committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    c8b414b View commit details
    Browse the repository at this point in the history

  5. add gtest/gmock to conda build environments

    @trxcllnt
    trxcllnt committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    859c96e View commit details
    Browse the repository at this point in the history

  6. support building for all GPU archs in build.sh

    @trxcllnt
    trxcllnt committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    c9e2b69 View commit details
    Browse the repository at this point in the history

  7. use CPM to get RMM and GTest to work around CMake global imports issue

    @trxcllnt
    trxcllnt committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    7911462 View commit details
    Browse the repository at this point in the history

  8. fix typo

    @trxcllnt
    trxcllnt committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    dfa5f30 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2021

  1. Merge branch 'branch-0.19' of github.com:rapidsai/cuspatial into fix/… 

    …cmake-exports
    @trxcllnt
    trxcllnt committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    cfc108b View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. link cudf aliases of gtest/gmock/benchmark, cleanup to align with cud… 

    …f again
    @trxcllnt
    trxcllnt committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    c211c9b View commit details
    Browse the repository at this point in the history

  2. remove unused options

    @trxcllnt
    trxcllnt committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    8e22c5d View commit details
    Browse the repository at this point in the history

  3. use cmake >= 3.18 in conda build

    @trxcllnt
    trxcllnt committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    187ddbb View commit details
    Browse the repository at this point in the history

  4. use GTest and benchmark targets

    @trxcllnt
    trxcllnt committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    1f7c72a View commit details
    Browse the repository at this point in the history

  5. don't add cudf_BINARY_DIR to CMAKE_PREFIX_PATH

    @trxcllnt
    trxcllnt committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    58bfde5 View commit details
    Browse the repository at this point in the history

  6. move gtest and gmock to host requirements

    @trxcllnt
    trxcllnt committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    d74e5b4 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2021

  1. remove gtest/gmock from libcuspatial/meta.yml

    @trxcllnt
    trxcllnt committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    61bb18c View commit details
    Browse the repository at this point in the history

  2. remove CUDAToolkit_ROOT env var from libcuspatial conda build

    @trxcllnt
    trxcllnt committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    7efc3e4 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. set local mr var, update copyright

    @trxcllnt
    trxcllnt committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    206bce2 View commit details
    Browse the repository at this point in the history

  2. use make_constant_iterator, update copyright

    @trxcllnt
    trxcllnt committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    5414470 View commit details
    Browse the repository at this point in the history

  3. update copyright

    @trxcllnt
    trxcllnt committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    1e6132e View commit details
    Browse the repository at this point in the history

  4. note GDAL promotion

    @trxcllnt
    trxcllnt committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    724fc2c View commit details
    Browse the repository at this point in the history

  5. use libcudf's libcudacxx in cuspatial Cython

    @trxcllnt
    trxcllnt committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    6efe7f6 View commit details
    Browse the repository at this point in the history