Update to Tensorflow 2.10.0

keras/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "keras" %}
-{% set version = "2.9.0" %}
+{% set version = "2.10.0" %}
 {% set major_minor = version.rsplit('.', 1)[0] %}
 
 package:
@@ -8,7 +8,7 @@ package:
 
 source:
   - url: https://pypi.io/packages/py2.py3/k/keras/keras-{{ version }}-py2.py3-none-any.whl
-    sha256: 55911256f89cfc9343c9fbe4b61ec45a2d33d89729cbe1ab9dcacf8b07b8b6ab
+    sha256: 26a6e2c2522e7468ddea22710a99b3290493768fc08a39e75d1173a0e3452fdf
   - url: https://raw.githubusercontent.com/keras-team/keras/v{{ version }}/LICENSE
     sha256: 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd
 
@@ -25,8 +25,6 @@ requirements:
     - wheel
   run:
     - python
-    - pyyaml
-    - scipy 1.7.3
     - keras-preprocessing  >=1.1.2
   run_constrained:
     # Other dependencies (such as h5py, numpy, ...) in their correct versions

tensorboard/meta.yaml

@@ -1,13 +1,13 @@
 {% set name = "tensorboard" %}
-{% set version = "2.9.0" %}
+{% set version = "2.10.0" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/py3/t/tensorboard/tensorboard-{{ version }}-py3-none-any.whl
-  sha256: bd78211076dca5efa27260afacfaa96cd05c7db12a6c09cc76a1d6b2987ca621
+  sha256: 76c91a5e8959cd2208cc32cb17a0cb002badabb66a06ac2af02a7810f49a59e3
 
 build:
   number: 0

tensorflow-base-cpu-gpu-linwin/build.sh

@@ -134,10 +134,8 @@ bazel build ${BAZEL_MKL_OPT} ${BAZEL_CUDA_OPT} ${BAZEL_OPT_FLAG} \
     --copt=-fPIC \
     --copt=-fstack-protector-strong \
     --copt=-O2 \
-    --copt=-DNO_CONSTEXPR_FOR_YOU=1 \
     --cxxopt=-fvisibility-inlines-hidden \
     --cxxopt=-fmessage-length=0 \
-    --host_copt=-DNO_CONSTEXPR_FOR_YOU=1 \
     --linkopt=-zrelro \
     --linkopt=-znow \
     --linkopt="-L${PREFIX}/lib" \

tensorflow-base-cpu-gpu-linwin/conda_build_config.yaml

@@ -1,11 +1,15 @@
-cxx_compiler:  # [win]
-  - vs2019     # [win]
-c_compiler:    # [win]
-  - vs2019     # [win]
+cxx_compiler:           # [win]
+  - vs2019              # [win]
+c_compiler:             # [win]
+  - vs2019              # [win]
+cxx_compiler_version:   # [linux64]
+  - 9.3.0               # [linux64]
+c_compiler_version:     # [linux64]
+  - 9.3.0               # [linux64]
 tflow_variant:
   - mkl
   - eigen
-  - gpu
+  - gpu                 # [linux64 or win]
 cudatoolkit:
   - 11.3
 cudnn:

tensorflow-base-cpu-gpu-linwin/def_bazelrc

@@ -127,8 +127,8 @@ build:windows --copt=/W0
 build:windows --copt=/D_USE_MATH_DEFINES
 build:windows --host_copt=/D_USE_MATH_DEFINES
 
-build:windows --cxxopt=/std:c++14
-build:windows --host_cxxopt=/std:c++14
+build:windows --cxxopt=/std:c++17
+build:windows --host_cxxopt=/std:c++17
 
 # On windows, we still link everything into a single DLL.
 build:windows --config=monolithic
@@ -159,6 +159,9 @@ build:windows --verbose_failures
 # On windows, we never cross compile
 build:windows --distinct_host_configuration=false
 
+# This is needed because otherwise abseil has trouble compiling
+build:windows --copt=/Zc:__cplusplus
+
 # Configure short or long logs
 build:short_logs --output_filter=DONT_MATCH_ANYTHING
 build:verbose_logs --output_filter=

tensorflow-base-cpu-gpu-linwin/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "2.9.1" %}
+{% set version = "2.10.0" %}
 {% set major_minor = version.rsplit('.', 1)[0] %}
 
 # This is the recipe for the "mkl", "eigen" and "gpu" variants of tensorflow-base
@@ -9,7 +9,7 @@ package:
 source:
   fn: tensorflow-{{ version }}.tar.gz
   url: https://github.com/tensorflow/tensorflow/archive/v{{ version }}.tar.gz
-  sha256: 6eaf86ead73e23988fe192da1db68f4d3828bcdd0f3a9dc195935e339c95dbdc
+  sha256: b5a1bb04c84b6fe1538377e5a1f649bb5d5f0b2e3625a3c526ff3a8af88633e8
   patches:
     - patches/0101-include-c-and-cc-headers.patch                   # [unix]
     - patches/0103-BUILD-changes-for-external-sqlite-package.patch  # [linux]
@@ -19,9 +19,10 @@ source:
     - patches/0202-Remove-extra-null-terminators.patch              # [linux and (tflow_variant == 'gpu')]
 
 build:
-  number: 1
+  number: 0
   skip: True  # [not x86_64 and not (linux and aarch64)]
   skip: True  # [win and vc<14]
+  skip: True  # [py<37]
   string: {{ tflow_variant }}_py{{ CONDA_PY }}h{{PKG_HASH}}_{{ PKG_BUILDNUM }}
   entry_points:
     - toco_from_protos = tensorflow.lite.toco.python.toco_from_protos:main
@@ -73,7 +74,7 @@ requirements:
     - dill >=0.3.1.1
     - giflib
     - grpc-cpp
-    - flatbuffers >=1.12
+    - flatbuffers 2.0
     - icu
     - jpeg
     - libpng
@@ -83,12 +84,11 @@ requirements:
     - sqlite
     - snappy
     - zlib
-    - abseil-cpp
-    - absl-py 0.10  # [py<39]
-    - absl-py 0.11  # [py>=39]
+    - requests
+    - absl-py 1.3.0
     - astunparse 1.6.3
-    - python-flatbuffers
-    - gast >=0.2.1
+    - python-flatbuffers 2.0
+    - gast 0.4.0
     - google-pasta >=0.1.1
     - grpcio >=1.24.3,<2.0
     - h5py >=2.9.0
@@ -118,18 +118,19 @@ requirements:
     - numpy >=1.20,<2
     - scipy >=1.7.3,<2
     - packaging
-    - absl-py >=0.10.0
+    - absl-py >=1.0.0
     - astunparse >=1.6.3
-    - flatbuffers >=1.12
-    - gast >=0.2.1
+    - flatbuffers >=2.0
+    - gast 0.4.0
     - google-pasta >=0.1.1
     - grpcio >=1.24.3,<2.0
     - h5py >=2.9.0
     - keras {{ major_minor }}.*
     - opt_einsum >=2.3.2
     - python
-    - python-flatbuffers
+    - python-flatbuffers >=2.0
     - setuptools
+    - requests
     - six >=1.12.0
     - tensorboard {{ major_minor }}.*
     - tensorflow-estimator {{ major_minor }}.*
@@ -165,8 +166,8 @@ about:
     provides you with complete programming control.
     Base package contains only tensorflow, not tensorflow-tensorboard.
   dev_url: https://github.com/tensorflow/tensorflow
-  doc_url: https://www.tensorflow.org/get_started/get_started
-  doc_source_url: https://github.com/tensorflow/tensorflow/tree/master/tensorflow/docs_src
+  doc_url: https://www.tensorflow.org/api_docs
+  doc_source_url: https://github.com/tensorflow/docs/
 
 extra:
   tflow_variant: {{ tflow_variant }}

tensorflow-base-cpu-gpu-linwin/patches/0202-Remove-extra-null-terminators.patch

@@ -17,23 +17,23 @@ diff --git a/tensorflow/core/platform/default/cuda_libdevice_path.cc b/tensorflo
 index 25eb6ab463..44522e5528 100644
 --- a/tensorflow/core/platform/default/cuda_libdevice_path.cc
 +++ b/tensorflow/core/platform/default/cuda_libdevice_path.cc
-@@ -27,7 +27,16 @@ namespace tensorflow {
+@@ -27,8 +27,15 @@
 
  std::vector<string> CandidateCudaRoots() {
-   VLOG(3) << "CUDA root = " << TF_CUDA_TOOLKIT_PATH;
+ #if !defined(PLATFORM_GOOGLE)
+-  VLOG(3) << "CUDA root = " << TF_CUDA_TOOLKIT_PATH;
 -  return {TF_CUDA_TOOLKIT_PATH, string("/usr/local/cuda")};
-+
-+/* WML-CE Issue #11827 - TF_CUDA_TOOLKIT_PATH will be stored as an
-+absolute path during the bazel build. Conda uses build paths that are
-+256 characters long. During conda install, it will replace the build path
-+with the shorter install path and append null terminators to keep the
-+binary file the same size. We need to use c_str() to remove the extra
-+null terminators.
-+*/
++  /* WML-CE Issue #11827 - TF_CUDA_TOOLKIT_PATH will be stored as an
++  absolute path during the bazel build. Conda uses build paths that are
++  256 characters long. During conda install, it will replace the build path
++  with the shorter install path and append null terminators to keep the
++  binary file the same size. We need to use c_str() to remove the extra
++  null terminators.
++  */
 +  string cuda_toolkit_path = TF_CUDA_TOOLKIT_PATH;
 +  return {cuda_toolkit_path.c_str(), string("/usr/local/cuda")};
- }
-
- }  // namespace tensorflow
+ #else
+   return {string("/usr/local/cuda")};
+ #endif
 --
 2.20.1

tensorflow-base-cpu-gpu-linwin/win_helper_cpu_gpu.sh

@@ -130,13 +130,12 @@ ${LIBRARY_BIN}/bazel build ${BAZEL_MKL_OPT} ${BAZEL_CUDA_OPT} \
     --host_copt=-D_copysign="copysign" \
     --cxxopt=-D_copysign="copysign" \
     --host_cxxopt=-D_copysign="copysign" \
-    --copt=-DNO_CONSTEXPR_FOR_YOU=1 \
-    --host_copt=-DNO_CONSTEXPR_FOR_YOU=1 \
     --python_path="${PYTHON}" \
     --action_env="PYTHON_BIN_PATH=${PYTHON}" \
     --action_env="PYTHON_LIB_PATH=${SP_DIR}" \
     --linkopt="-L$LIBRARY_PREFIX" \
     --strip=always \
+    --experimental_cc_shared_library \
     //tensorflow/tools/pip_package:build_pip_package
 
 PY_TEST_DIR="${SRC_DIR}/py_test_dir"