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

Simplify raft component CMake logic, and allow compilation without FAISS #428

Merged
merged 86 commits into from
Jan 23, 2022
Merged

Simplify raft component CMake logic, and allow compilation without FAISS #428

merged 86 commits into from
Jan 23, 2022

Commits on Sep 30, 2021

  1. add option to build faiss shared libs

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

  2. add FAISS::FAISS to the list of global targets

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

  3. update cuco

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

  4. create a faissTargets export-set

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

  5. Merge branch 'fix/build-shared-faiss' into fix/node-rapids-21.10

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

  6. add faiss to raft-exports

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

  7. revert

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

  8. Merge branch 'fix/build-shared-faiss' into fix/node-rapids-21.10

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

  9. create a faiss-exports export-set

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

  10. mark faiss to be found as part of resolving raft-exports dependencies

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

  11. create faiss-exports export set

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

  12. create faiss-exports export set

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

Commits on Oct 5, 2021

  1. export faiss::faiss target to build export set

    @trxcllnt
    trxcllnt committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    8e266ef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix/node-rapids-21.10' into fix/build-shared-faiss

    @trxcllnt
    trxcllnt committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    9d535fb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'branch-21.10' of github.com:rapidsai/raft into fix/buil… 

    …d-shared-faiss
    @trxcllnt
    trxcllnt committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    7c990b1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'branch-21.12' of github.com:rapidsai/raft into fix/buil… 

    …d-shared-faiss
    @trxcllnt
    trxcllnt committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    3a20c64 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2021

  1. fix faiss GLOBAL_TARGETS

    @trxcllnt
    trxcllnt committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    83e3aa6 View commit details
    Browse the repository at this point in the history

  2. update rapids-cmake version

    @trxcllnt
    trxcllnt committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    2773edc View commit details
    Browse the repository at this point in the history

  3. fix naming for generated Findfaiss.cmake module so we find conda-inst… 

    …alled faiss
    @trxcllnt
    trxcllnt committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    3ff1c4d View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2021

  1. ensure faiss::faiss target is available in build and install export sets

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

  2. add gtest to raft-exports, remove dead code

    @trxcllnt
    trxcllnt committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    713a872 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. update CMake faiss variable name

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

  2. make -v set cmake --log-level=VERBOSE

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

Commits on Oct 13, 2021

  1. update cuco hash to the commit that uses rapids-cmake v21.12

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

Commits on Oct 14, 2021

  1. Merge branch 'branch-21.12' of github.com:rapidsai/raft into fix/buil… 

    …d-shared-faiss
    @trxcllnt
    trxcllnt committed Oct 14, 2021
    Configuration menu
    Copy the full SHA
    dc076ae View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2021

  1. Merge branch 'branch-21.12' of github.com:rapidsai/raft into fix/buil… 

    …d-shared-faiss
    @trxcllnt
    trxcllnt committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    e824384 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2021

  1. Merge branch 'branch-21.12' of github.com:rapidsai/raft into fix/buil… 

    …d-shared-faiss
    @trxcllnt
    trxcllnt committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    078e33c View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2021

  1. Merge branch 'branch-22.02' of github.com:rapidsai/raft into fix/buil… 

    …d-shared-faiss
    @trxcllnt
    trxcllnt committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    30dafb6 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2021

  1. update cuco version

    @trxcllnt
    trxcllnt committed Nov 19, 2021
    Configuration menu
    Copy the full SHA
    aedc6d7 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2021

  1. Merge branch 'branch-22.02' of github.com:rapidsai/raft into fix/buil… 

    …d-shared-faiss
    @trxcllnt
    trxcllnt committed Nov 20, 2021
    Configuration menu
    Copy the full SHA
    245ea3d View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2021

  1. Merge branch 'branch-22.02' of github.com:rapidsai/raft into fix/buil… 

    …d-shared-faiss
    @trxcllnt
    trxcllnt committed Dec 1, 2021
    Configuration menu
    Copy the full SHA
    2b99f1a View commit details
    Browse the repository at this point in the history

  2. move faiss into separate raft-faiss-exports export set, only include … 

    …faiss if it's in the raft_FIND_COMPONENTS list
    @trxcllnt
    trxcllnt committed Dec 1, 2021
    Configuration menu
    Copy the full SHA
    bb4b7c7 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2021

  1. check for faiss in raft_FIND_COMPONENTS for build side export set too

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

  2. pass EXCLUDE_FROM_ALL in get_faiss.cmake

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

  3. enable CUDA language in code_string

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

  4. pass TRUE

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

  5. drop CUDA from the list of global languages

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

  6. link raft to faiss if faiss component is requested

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

Commits on Dec 8, 2021

  1. link raft to faiss if faiss component requested

    @trxcllnt
    trxcllnt committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    41bd51b View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2021

  1. Merge branch 'branch-22.02' of github.com:rapidsai/raft into fix/buil… 

    …d-shared-faiss
    @trxcllnt
    trxcllnt committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    4a95f2e View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2021

  1. Merge branch 'branch-22.02' of github.com:rapidsai/raft into fix/buil… 

    …d-shared-faiss
    @trxcllnt
    trxcllnt committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    082eea9 View commit details
    Browse the repository at this point in the history

  2. fix FAISS::FAISS -> faiss::faiss

    @trxcllnt
    trxcllnt committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    ce8a005 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2021

  1. Simplify raft component CMake logic, and allow compilation without FAISS

    @robertmaynard
    robertmaynard committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    c39685a View commit details
    Browse the repository at this point in the history

  2. Add RAFT_ENABLE_NN_COMPONENT CMake build option

    @robertmaynard
    robertmaynard committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    af46a09 View commit details
    Browse the repository at this point in the history

  3. Adding option to turn off buildign all shared libs

    @cjnolet
    cjnolet committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    1e9b9bd View commit details
    Browse the repository at this point in the history

  4. Refactor get_faiss to export faiss::faiss build target

    @trxcllnt @robertmaynard
    trxcllnt authored and robertmaynard committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    7fc712c View commit details
    Browse the repository at this point in the history

  5. RAFT_ENABLE_NN_COMPONENT is a dependent option of RAFT_BUILD_SHARED_LIBS

    @robertmaynard
    robertmaynard committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    a85b085 View commit details
    Browse the repository at this point in the history

  6. Using lowercase faiss target

    @cjnolet
    cjnolet committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    260a727 View commit details
    Browse the repository at this point in the history

  7. Changing RAFT_BUILD_SHARED_LIBS -> RAFT_COMPILE_LIBRARIES

    @cjnolet
    cjnolet committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    bb4a7f3 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2021

  1. Passing deps transitively

    @cjnolet
    cjnolet committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    8c02d2c View commit details
    Browse the repository at this point in the history

  2. Moving faiss back to test target. We need to figure out how to pass 

    dependencies through transitively
    @cjnolet
    cjnolet committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    ebb7c1d View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2021

  1. Another round of cmake cleanups

    @robertmaynard
    robertmaynard committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    c1e9c2d View commit details
    Browse the repository at this point in the history

  2. Merge "Add option to build faiss shared libs" into refactor_cmake_raf… 

    …t_target_logic
    @robertmaynard
    robertmaynard committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    fef8446 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2022

  1. Refactor again now that I understand the libs are an optimization

    @robertmaynard
    robertmaynard committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    52e8635 View commit details
    Browse the repository at this point in the history

  2. Move nn and distance to CMake components

    @robertmaynard
    robertmaynard committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    293302f View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2022

  1. Make searching for faiss a controllable option

    @robertmaynard
    robertmaynard committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    61e5b3c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-22.02' into refactor_cmake_raft_target_logic

    @robertmaynard
    robertmaynard committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    3701daf View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2022

  1. fix typo

    @trxcllnt
    trxcllnt committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    60c81a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-22.02' of github.com:rapidsai/raft into refactor… 

    …_cmake_raft_target_logic
    @trxcllnt
    trxcllnt committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    55301e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2022

  1. add GTest targets to install side of raft-exports export set

    @trxcllnt
    trxcllnt committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    d20e5ef View commit details
    Browse the repository at this point in the history

  2. install gtest if not already installed

    @trxcllnt
    trxcllnt committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    1594f7f View commit details
    Browse the repository at this point in the history

  3. revert get_gtest.cmake changes

    @trxcllnt
    trxcllnt committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    1c74204 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2022

  1. remove raft_ prefix from global targets list

    @trxcllnt
    trxcllnt committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    0bc750b View commit details
    Browse the repository at this point in the history

  2. revert previous change, move target_link_libraries below add_library … 

    …calls that reference the target, fix typo raft_distance_lib -> raft_nn_lib
    @trxcllnt
    trxcllnt committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    a3c0370 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2022

  1. fix _lib name to add prefix

    @trxcllnt
    trxcllnt committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    ea209c1 View commit details
    Browse the repository at this point in the history

  2. add missing PKG_ prefix

    @trxcllnt
    trxcllnt committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    7093ad5 View commit details
    Browse the repository at this point in the history

  3. guard creating alias targets when added as a submodule via CPM

    @trxcllnt
    trxcllnt committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    f613e39 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2022

  1. update cuco hash

    @trxcllnt
    trxcllnt committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    b2e0b01 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-22.02' of github.com:rapidsai/raft into refactor… 

    …_cmake_raft_target_logic
    @trxcllnt
    trxcllnt committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    ad90d9b View commit details
    Browse the repository at this point in the history

  3. Replace the use of RMM's CUDA Python bindings with those from CUDA-Py… 

    …thon
    @shwina
    shwina committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    902657c View commit details
    Browse the repository at this point in the history

  4. Add cuda-python to dev env

    @shwina
    shwina committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    d7f0074 View commit details
    Browse the repository at this point in the history

  5. Remove older comment about cudaStream_t attribute

    @shwina
    shwina committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    c7666ad View commit details
    Browse the repository at this point in the history

  6. Style

    @shwina
    shwina committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    8446e2f View commit details
    Browse the repository at this point in the history

  7. 0 -> cudaSuccess

    @shwina
    shwina committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    4de51ed View commit details
    Browse the repository at this point in the history

  8. Add raft_export while rapids-cmake adds a export(COMPONENT) feature

    @robertmaynard
    robertmaynard committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    9d1bdc5 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'ashwin/replace-rmm-cuda-python-bindings… 

    …' into refactor_cmake_raft_target_logic
    @cjnolet
    cjnolet committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    4f2d14b View commit details
    Browse the repository at this point in the history

  10. raft_export marks components as found

    @robertmaynard
    robertmaynard committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    1a2c611 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2022

  1. add unprefixed raft_distance_lib and raft_nn_lib to handle both BUILD… 

    … export set and CPM downloaded modes
    @trxcllnt
    trxcllnt committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    14f1937 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-22.02' of github.com:rapidsai/raft into refactor… 

    …_cmake_raft_target_logic
    @trxcllnt
    trxcllnt committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    2d2b23a View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2022

  1. add versions.json to force Thrust v1.15.0

    @trxcllnt
    trxcllnt committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    cb69067 View commit details
    Browse the repository at this point in the history

  2. Using cuco branch w/ thrust 1.15

    @cjnolet
    cjnolet committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    47bbfd0 View commit details
    Browse the repository at this point in the history

  3. Reordering cuco and rmm cmake includes

    @cjnolet
    cjnolet committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    2685783 View commit details
    Browse the repository at this point in the history

  4. Reverting previous changes

    @cjnolet
    cjnolet committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    2aa4ea9 View commit details
    Browse the repository at this point in the history

  5. add get_thrust.cmake back in to ensure we get Thrust v1.15.0

    @trxcllnt
    trxcllnt committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    c51fc3e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'refactor_cmake_raft_target_logic' of github.com:robertm… 

    …aynard/raft into refactor_cmake_raft_target_logic
    @trxcllnt
    trxcllnt committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    93ed2c7 View commit details
    Browse the repository at this point in the history

  7. revert cuco dependency hash

    @trxcllnt
    trxcllnt committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    5670308 View commit details
    Browse the repository at this point in the history