From c97bb40eab2cf99bcfdc325b6448a52e706d8cf6 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Tue, 12 Mar 2024 16:00:30 -0500 Subject: [PATCH] build: Determine tensorflow-probability requirements from python version * Split the requirements for the 'tensorflow' extra into two different conditional groups by python_version. - Starting with tensorflow v2.16.1, multiple changes were made that simplifies the installation of tensorflow across platform_machine and Keras v3.0 was adopted. - tensorflow-probability did _not_ adopt Keras v3.0, but instead requires tf-keras. Starting in tensorflow-probability v0.24.0 the 'tensorflow-probability[tf]' extra was added which includes all the required dependencies to be able to use tensorflow-probability with tensorflow v2.15+. - tensorflow v2.16.1 and tensorflow-probability v0.24.0 support Python 3.9+, so for Python 3.8 support the 'tensorflow' requirements need to use the previous more verbose conditionals. * Reverts PR https://github.com/scikit-hep/pyhf/pull/ 2448 --- pyproject.toml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a3be808496..fbc4f47d4d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,12 +67,18 @@ Homepage = "https://github.com/scikit-hep/pyhf" [project.optional-dependencies] shellcomplete = ["click_completion"] -# TODO: Use 'tensorflow' for all platform_machine for tensorflow v2.16.x+ +# TODO: 'tensorflow' supports all platform_machine for tensorflow v2.16.1+ +# but TensorFlow only supports python_version 3.8 up through tensorflow v2.13.1. +# So until Python 3.8 support is dropped, split requirments on python_version +# before and after 3.9. # NOTE: macos x86 support is deprecated from tensorflow v2.17.0 onwards. tensorflow = [ - "tensorflow>=2.7.0,!=2.16.1; platform_machine != 'arm64'", # c.f. PR #1962, #2448 - "tensorflow-macos>=2.7.0,!=2.16.1; platform_machine == 'arm64' and platform_system == 'Darwin'", # c.f. PR #2119, #2448 - "tensorflow-probability>=0.11.0", # c.f. PR #1657 + # python == 3.8 + "tensorflow>=2.7.0; python_version < '3.9' and platform_machine != 'arm64'", # c.f. PR #1962, #2452 + "tensorflow-macos>=2.7.0; python_version < '3.9' and platform_machine == 'arm64' and platform_system == 'Darwin'", # c.f. PR #2119, #2452 + "tensorflow-probability>=0.11.0; python_version < '3.9'", # c.f. PR #1657, #2452 + # python >= 3.9 + "tensorflow-probability[tf]>=0.24.0; python_version >= '3.9'" # c.f. PR #2452 ] torch = ["torch>=1.10.0"] # c.f. PR #1657 jax = [