Code

Fix merge conflicts [skip gpuci]#587

Code

Merged

ajschmidt8 merged 16 commits intorapidsai:branch-22.06rapidsai/raft:branch-22.06from ajschmidt8:fix-merge-conflictsajschmidt8/raft:fix-merge-conflictsCopy head branch name to clipboardMar 23, 2022

+3,972-349

Commits

Commits on Mar 21, 2022

• Pylibraft for pairwise distances (rapidsai#540)

  Show description for 0d777ea
  cjnolet

  authored
  0d777ea

Commits on Mar 22, 2022

• Update update-version.sh (rapidsai#560)

  Show description for cf586c4
  raydouglass

  authored
  cf586c4

• Fixing accidental removal of thrust target from cmakelists (rapidsai#571)

  Show description for c333848
  cjnolet

  authored
  c333848

• Fixing raft headers dir (rapidsai#574)

  Show description for 6e552ec
  cjnolet

  authored
  6e552ec

• Thrust package name case (rapidsai#576)

  Show description for 15eb20a
  trxcllnt

  authored
  15eb20a

• Use unanchored clang-format version check (rapidsai#573)

  Show description for ebc4feb
  zbjornson

  authored
  ebc4feb

• Adding INSTALL_EXPORT_SET for cuco, rmm, thrust (rapidsai#579)

  Show description for e74c012
  cjnolet

  authored
  e74c012

• Don't add gtest to build export set or generate a gtest-config.cmake (rapidsai#565)

  Show description for 1c54493
  trxcllnt

  authored
  1c54493

• Add missing thrust includes to transpose.cuh (rapidsai#575)

  Show description for 15b2ef7
  zbjornson

  authored
  15b2ef7

• removing exclude_from_all from cuco (rapidsai#580)

  Show description for 82fd068
  cjnolet

  authored
  82fd068

• Pin dask and distributed version (rapidsai#581)

  Show description for 45384fe
  galipremsagar

  authored
  45384fe

• exposing faiss::faiss (rapidsai#582)

  Show description for f97e905
  cjnolet

  authored
  f97e905

Commits on Mar 23, 2022

• Link to cuco and add faiss EXCLUDE_FROM_ALL option (rapidsai#583)

  Show description for ab57c1f
  trxcllnt

  authored
  ab57c1f

• Fix commands to get conda output files (rapidsai#584)

  Show description for 9a11b83
  jjacobelli

  authored
  9a11b83

• update ops-bot config file (rapidsai#586)

  Show description for f66f1b3
  ajschmidt8

  authored
  f66f1b3

• Merge remote-tracking branch 'upstream/branch-22.04' into fix-merge-conflicts

  ajschmidt8

  committed
  5e8b466