Unverified Commit 22d24c15 authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

catboost: use llvm 14 for cuda (#333562)

parents d0dea98b ab66c4d9

pkgs/by-name/ca/catboost/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  gitUpdater,

  cudaSupport ? config.cudaSupport,

  cudaPackages ? { },

  llvmPackages_12,

  llvmPackagesCuda ? llvmPackages,

  pythonSupport ? false,

}:

let
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { 
    # catboost requires clang 14+ for build, but does clang 12 for cuda build.

    # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it.

    # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools

    CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackages_12.stdenv.cc}/bin/cc";

    CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackagesCuda.stdenv.cc}/bin/cc";

    NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isLinux "-fuse-ld=lld";

    NIX_LDFLAGS = "-lc -lm";

    NIX_CFLAGS_COMPILE = toString (

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -8526,6 +8526,7 @@ with pkgs; 
  catboost = callPackage ../by-name/ca/catboost/package.nix {

    # https://github.com/catboost/catboost/issues/2540

    cudaPackages = cudaPackages_11;

    llvmPackagesCuda = llvmPackages_14;

  };















  cctag = callPackage ../development/libraries/cctag {