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

Branch 22.08 merge branch 22.06 #712

Merged

Commits on Jun 7, 2022

  1. Add conda compilers (rapidsai#702)

    Our `devel` Docker containers need to be switched to using `conda` compilers to resolve a linking error. `raft` is in those containers, but hasn't yet been built with `conda` compilers. This PR addresses that.
    
    These changes won't cleanly merge into `branch-22.08` unfortunately due to the changes in rapidsai#641, but we can address that another time.
    
    Authors:
       - AJ Schmidt (https://github.com/ajschmidt8)
       - Corey J. Nolet (https://github.com/cjnolet)
       - Vyas Ramasubramani (https://github.com/vyasr)
    
    Approvers:
       - Corey J. Nolet (https://github.com/cjnolet)
    ajschmidt8 authored Jun 7, 2022
    Configuration menu
    Copy the full SHA
    0b55c32 View commit details
    Browse the repository at this point in the history
  2. update changelog

    raydouglass committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    229b9f8 View commit details
    Browse the repository at this point in the history
  3. FIX update-version.sh

    raydouglass committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    3e5a625 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2022

  1. Configuration menu
    Copy the full SHA
    3492225 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7e5ee93 View commit details
    Browse the repository at this point in the history
  3. Fixing poor merge

    cjnolet committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    cc30b25 View commit details
    Browse the repository at this point in the history