Unverified Commit 6cd5fb6f authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #263048 from Madouura/pr/triton

Make openai-triton/pytorch free again (and various fixes)
parents 83e0b3df 3aab2bc4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "triton-llvm";
  pname = "openai-triton-llvm";
  version = "14.0.6-f28c006a5895";

  outputs = [
+35 −0
Original line number Diff line number Diff line
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 11c1b04c..762eaa75 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,20 +1,14 @@
-find_package(GTestSrc)
+enable_testing()
 
-IF(GTESTSRC_FOUND)
-    enable_testing()
+if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW))
+    set(gtest_disable_pthreads ON)
+    set(gtest_force_shared_crt ON)
+endif()
 
-    if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW))
-        set(gtest_disable_pthreads ON)
-        set(gtest_force_shared_crt ON)
-    endif()
+include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
 
-    add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest)
-    include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
+set(TEST_LIBRARIES gtest gtest_main)
 
-    set(TEST_LIBRARIES gtest gtest_main)
-
-    add_custom_target(tests ALL)
-    add_subdirectory(perftest)
-    add_subdirectory(unittest)
-
-ENDIF(GTESTSRC_FOUND)
+add_custom_target(tests ALL)
+add_subdirectory(perftest)
+add_subdirectory(unittest)
+36 −0
Original line number Diff line number Diff line
diff --git a/test/valgrind.supp b/test/valgrind.supp
index c9d3d226..63af7bf9 100644
--- a/test/valgrind.supp
+++ b/test/valgrind.supp
@@ -24,3 +24,31 @@
    fun:*Uri*Parse_UTF16_Std*
 }
 
+{
+   Suppress memcpy_chk valgrind report 5
+   Memcheck:Overlap
+   fun:__memcpy_chk
+   fun:*dtoa_normal*
+}
+
+{
+   Suppress memcpy_chk valgrind report 6
+   Memcheck:Overlap
+   fun:__memcpy_chk
+   fun:*dtoa_maxDecimalPlaces*
+}
+
+{
+   Suppress memcpy_chk valgrind report 7
+   Memcheck:Overlap
+   fun:__memcpy_chk
+   ...
+   fun:*Reader*ParseDoubleHandler*
+}
+
+{
+   Suppress memcpy_chk valgrind report 8
+   Memcheck:Overlap
+   fun:__memcpy_chk
+   fun:*Reader*ParseNumber_NormalPrecisionError*
+}
+49 −17
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, pkg-config
, cmake
, doxygen
, graphviz
, gtest
, valgrind
# One of "11" or "17"; default in source is CXX 11
, cxxStandard ? "11"
, buildDocs ? true
, buildTests ? !stdenv.hostPlatform.isStatic && !stdenv.isDarwin
, buildExamples ? true
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "rapidjson";
  version = "unstable-2023-09-28";

  outputs = [
    "out"
  ] ++ lib.optionals buildDocs [
    "doc"
  ] ++ lib.optionals buildExamples [
    "example"
  ];

  src = fetchFromGitHub {
    owner = "Tencent";
    repo = "rapidjson";
@@ -19,26 +32,44 @@ stdenv.mkDerivation rec {
    hash = "sha256-rl7iy14jn1K2I5U2DrcZnoTQVEGEDKlxmdaOCF/3hfY=";
  };

  patches = lib.optionals buildTests [
    ./0000-unstable-use-nixpkgs-gtest.patch
    # https://github.com/Tencent/rapidjson/issues/2214
    ./0001-unstable-valgrind-suppress-failures.patch
  ];

  nativeBuildInputs = [
    pkg-config
    cmake
  ] ++ lib.optionals buildDocs [
    doxygen
    graphviz
  ];

  patches = [
    (fetchpatch {
      name = "do-not-include-gtest-src-dir.patch";
      url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909";
      hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4=";
    })
  cmakeFlags = [
    (lib.cmakeBool "RAPIDJSON_BUILD_DOC" buildDocs)
    (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" buildTests)
    (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" buildExamples)
    (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" (cxxStandard == "11"))
    (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" (cxxStandard == "17"))
  ] ++ lib.optionals buildTests [
    (lib.cmakeFeature "GTEST_INCLUDE_DIR" "${lib.getDev gtest}")
  ];

  # for tests, adding gtest to checkInputs does not work
  # https://github.com/NixOS/nixpkgs/pull/212200
  buildInputs = [ gtest ];
  cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" ];
  doCheck = buildTests;

  nativeCheckInputs = [ valgrind ];
  doCheck = !stdenv.hostPlatform.isStatic && !stdenv.isDarwin;
  nativeCheckInputs = [
    gtest
    valgrind
  ];

  postInstall = lib.optionalString buildExamples ''
    mkdir -p $example/bin

    find bin -type f -executable \
      -not -name "perftest" \
      -not -name "unittest" \
      -exec cp -a {} $example/bin \;
  '';

  meta = with lib; {
    description = "Fast JSON parser/generator for C++ with both SAX/DOM style API";
@@ -46,5 +77,6 @@ stdenv.mkDerivation rec {
    license = licenses.mit;
    platforms = platforms.unix;
    maintainers = with maintainers; [ Madouura ];
    broken = (cxxStandard != "11" && cxxStandard != "17");
  };
}
})
+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@
, pyro-ppl
  #, pystan (not packaged)
, numpyro
, bokeh
}:

buildPythonPackage rec {
@@ -72,6 +73,7 @@ buildPythonPackage rec {
    pytestCheckHook
    torchvision
    zarr
    bokeh
  ];

  preCheck = ''
@@ -97,6 +99,8 @@ buildPythonPackage rec {
    # An issue has been opened upstream: https://github.com/arviz-devs/arviz/issues/2282
    "test_plot_ppc_discrete"
    "test_plot_ppc_discrete_save_animation"
    # Assertion error
    "test_data_zarr"
  ];

  pythonImportsCheck = [
Loading