Merge pull request #24186 from tensorflow:merge_branch

PiperOrigin-RevId: 225391435
This commit is contained in:
TensorFlower Gardener 2018-12-13 10:22:21 -08:00
commit 4ba2816bfa
3 changed files with 4 additions and 2 deletions

View File

@ -7,6 +7,8 @@
Serving. Serving.
* Keras models now support evaluating with a `tf.data.Dataset`. * Keras models now support evaluating with a `tf.data.Dataset`.
* TensorFlow binaries are built with XLA support linked in by default. * TensorFlow binaries are built with XLA support linked in by default.
* Ignite Dataset added to contrib/ignite that allows to work with Apache
Ignite.
## Bug Fixes and Other Changes ## Bug Fixes and Other Changes

View File

@ -24,7 +24,7 @@ limitations under the License.
// TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1", // TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1",
// "-beta", "-rc", "-rc.1") // "-beta", "-rc", "-rc.1")
#define TF_VERSION_SUFFIX "-rc0" #define TF_VERSION_SUFFIX ""
#define TF_STR_HELPER(x) #x #define TF_STR_HELPER(x) #x
#define TF_STR(x) TF_STR_HELPER(x) #define TF_STR(x) TF_STR_HELPER(x)

View File

@ -45,7 +45,7 @@ DOCLINES = __doc__.split('\n')
# This version string is semver compatible, but incompatible with pip. # This version string is semver compatible, but incompatible with pip.
# For pip, we will remove all '-' characters from this string, and use the # For pip, we will remove all '-' characters from this string, and use the
# result for pip. # result for pip.
_VERSION = '1.12.0-rc0' _VERSION = '1.12.0'
REQUIRED_PACKAGES = [ REQUIRED_PACKAGES = [
'absl-py >= 0.1.6', 'absl-py >= 0.1.6',