diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f5f654..8782346 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## HEAD +## 1.5.0 - 2023-07-06 + +### Features + +- Compatibility with Tensorflow 2.13.0 + ## 1.4.0 - 2023-07-03 ### Features diff --git a/WORKSPACE b/WORKSPACE index 21904e6..3d55787 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -11,9 +11,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # absl used by tensorflow. http_archive( name = "org_tensorflow", - strip_prefix = "tensorflow-2.12.0", - sha256 = "f67d5fdc15c38a50eb95d8788125ed7758e946b6c7313c188fe1d2fc9a9dfa1e", - urls = ["https://github.com/tensorflow/tensorflow/archive/v2.12.0.zip"], + strip_prefix = "tensorflow-2.13.0", + sha256 = "447cdb65c80c86d6c6cf1388684f157612392723eaea832e6392d219098b49de", + urls = ["https://github.com/tensorflow/tensorflow/archive/v2.13.0.zip"], ) # Inject tensorflow dependencies. diff --git a/configure/setup.py b/configure/setup.py index 801ed90..468242f 100644 --- a/configure/setup.py +++ b/configure/setup.py @@ -21,7 +21,7 @@ from setuptools.command.install import install from setuptools.dist import Distribution -_VERSION = "1.4.0" +_VERSION = "1.5.0" with open("README.md", "r", encoding="utf-8") as fh: long_description = fh.read() @@ -29,7 +29,7 @@ REQUIRED_PACKAGES = [ "numpy", "pandas", - "tensorflow~=2.12.0", + "tensorflow~=2.13.0", "six", "absl_py", "wheel", @@ -100,6 +100,7 @@ def get_tag(self): "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3 :: Only", "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Mathematics", diff --git a/documentation/known_issues.md b/documentation/known_issues.md index ad7e69c..6d9edec 100644 --- a/documentation/known_issues.md +++ b/documentation/known_issues.md @@ -46,6 +46,7 @@ The following table shows the compatibility between tensorflow_decision_forests | tensorflow --------------------------- | --------------- +1.5.0 | 2.13.0 1.3.0 - 1.4.0 | 2.12.0 1.1.0 - 1.2.0 | 2.11.0 1.0.0 - 1.0.1 | 2.10.0 - 2.10.1 diff --git a/tensorflow_decision_forests/__init__.py b/tensorflow_decision_forests/__init__.py index f2fbe48..20c251e 100644 --- a/tensorflow_decision_forests/__init__.py +++ b/tensorflow_decision_forests/__init__.py @@ -51,10 +51,10 @@ """ -__version__ = "1.4.0" +__version__ = "1.5.0" __author__ = "Mathieu Guillame-Bert" -compatible_tf_versions = ["2.12.0"] +compatible_tf_versions = ["2.13.0"] __git_version__ = "HEAD" # Modify for release build. from tensorflow_decision_forests.tensorflow import check_version diff --git a/tools/start_compile_docker.sh b/tools/start_compile_docker.sh index 057af3f..77800e8 100755 --- a/tools/start_compile_docker.sh +++ b/tools/start_compile_docker.sh @@ -59,7 +59,7 @@ # ./tools/build_pip_package.sh ALL_VERSIONS_ALREADY_ASSEMBLED # # https://hub.docker.com/r/tensorflow/build/tags?page=1 -DOCKER=tensorflow/build:2.12-python3.8 +DOCKER=tensorflow/build:2.13-python3.8 # Current directory # Useful if Yggdrasil Decision Forests is available locally in a neighbor diff --git a/tools/test_bazel.sh b/tools/test_bazel.sh index a704ef2..be3fa87 100755 --- a/tools/test_bazel.sh +++ b/tools/test_bazel.sh @@ -25,15 +25,16 @@ # and use "mac-intel-crosscompile" to build for Intel CPUs on an Apple Silicon machine. # Tests will not work when cross-compiling (obviously). # FULL_COMPILATION: If 1, compile all parts of TF-DF. This may take a long time. +# SHORT_COMMIT_SHA: Commit sha of Tensorfow. If empty, will try to retrieve automatically. # # Usage example # -# RUN_TESTS=1 PY_VERSION=3.8 TF_VERSION=2.12.0 ./tools/test_bazel.sh +# RUN_TESTS=1 PY_VERSION=3.8 TF_VERSION=2.13.0 ./tools/test_bazel.sh set -vex # Version of Python -# Needs to be >=python3.7 (3.8 on MacOS systems) +# Needs to be >=python3.8 PYTHON=python${PY_VERSION} # Install Pip dependencies @@ -56,9 +57,16 @@ echo -e "pip installed packages: \n" pip list # Get the commit SHA -short_commit_sha=$(${PYTHON} -c 'import tensorflow as tf; print(tf.__git_version__)' | tail -1 | grep -o "\-g[0-9a-f]*" | cut -c 3-) +if [ -z "${SHORT_COMMIT_SHA}" ]; then + SHORT_COMMIT_SHA=$(${PYTHON} -c 'import tensorflow as tf; print(tf.__git_version__)' | tail -1 | grep -o "\-g[0-9a-f]*" | cut -c 3-) + if [ -z "${SHORT_COMMIT_SHA}" ]; then + echo "Could not automatically get commit SHA from Tensorflow. Please manually set variable SHORT_COMMIT_SHA to the right value." + exit 1 + fi +fi + # Grep will close the pipe before curl is finished, which creates an error we ignore. -commit_sha=$(curl -SsL https://github.com/tensorflow/tensorflow/commit/${short_commit_sha} 2>/dev/null | grep -m1 -oE $short_commit_sha'[a-f0-9]{10,}') +commit_sha=$(curl -SsL https://github.com/tensorflow/tensorflow/commit/${SHORT_COMMIT_SHA} 2>/dev/null | grep -m1 -oE $SHORT_COMMIT_SHA'[a-f0-9]{10,}') # Update TF dependency to the chosen version sed -i'.bak' -e "s/strip_prefix = \"tensorflow-2\.[0-9]\+\.[0-9]\+\(-rc[0-9]\+\)\?\",/strip_prefix = \"tensorflow-${commit_sha}\",/" WORKSPACE sed -i'.bak' -e "s|\"https://github.com/tensorflow/tensorflow/archive/v.\+\.zip\"|\"https://github.com/tensorflow/tensorflow/archive/${commit_sha}.zip\"|" WORKSPACE