Unverified Commit 25164e9e authored by Michael Daniels's avatar Michael Daniels Committed by GitHub
Browse files

vowpal-wabbit: 9.10.0 -> 9.11.2 (#512640)

parents 1e6708dd 2d25c021

pkgs/by-name/vo/vowpal-wabbit/add-missing-includes.patch

0 → 100644
+36 −0
Original line number Diff line number Diff line 
diff --git a/vowpalwabbit/config/include/vw/config/option.h b/vowpalwabbit/config/include/vw/config/option.h

index fa584b15..97d7d92f 100644

--- a/vowpalwabbit/config/include/vw/config/option.h

+++ b/vowpalwabbit/config/include/vw/config/option.h

@@ -7,6 +7,7 @@

 #include "vw/common/vw_exception.h"

 #include "vw/common/vw_throw.h"

 

+#include <cstdint>

 #include <memory>

 #include <set>

 #include <sstream>

diff --git a/vowpalwabbit/core/include/vw/core/feature_group.h b/vowpalwabbit/core/include/vw/core/feature_group.h

index 569c54ca..6e390565 100644

--- a/vowpalwabbit/core/include/vw/core/feature_group.h

+++ b/vowpalwabbit/core/include/vw/core/feature_group.h

@@ -10,6 +10,7 @@

 

 #include <algorithm>

 #include <cstddef>

+#include <cstdint>

 #include <iterator>

 #include <memory>

 #include <numeric>

diff --git a/vowpalwabbit/io/include/vw/io/io_adapter.h b/vowpalwabbit/io/include/vw/io/io_adapter.h

index f5131085..9c57a449 100644

--- a/vowpalwabbit/io/include/vw/io/io_adapter.h

+++ b/vowpalwabbit/io/include/vw/io/io_adapter.h

@@ -4,6 +4,7 @@

 

 #pragma once

 

+#include <cstdint>

 #include <functional>

 #include <memory>

 #include <string>

pkgs/by-name/vo/vowpal-wabbit/package.nix

+24 −5
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
  cmake,

  boost,

  eigen,

  gtest,

  help2man,

  rapidjson,

  spdlog,

  zlib,
@@ -12,25 +14,31 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "vowpal-wabbit";

  version = "9.10.0";

  version = "9.11.2";



  src = fetchFromGitHub {

    owner = "VowpalWabbit";

    repo = "vowpal_wabbit";

    tag = finalAttrs.version;

    hash = "sha256-HKxhEB4ph2tOWgvYngYTcv0OCMISj3KqZpP2zsEUPs0=";

    hash = "sha256-A1Eqj843QidqVlADi6qEKFuw+T0h1FxkRwJ9oRTZgeU=";

    fetchSubmodules = true;

  };



  patches = [

    # https://github.com/VowpalWabbit/vowpal_wabbit/pull/4916

    ./add-missing-includes.patch

  ];



  postPatch = ''

    substituteInPlace CMakeLists.txt \

      --replace-fail "set(VW_CXX_STANDARD 11)" "set(VW_CXX_STANDARD 14)"

    # Avoid duplicate add RapidJSON

    substituteInPlace ext_libs/ext_libs.cmake \

      --replace-fail "add_library(RapidJSON INTERFACE)" ""

  '';



  nativeBuildInputs = [ cmake ];

  nativeBuildInputs = [

    cmake

    help2man

  ];



  buildInputs = [

    boost
@@ -41,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  cmakeFlags = [

    "-DUSE_LATEST_STD=ON"

    "-DVW_INSTALL=ON"

    "-DBUILD_JAVA=OFF"

    "-DBUILD_PYTHON=OFF"
@@ -49,8 +58,18 @@ stdenv.mkDerivation (finalAttrs: { 
    "-DSPDLOG_SYS_DEP=ON"

    "-DVW_BOOST_MATH_SYS_DEP=ON"

    "-DVW_EIGEN_SYS_DEP=ON"

    "-DVW_GTEST_SYS_DEP=ON"

  ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    "-DCMAKE_CTEST_ARGUMENTS=-E;SpanningTreeTest"

  ];



  checkInputs = [

    gtest

  ];



  doCheck = true;



  meta = {

    description = "Machine learning system focused on online reinforcement learning";

    homepage = "https://github.com/VowpalWabbit/vowpal_wabbit/";