diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 1fea83763ece..2c40adfc6276 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -10,7 +10,6 @@ frigate, nixosTests, fetchpatch, - protobuf_21, }: let @@ -41,7 +40,7 @@ let }); onnxruntime = super.onnxruntime.override (old: { onnxruntime = old.onnxruntime.override (old: { - protobuf = protobuf_21; + withFullProtobuf = true; }); }); }; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 2964c8a1ac37..9bd15499960e 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -23,6 +23,7 @@ pythonSupport ? true, cudaSupport ? config.cudaSupport, ncclSupport ? config.cudaSupport, + withFullProtobuf ? false, cudaPackages ? { }, }@inputs: @@ -195,7 +196,7 @@ effectiveStdenv.mkDerivation rec { (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe protobuf)) (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true) (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck) - (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" false) + (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf) (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport)) (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8")) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 93f8a3a14784..a1aa7438c423 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -214,5 +214,7 @@ buildPythonPackage rec { changelog = "https://github.com/keras-team/keras/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; + # Not yet released for tensorflow >= 2.20.0 + broken = lib.versionAtLeast tensorflow.version "2.20"; }; } diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index e9162d6bf51b..dc5721df96f6 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -95,6 +95,11 @@ buildPythonPackage rec { tensorflow ]; + pytestFlagsArray = [ + # FutureWarning: functools.partial will be a method descriptor in future Python versions; wrap it in enum.member() if you want to preserve the old behavior + "-Wignore::FutureWarning" + ]; + disabledTests = [ # Try to dowload models from Hugging Face Hub "test_application_callable_call" diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index dd536885ace8..023a69666d53 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,72 +1,88 @@ { - version = "2.19.0"; + version = "2.20.0"; version_jetson = "2.16.1+nv24.08"; x86_64-linux_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "13xvghhqjlq5l6gnnlkslqyk7iwy2lbhblz70pa0wrsvdiwp9k86"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1nxmm37miz0kzq8g2zc5f9w5vaiz0m75g2q97v19f0pnpl4q1kwh"; }; x86_64-linux_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0lgjy7frlh5ax97pc5x2cdq560ybizjrdxms57rcx8r9x8wskrff"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "10y5s4bd1s4yk9qx71ap743l8l17axvj5lk49f4fwhq584wg4ghs"; }; x86_64-linux_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0l8wgqjhp0srqs4rkij881nxifdzaxkin237wfjqh8h1wdd312ck"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1077zld9n53w72sbvzll2ic1f05liy2jrbfhnlm98vi55nz6nxfg"; }; x86_64-linux_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1wxpgzs3d0wblvvg02267j0bw9b8j4dlfspfmp6r8hd6dk9bx78b"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "19yn5ligcazva59bgw7v6pdl2wp7xz9i9qf4jpnr9041hm0j5af7"; + }; + x86_64-linux_313 = { + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1db4gipi9x05r4fbdj98p3bk6pz0zq25xi15c97ch3p1wn8pfvns"; }; x86_64-linux_39_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "14vgkx1wjf0jiali4lm3x8n6z29m8vdhjva4yvabzc9b1s1757w4"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1hwfakj3b5w0lc641bqqcnxhdd47037998aqs57valzw7mc5rsqd"; }; x86_64-linux_310_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1s1myi67iqhjxvfvjv8pl26hxjcgya9k1r1hblh8hm0h933xdql3"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "07jr5bpvmxd3yjw3v2jd9i3jswlsfxr26604r16ka38f04x7zgbs"; }; x86_64-linux_311_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1r4ghr51h2bb7dj8q6wydgnvzw0f48b6kkygl6gq0yf9d9w4f1rr"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "17i2z37jrji8rk11pspmlkd8r297x3an3gj5i7g86ic21zyrj528"; }; x86_64-linux_312_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1xm66mwrdxrqs9i68dlahqrd5imgibcz5f3i4ksyg4yp9icjd2z2"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1v2jkhglfrh4by86nri7zq4shi2gl920rilw3r5xbq17ql5mn9i5"; + }; + x86_64-linux_313_gpu = { + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0wkklfh0ny4y4lzac540v8g745b5adyzp29bi2cmmxr606dp58sz"; }; aarch64-linux_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "121amcj78mkkvs2fclc7z669q45x4sa7x6vlzggrm09b0nr7zf4w"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "1pzbi2calx0crx8f0ff1kbibn1j5wwjbvpp9rsmqxja9j9sk7g18"; }; aarch64-linux_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "0p4fjsal8kfizcz456lbbqg2i35ljxhdqij7vhsfbvismqy2jf9b"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "1sms3c4mxy892gaa066nx4xa6m28rhigdav6bc9bgj7mjhyjk802"; }; aarch64-linux_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "1670dv3kbmxiz4v0ivmkbiiiaa1sbc2x841z6kmy03mcb3wkybf9"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "1mfflmpmywqihd1mdwcq6jnzgsv2khkf68z2dckc01fbxz46i59y"; }; aarch64-linux_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "020kppmgmv4hnz3dqmam01gq95s69xjn6zn6k25l08zf6fyvzx0h"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "13q71s5gjb405s48maqz4sckwx971lwj5sg1bz2gyaz2s0yzpyrb"; + }; + aarch64-linux_313 = { + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "09nrnffmqdfr9zy5l1li0727b02drlz4p2dlfx4ss7kzl02qxj27"; }; aarch64-linux_310_jetson = { url = "https://developer.download.nvidia.com/compute/redist/jp/v61/tensorflow/tensorflow-2.16.1+nv24.08-cp310-cp310-linux_aarch64.whl"; sha256 = "0z18zdcjc2dingl94kivhd5cpzbvkjp9j12q57acjppp4hyd6g7f"; }; aarch64-darwin_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp39-cp39-macosx_12_0_arm64.whl"; - sha256 = "02fb702d2wmdgrjq8jj46bp51sh1l9j4q9z231x151z2i3sdn5dd"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp39-cp39-macosx_12_0_arm64.whl"; + sha256 = "0g3qg53l8pfna5r964s08das8jsijbg81snb8ny3z79034dvsv56"; }; aarch64-darwin_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp310-cp310-macosx_12_0_arm64.whl"; - sha256 = "0d6anjqkm5vq22awxhcwivjdshnlzmby80by3icyjcihbkr08mn9"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp310-cp310-macosx_12_0_arm64.whl"; + sha256 = "0msk3aw06q46n4ng8i5cs79r6bhmmvqcam78pdav42hkypw6kwg5"; }; aarch64-darwin_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp311-cp311-macosx_12_0_arm64.whl"; - sha256 = "05f12garj6ad4vcxxpi0vihps4gh9y30bffp2qy1k36qi8kn5m38"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp311-cp311-macosx_12_0_arm64.whl"; + sha256 = "1visqvq280k4cgmg6hwphfkq54p8kdrnnsi4baw0jp83qlb415jz"; }; aarch64-darwin_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp312-cp312-macosx_12_0_arm64.whl"; - sha256 = "1bibid6mrgmjra291pmb7b5sf49f8jpi3n8x8mdwjhfmxfz1c6c2"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp312-cp312-macosx_12_0_arm64.whl"; + sha256 = "13vcl3wcgaid8f2rdzvzmkfbdl3hhkh7qlwdy88apmrg4gq25caj"; + }; + aarch64-darwin_313 = { + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp313-cp313-macosx_12_0_arm64.whl"; + sha256 = "19g8kk7f7ylx1y7awpc3afw7hp50sid2ka0jd9fdmh1q7dhhnzqr"; }; } diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 5e6fe4326ff5..85055efe84e3 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -605,7 +605,7 @@ in buildPythonPackage { __structuredAttrs = true; inherit version pname format; - disabled = pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.13"; src = bazel-build.python; @@ -613,7 +613,7 @@ buildPythonPackage { # - Drop tensorflow-io dependency until we get it to build # - Relax flatbuffers and gast version requirements # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet - # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. + # - keras will be considered as optional for now. postPatch = '' sed -i setup.py \ -e '/tensorflow-io-gcs-filesystem/,+1d' \ @@ -621,7 +621,6 @@ buildPythonPackage { -e "s/'gast[^']*',/'gast',/" \ -e "/'libclang[^']*',/d" \ -e "/'keras[^']*')\?,/d" \ - -e "/'tensorflow-io-gcs-filesystem[^']*',/d" \ -e "s/'protobuf[^']*',/'protobuf',/" \ ''; diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index 9bdf9bf3930e..c80ed6fe646c 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -version="2.19.0" +version="2.20.0" version_jetson="2.16.1+nv24.08" bucket="https://storage.googleapis.com/tensorflow/versions/${version}" @@ -8,25 +8,29 @@ bucket_jetson="https://developer.download.nvidia.com/compute/redist/jp/v61/tenso # List of binary wheels for Tensorflow. The most recent versions can be found # on the following page: -# https://www.tensorflow.org/install/pip?lang=python3#package-location +# https://www.tensorflow.org/install/pip?lang=python3#package_location url_and_key_list=( "x86_64-linux_39 $bucket/tensorflow_cpu-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_310 $bucket/tensorflow_cpu-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_311 $bucket/tensorflow_cpu-${version}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_312 $bucket/tensorflow_cpu-${version}-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" +"x86_64-linux_313 $bucket/tensorflow_cpu-${version}-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_39_gpu $bucket/tensorflow-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_310_gpu $bucket/tensorflow-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_311_gpu $bucket/tensorflow-${version}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_312_gpu $bucket/tensorflow-${version}-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" +"x86_64-linux_313_gpu $bucket/tensorflow-${version}-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "aarch64-linux_39 $bucket/tensorflow-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_310 $bucket/tensorflow-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_311 $bucket/tensorflow-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_312 $bucket/tensorflow-${version}-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" +"aarch64-linux_313 $bucket/tensorflow-${version}-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_310_jetson $bucket_jetson/tensorflow-${version_jetson}-cp310-cp310-linux_aarch64.whl" "aarch64-darwin_39 $bucket/tensorflow-${version}-cp39-cp39-macosx_12_0_arm64.whl" "aarch64-darwin_310 $bucket/tensorflow-${version}-cp310-cp310-macosx_12_0_arm64.whl" "aarch64-darwin_311 $bucket/tensorflow-${version}-cp311-cp311-macosx_12_0_arm64.whl" "aarch64-darwin_312 $bucket/tensorflow-${version}-cp312-cp312-macosx_12_0_arm64.whl" +"aarch64-darwin_313 $bucket/tensorflow-${version}-cp313-cp313-macosx_12_0_arm64.whl" ) hashfile=binary-hashes.nix diff --git a/pkgs/development/python-modules/tf-keras/default.nix b/pkgs/development/python-modules/tf-keras/default.nix index 4643ea82ef4c..e4dbdc919934 100644 --- a/pkgs/development/python-modules/tf-keras/default.nix +++ b/pkgs/development/python-modules/tf-keras/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "tf-keras"; - version = "2.19.0"; + version = "2.20.1"; pyproject = true; src = fetchPypi { pname = "tf_keras"; inherit version; - hash = "sha256-sJpAfYekVxzh6MqYXPxoSD49Y7JRil15qXrZLLZNvpw="; + hash = "sha256-iEvlk4+wsrU7FYPBritmDvhyFTd8KbW2p3/SIbRyrq8="; }; build-system = [