Make openai-triton/pytorch free again (and various fixes) #263048
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| 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) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| 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* | ||
| +} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,82 @@ | ||
| { lib | ||
| , stdenv | ||
| , fetchFromGitHub | ||
| , 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 (finalAttrs: { | ||
| pname = "rapidjson"; | ||
| version = "unstable-2023-09-28"; | ||
|
|
||
| outputs = [ | ||
| "out" | ||
| ] ++ lib.optionals buildDocs [ | ||
| "doc" | ||
| ] ++ lib.optionals buildExamples [ | ||
| "example" | ||
| ]; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "Tencent"; | ||
| repo = "rapidjson"; | ||
| rev = "f9d53419e912910fd8fa57d5705fa41425428c35"; | ||
| 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 = [ | ||
| cmake | ||
| ] ++ lib.optionals buildDocs [ | ||
| doxygen | ||
| graphviz | ||
| ]; | ||
|
|
||
| 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}") | ||
| ]; | ||
|
|
||
| doCheck = buildTests; | ||
|
|
||
| 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"; | ||
| homepage = "http://rapidjson.org/"; | ||
| license = licenses.mit; | ||
| platforms = platforms.unix; | ||
| maintainers = with maintainers; [ Madouura ]; | ||
| broken = (cxxStandard != "11" && cxxStandard != "17"); | ||
| }; | ||
| }) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,23 +6,27 @@ | |
| , termcolor | ||
| , tqdm | ||
| , pandas | ||
| , setuptools | ||
| # test dependencies | ||
| , pytestCheckHook | ||
| , pytest-lazy-fixture | ||
| , tensorflow | ||
| , torch | ||
| , datasets | ||
| , torchvision | ||
| , keras | ||
| , fasttext | ||
| , hypothesis | ||
| , wget | ||
| , matplotlib | ||
| , skorch | ||
| }: | ||
|
|
||
| buildPythonPackage rec { | ||
| pname = "cleanlab"; | ||
| version = "2.5.0"; | ||
| pyproject = true; | ||
| disabled = pythonOlder "3.7"; | ||
|
Contributor
There was a problem hiding this comment. Just out of curiosity, why is this needed? When we don't |
||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "cleanlab"; | ||
|
|
@@ -31,11 +35,7 @@ buildPythonPackage { | |
| hash = "sha256-5XQQVrhjpvjwtFM79DqttObmw/GQLkMQVXb5jhiC8e0="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ setuptools ]; | ||
|
|
||
| propagatedBuildInputs = [ | ||
| scikit-learn | ||
|
|
@@ -44,13 +44,38 @@ buildPythonPackage { | |
| pandas | ||
| ]; | ||
|
|
||
| # This is ONLY turned off when we have testing enabled. | ||
| # The reason we do this is because of duplicate packages in the enclosure | ||
| # when using the packages in nativeCheckInputs. | ||
| # Affected packages: grpcio protobuf tensorboard tensorboard-plugin-profile | ||
|
Comment on lines
47
to
50
Contributor
There was a problem hiding this comment. But why aren't they identical?
Contributor
Author
There was a problem hiding this comment. I'm not sure, but it complained about duplicate packages in the enclosure without
Contributor
There was a problem hiding this comment. This could be a symptom that we call the expression taking arguments from the wrong/inconsistent package sets?
Contributor
Author
There was a problem hiding this comment. Ah, tensorflow is an input for that package.
Contributor
There was a problem hiding this comment. Maybe we can make tensorflow use https://discourse.nixos.org/t/allowing-multiple-versions-of-python-package-in-pythonpath-nixpkgs/3849 |
||
| catchConflicts = (!doCheck); | ||
| doCheck = true; | ||
|
mweinelt marked this conversation as resolved.
Outdated
|
||
|
|
||
| nativeCheckInputs = [ | ||
| pytestCheckHook | ||
| pytest-lazy-fixture | ||
| tensorflow | ||
| torch | ||
| datasets | ||
| torchvision | ||
| keras | ||
| fasttext | ||
| hypothesis | ||
| wget | ||
| matplotlib | ||
| skorch | ||
| ]; | ||
|
|
||
| disabledTests = [ | ||
| # Requires the datasets we prevent from downloading | ||
| "test_create_imagelab" | ||
| ]; | ||
|
|
||
| disabledTestPaths = [ | ||
| # Requires internet | ||
| "tests/test_dataset.py" | ||
| # Requires the datasets we just prevented from downloading | ||
| "tests/datalab/test_cleanvision_integration.py" | ||
| ]; | ||
|
|
||
| meta = with lib; { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.