diff --git a/keras/meta.yaml b/keras/meta.yaml index ac296a3..ec6a688 100644 --- a/keras/meta.yaml +++ b/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 diff --git a/tensorboard/meta.yaml b/tensorboard/meta.yaml index 1a4a6e2..5bf8e0c 100644 --- a/tensorboard/meta.yaml +++ b/tensorboard/meta.yaml @@ -1,5 +1,5 @@ {% set name = "tensorboard" %} -{% set version = "2.9.0" %} +{% set version = "2.10.0" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/py3/t/tensorboard/tensorboard-{{ version }}-py3-none-any.whl - sha256: bd78211076dca5efa27260afacfaa96cd05c7db12a6c09cc76a1d6b2987ca621 + sha256: 76c91a5e8959cd2208cc32cb17a0cb002badabb66a06ac2af02a7810f49a59e3 build: number: 0 diff --git a/tensorflow-base-cpu-gpu-linwin/build.sh b/tensorflow-base-cpu-gpu-linwin/build.sh index 8870326..24b64dd 100755 --- a/tensorflow-base-cpu-gpu-linwin/build.sh +++ b/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" \ diff --git a/tensorflow-base-cpu-gpu-linwin/conda_build_config.yaml b/tensorflow-base-cpu-gpu-linwin/conda_build_config.yaml index 7be0cab..f6d67b6 100644 --- a/tensorflow-base-cpu-gpu-linwin/conda_build_config.yaml +++ b/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: diff --git a/tensorflow-base-cpu-gpu-linwin/def_bazelrc b/tensorflow-base-cpu-gpu-linwin/def_bazelrc index e179805..2987fd5 100644 --- a/tensorflow-base-cpu-gpu-linwin/def_bazelrc +++ b/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= diff --git a/tensorflow-base-cpu-gpu-linwin/meta.yaml b/tensorflow-base-cpu-gpu-linwin/meta.yaml index 5b17632..457eb50 100644 --- a/tensorflow-base-cpu-gpu-linwin/meta.yaml +++ b/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 }} diff --git a/tensorflow-base-cpu-gpu-linwin/patches/0202-Remove-extra-null-terminators.patch b/tensorflow-base-cpu-gpu-linwin/patches/0202-Remove-extra-null-terminators.patch index 511e65c..b549ede 100644 --- a/tensorflow-base-cpu-gpu-linwin/patches/0202-Remove-extra-null-terminators.patch +++ b/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 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 diff --git a/tensorflow-base-cpu-gpu-linwin/win_helper_cpu_gpu.sh b/tensorflow-base-cpu-gpu-linwin/win_helper_cpu_gpu.sh index 4869238..afbc5ca 100755 --- a/tensorflow-base-cpu-gpu-linwin/win_helper_cpu_gpu.sh +++ b/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" diff --git a/tensorflow-base-cpu-osx/0004-loosen-requirements.patch b/tensorflow-base-cpu-osx/0004-loosen-requirements.patch deleted file mode 100644 index cd02091..0000000 --- a/tensorflow-base-cpu-osx/0004-loosen-requirements.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: work/tensorflow/tools/pip_package/setup.py -=================================================================== ---- work.orig/tensorflow/tools/pip_package/setup.py -+++ work/tensorflow/tools/pip_package/setup.py -@@ -78,21 +78,21 @@ REQUIRED_PACKAGES = [ - # NOTE: As numpy has releases that break semver guarantees and several other - # deps depend on numpy without an upper bound, we must install numpy before - # everything else. -- 'numpy ~= 1.19.2', -+ 'numpy >= 1.19', - # Install other dependencies - 'absl-py ~= 0.10', - 'astunparse ~= 1.6.3', -- 'flatbuffers ~= 1.12.0', -+ 'flatbuffers ~= 1.12', - 'google_pasta ~= 0.2', -- 'h5py ~= 3.1.0', -- 'keras_preprocessing ~= 1.1.2', -+ 'h5py >= 3.1.0', -+ 'keras_preprocessing >= 1.1.2', - 'opt_einsum ~= 3.3.0', - 'protobuf >= 3.9.2', -- 'six ~= 1.15.0', -- 'termcolor ~= 1.1.0', -- 'typing_extensions ~= 3.7.4', -- 'wheel ~= 0.35', -- 'wrapt ~= 1.12.1', -+ 'six >= 1.15.0', -+ 'termcolor >= 1.1.0', -+ 'typing_extensions >= 3.7.4', -+ 'wheel >= 0.35', -+ 'wrapt >= 1.11.2', - # These packages need to be pinned exactly as newer versions are - # incompatible with the rest of the ecosystem - 'gast == 0.4.0', -@@ -104,7 +104,7 @@ REQUIRED_PACKAGES = [ - 'tensorflow-estimator >= 2.5.0rc0 , < 2.6.0', - # TODO(scottzhu): OSS keras hasn't been formally released yet. - # Use keras-nightly at the moment. -- 'keras-nightly ~= 2.5.0.dev', -+ 'keras >= 2.4.0', - ] - - diff --git a/tensorflow-base-cpu-osx/0108-fix-absl-stuff.patch b/tensorflow-base-cpu-osx/0108-fix-absl-stuff.patch deleted file mode 100644 index 30fcd31..0000000 --- a/tensorflow-base-cpu-osx/0108-fix-absl-stuff.patch +++ /dev/null @@ -1,82 +0,0 @@ -From bc4521dd193290f86bd5de8a56cefbcbfeae3213 Mon Sep 17 00:00:00 2001 -From: David Majnemer -Date: Fri, 24 Jun 2022 15:34:08 -0700 -Subject: [PATCH] [XLA] Try to fix #56430 - -Let's use ABSL_ASSERT instead of using fancy compiler features which may be broken for some versions of Clang. - -PiperOrigin-RevId: 457106690 ---- - tensorflow/compiler/xla/util.h | 48 +++++----------------------------- - 1 file changed, 7 insertions(+), 41 deletions(-) - -diff --git a/tensorflow/compiler/xla/util.h b/tensorflow/compiler/xla/util.h -index 205aae16b09a6..a570174bf5fb9 100644 ---- a/tensorflow/compiler/xla/util.h -+++ b/tensorflow/compiler/xla/util.h -@@ -418,44 +418,13 @@ std::string HumanReadableNumTranscendentalOps(double trops, double nanoseconds); - // severity, filename, and line number. - void LogLines(int sev, absl::string_view text, const char* fname, int lineno); - --// Used on a function to trap bad calls: any call that matches the specified --// condition will cause a compile-time error. This macro uses a clang-specific --// "diagnose_if" attribute, as described at --// https://clang.llvm.org/docs/AttributeReference.html#diagnose-if --// --// Example: --// --// int compute_absolute_value(int c) --// XLA_DIAGNOSE_ERROR_IF(c >= 0, "'c' is already positive."); --#if ABSL_HAVE_ATTRIBUTE(diagnose_if) --#define XLA_DIAGNOSE_ERROR_IF(...) \ -- __attribute__((diagnose_if(__VA_ARGS__, "error"))) --#else --#define XLA_DIAGNOSE_ERROR_IF(...) --#endif -- --constexpr bool IsRuntimeEvaluated() { --#ifdef __cpp_lib_is_constant_evaluated -- return !std::is_constant_evaluated(); --#elif ABSL_HAVE_BUILTIN(__builtin_is_constant_evaluated) -- return !__builtin_is_constant_evaluated(); --#else -- return false; --#endif --} -- - // Returns a mask with "width" number of least significant bits set. - template --constexpr inline T LsbMask(int width) -- XLA_DIAGNOSE_ERROR_IF(width < 0 || width >= std::numeric_limits::digits, -- "width must be between [0, sizeof(T)*8)") { -+constexpr inline T LsbMask(int width) { - static_assert(std::is_unsigned::value, - "T should be an unsigned integer type"); -- if (IsRuntimeEvaluated()) { -- DCHECK_GE(width, 0) << "Unsupported width " << width; -- DCHECK_LE(width, std::numeric_limits::digits) -- << "Unsupported width " << width; -- } -+ ABSL_ASSERT(width >= 0); -+ ABSL_ASSERT(width <= std::numeric_limits::digits); - return width == 0 - ? 0 - : static_cast(-1) >> (std::numeric_limits::digits - width); -@@ -488,13 +457,10 @@ constexpr inline T ClearUpperBits(T value, int width) { - // Note: returns 1 when `exponent` is zero. - // Precondition: `exponent` is non-negative. - template --constexpr T IPow(T base, int exponent) -- XLA_DIAGNOSE_ERROR_IF(exponent < 0, "exponent must be non-negative") { -- if (IsRuntimeEvaluated()) { -- // A negative `exponent` is indicative of a logic bug for integral `base`. -- // We disallow it for floating-point types for symmetry. -- DCHECK_GE(exponent, 0); -- } -+constexpr T IPow(T base, int exponent) { -+ // A negative `exponent` is indicative of a logic bug for integral `base`. -+ // We disallow it for floating-point types for symmetry. -+ ABSL_ASSERT(exponent >= 0); - // We use the right-to-left binary exponentiation algorithm. - T result{1}; - while (exponent > 0) { \ No newline at end of file diff --git a/tensorflow-base-cpu-osx/build.sh b/tensorflow-base-cpu-osx/build.sh index 1c1dd4a..11ed081 100644 --- a/tensorflow-base-cpu-osx/build.sh +++ b/tensorflow-base-cpu-osx/build.sh @@ -5,14 +5,11 @@ set -ex bazel clean --expunge bazel shutdown -if [[ "${target_platform}" == osx-* ]]; then export PATH="$PWD:$PATH" export CC=$(basename $CC) export CXX=$(basename $CXX) -fi export LIBDIR=$PREFIX/lib export INCLUDEDIR=$PREFIX/include - export CC_FOR_BUILD=$CC # expand PREFIX in tensor's build_config/BUILD file @@ -60,67 +57,36 @@ sed -i -e "s/GRPCIO_VERSION/${grpc_cpp}/" tensorflow/tools/pip_package/setup.py export CC_OPT_FLAGS="${CFLAGS}" - -if [[ "${target_platform}" == osx-* ]]; then +if [[ "${target_platform}" == osx-64 ]]; then export CONDA_BUILD_SYSROOT=/opt/MacOSX10.14.sdk export MACOSX_DEPLOYMENT_TARGET=10.14 export LDFLAGS="${LDFLAGS} -lz -framework CoreFoundation -isysroot ${CONDA_BUILD_SYSROOT} -Xlinker -undefined -Xlinker dynamic_lookup" else - export LDFLAGS="${LDFLAGS} -lrt" + export CONDA_BUILD_SYSROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX13.0.sdk/ + export LDFLAGS="${LDFLAGS} -lz -framework CoreFoundation -isysroot ${CONDA_BUILD_SYSROOT} -Xlinker -undefined -Xlinker dynamic_lookup" fi -if [[ "${target_platform}" == osx-* ]]; then chmod +x ${RECIPE_DIR}/gen-bazel-toolchain.sh source ${RECIPE_DIR}/gen-bazel-toolchain.sh -fi -if [[ ${HOST} =~ .*darwin.* ]]; then - # set build arguments - export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 - BUILD_OPTS=" - --crosstool_top=//custom_toolchain:toolchain - --verbose_failures - ${BAZEL_MKL_OPT} - --config=opt" - export TF_ENABLE_XLA=0 -else - # Linux - # the following arguments are useful for debugging - # --logging=6 - # --subcommands - # jobs can be used to limit parallel builds and reduce resource needs - # --jobs=20 - # Set compiler and linker flags as bazel does not account for CFLAGS, - # CXXFLAGS and LDFLAGS. - BUILD_OPTS=" - --copt=-march=nocona - --copt=-mtune=haswell - --copt=-ftree-vectorize - --copt=-fPIC - --copt=-fstack-protector-strong - --copt=-O2 - --cxxopt=-fvisibility-inlines-hidden - --cxxopt=-fmessage-length=0 - --linkopt=-zrelro - --linkopt=-znow +# set build arguments +export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 +BUILD_OPTS=" + --crosstool_top=//custom_toolchain:toolchain --verbose_failures ${BAZEL_MKL_OPT} --config=opt" - export TF_ENABLE_XLA=0 - export GCC_HOST_COMPILER_PATH="${CC}" -fi +export TF_ENABLE_XLA=0 if [[ "${target_platform}" == "osx-64" ]]; then # Tensorflow doesn't cope yet with an explicit architecture (darwin_x86_64) on osx-64 yet. TARGET_CPU=darwin +else + TARGET_CPU=darwin_arm64 fi export TF_CONFIGURE_IOS=0 -#if [[ ${HOST} =~ "2*" ]]; then -# BUILD_OPTS="$BUILD_OPTS --config=v2" -#fi - # Python settings export PYTHON_BIN_PATH=${PYTHON} export PYTHON_LIB_PATH=${SP_DIR} @@ -160,8 +126,6 @@ bazel ${BAZEL_OPTS} build ${BUILD_OPTS} \ --python_path="${PYTHON}" \ --define=PREFIX="$PREFIX" \ --define=PROTOBUF_INCLUDE_PATH=${PREFIX}/include \ - --copt=-DNO_CONSTEXPR_FOR_YOU=1 \ - --host_copt=-DNO_CONSTEXPR_FOR_YOU=1 \ --define=LIBDIR="$PREFIX/lib" \ --define=INCLUDEDIR="$PREFIX/include" \ //tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow-base-cpu-osx/conda_build_config.yaml b/tensorflow-base-cpu-osx/conda_build_config.yaml index 7972aa5..1c82924 100644 --- a/tensorflow-base-cpu-osx/conda_build_config.yaml +++ b/tensorflow-base-cpu-osx/conda_build_config.yaml @@ -2,3 +2,9 @@ # which is enabled when MKL is turned on. tflow_variant: - eigen +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] + - "10.14" # [osx and x86_64] +MACOSX_SDK_VERSION: # [osx and x86_64] + - "10.14" # [osx and x86_64] +CONDA_BUILD_SYSROOT: + - /opt/MacOSX10.14.sdk # [osx and x86_64] \ No newline at end of file diff --git a/tensorflow-base-cpu-osx/meta.yaml b/tensorflow-base-cpu-osx/meta.yaml index 54e5ec2..7e41750 100644 --- a/tensorflow-base-cpu-osx/meta.yaml +++ b/tensorflow-base-cpu-osx/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" and "eigen" variants of tensorflow-base, but the MKL variant @@ -10,15 +10,15 @@ package: source: fn: tensorflow-{{ version }}.tar.gz url: https://github.com/tensorflow/tensorflow/archive/v{{ version }}.tar.gz - sha256: 6eaf86ead73e23988fe192da1db68f4d3828bcdd0f3a9dc195935e339c95dbdc + sha256: b5a1bb04c84b6fe1538377e5a1f649bb5d5f0b2e3625a3c526ff3a8af88633e8 patches: - 0101-include-c-and-cc-headers.patch - 0107-do-not-hardcode-ca-cert-location.patch - - 0108-fix-absl-stuff.patch build: - number: 1 - skip: True # [not x86_64 or not osx] + number: 0 + skip: True # [not osx] + 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 @@ -39,7 +39,6 @@ requirements: # required here for all OS's - bazel >=5.2.0 - aws-sdk-cpp - # - abseil-cpp - llvm-openmp - llvm-tools - libtool @@ -52,7 +51,6 @@ requirements: - llvm-openmp - wheel host: - # conda build requirements for .sh scripts on win - python - pip - setuptools @@ -67,7 +65,7 @@ requirements: - dill >=0.3.1.1 - giflib - grpc-cpp - - flatbuffers 1.12.* + - flatbuffers 2.0 - icu - jpeg - libpng @@ -77,17 +75,18 @@ requirements: - sqlite - snappy - zlib - - abseil-cpp - - absl-py 0.11 + - requests + - absl-py 1.3.0 - astunparse 1.6.3 - - python-flatbuffers 1.12.* + - python-flatbuffers 2.0 - gast 0.4.0 - google-pasta 0.2 - grpcio - h5py >=3.1.0 - keras-preprocessing >=1.1.2 - - numpy 1.20 # [py<=39] - - numpy 1.21 # [py>39] + - numpy 1.20 # [py<=39 and osx and x86_64] + - numpy 1.21 # [py>39 and osx and x86_64] + - numpy 1.21 # [osx and arm64] - opt_einsum 3.3.0.* # build only requirement, doesn't need a run dep below - protobuf >=3.9.2 @@ -106,9 +105,9 @@ requirements: - packaging run: - python - - absl-py >=0.10.0 + - absl-py >=1.0.0 - astunparse >=1.6.3 - - python-flatbuffers 1.12.* + - python-flatbuffers >=2.0 - google-pasta >=0.2 - h5py >=3.1.0 - keras {{ major_minor }}.* @@ -122,10 +121,11 @@ requirements: - wrapt >=1.11.2 - grpcio - packaging + - requests # upstream wants exact pin for gast - gast ==0.4.0 - scipy >=1.7.3,<2 - - flatbuffers + - flatbuffers >=2.0 - llvm-openmp - tensorboard {{ major_minor }}.* - tensorflow-estimator {{ major_minor }}.* @@ -142,8 +142,8 @@ test: - toco_from_protos --help about: - home: http://tensorflow.org/ - license: Apache 2.0 + home: https://tensorflow.org/ + license: Apache-2.0 license_family: Apache summary: TensorFlow is a machine learning library, base package contains only tensorflow. description: | @@ -151,8 +151,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 }} diff --git a/tensorflow-estimator/meta.yaml b/tensorflow-estimator/meta.yaml index 7a9a90d..83c0e5d 100644 --- a/tensorflow-estimator/meta.yaml +++ b/tensorflow-estimator/meta.yaml @@ -1,5 +1,5 @@ {% set name = "tensorflow-estimator" %} -{% 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/t/tensorflow-estimator/tensorflow_estimator-{{ version }}-py2.py3-none-any.whl - sha256: e9762bb302f51bc1eb2f35d19f0190a6a2d809d754d5def788c4328fe3746744 + sha256: f324ea17cd57f16e33bf188711d5077e6b2e5f5a12c328d6e01a07b23888edcd build: number: 0 @@ -20,6 +20,8 @@ requirements: host: - python - pip + - setuptools + - wheel run: - python run_constrained: diff --git a/tensorflow/conda_build_config_linux_64_cpu.yaml b/tensorflow/conda_build_config_linux_64_cpu.yaml index a4330f1..ffdcfab 100644 --- a/tensorflow/conda_build_config_linux_64_cpu.yaml +++ b/tensorflow/conda_build_config_linux_64_cpu.yaml @@ -1,13 +1,13 @@ # configuration for linux-64 eigen and mkl variants full_base_version: - - "2.9.1 eigen_py37hd99631c_0" - - "2.9.1 eigen_py38hd99631c_0" - - "2.9.1 eigen_py39hd99631c_0" - - "2.9.1 eigen_py310hd99631c_0" - - "2.9.1 mkl_py37h353358b_0" - - "2.9.1 mkl_py38h353358b_0" - - "2.9.1 mkl_py39h353358b_0" - - "2.9.1 mkl_py310h353358b_0" + - "2.10.0 eigen_py37h1969d1f_0" + - "2.10.0 eigen_py38h1969d1f_0" + - "2.10.0 eigen_py39h1969d1f_0" + - "2.10.0 eigen_py310h1969d1f_0" + - "2.10.0 mkl_py37hb9daa73_0" + - "2.10.0 mkl_py38hb9daa73_0" + - "2.10.0 mkl_py39hb9daa73_0" + - "2.10.0 mkl_py310hb9daa73_0" select_version: - "2.2.0 eigen" diff --git a/tensorflow/conda_build_config_linux_aarch64_cpu.yaml b/tensorflow/conda_build_config_linux_aarch64_cpu.yaml index b524b41..44e79ba 100644 --- a/tensorflow/conda_build_config_linux_aarch64_cpu.yaml +++ b/tensorflow/conda_build_config_linux_aarch64_cpu.yaml @@ -1,13 +1,13 @@ # configuration for linux-64 eigen and mkl variants full_base_version: - - "2.9.1 eigen_py37ha372be2_0" - - "2.9.1 eigen_py38ha372be2_0" - - "2.9.1 eigen_py39ha372be2_0" - - "2.9.1 eigen_py310ha372be2_0" - - "2.9.1 mkl_py37hfdbf31d_0" - - "2.9.1 mkl_py38hfdbf31d_0" - - "2.9.1 mkl_py39hfdbf31d_0" - - "2.9.1 mkl_py310hfdbf31d_0" + - "2.10.0 eigen_py37ha372be2_0" + - "2.10.0 eigen_py38ha372be2_0" + - "2.10.0 eigen_py39ha372be2_0" + - "2.10.0 eigen_py310ha372be2_0" + - "2.10.0 mkl_py37hfdbf31d_0" + - "2.10.0 mkl_py38hfdbf31d_0" + - "2.10.0 mkl_py39hfdbf31d_0" + - "2.10.0 mkl_py310hfdbf31d_0" select_version: - "2.2.0 eigen" diff --git a/tensorflow/conda_build_config_linux_cuda113.yaml b/tensorflow/conda_build_config_linux_cuda113.yaml index af06afb..004b22b 100644 --- a/tensorflow/conda_build_config_linux_cuda113.yaml +++ b/tensorflow/conda_build_config_linux_cuda113.yaml @@ -1,9 +1,9 @@ # configuration for linux-64 gpu, cuda 11.3 full_base_version: - - "2.9.1 gpu_py37h1986732_0" - - "2.9.1 gpu_py38h1986732_0" - - "2.9.1 gpu_py39h1986732_0" - - "2.9.1 gpu_py310h1986732_0" + - "2.10.0 gpu_py37h6559e04_0" + - "2.10.0 gpu_py38h6559e04_0" + - "2.10.0 gpu_py39h6559e04_0" + - "2.10.0 gpu_py310h6559e04_0" select_version: - "2.1.0 gpu" - "2.1.0 gpu" diff --git a/tensorflow/conda_build_config_osx_cpu.yaml b/tensorflow/conda_build_config_osx_cpu.yaml index 2686b59..4c50868 100644 --- a/tensorflow/conda_build_config_osx_cpu.yaml +++ b/tensorflow/conda_build_config_osx_cpu.yaml @@ -1,9 +1,9 @@ -# configuration for osx-64 eigen variant +# Configuration for osx-64 eigen variant. full_base_version: - - "2.9.1 eigen_py37h36d2db2_0" - - "2.9.1 eigen_py38h36d2db2_0" - - "2.9.1 eigen_py39h36d2db2_0" - - "2.9.1 eigen_py310h36d2db2_0" + - "2.10.0 eigen_py37h61e1807_0" + - "2.10.0 eigen_py38h61e1807_0" + - "2.10.0 eigen_py39h61e1807_0" + - "2.10.0 eigen_py310h61e1807_0" select_version: - "2.2.0 eigen" diff --git a/tensorflow/conda_build_config_osx_cpu_arm64.yaml b/tensorflow/conda_build_config_osx_cpu_arm64.yaml new file mode 100644 index 0000000..8e47b1b --- /dev/null +++ b/tensorflow/conda_build_config_osx_cpu_arm64.yaml @@ -0,0 +1,27 @@ +# Configuration for osx-arm64 eigen variant. +# Note that we don't build for Python 3.7 due to numpy limitations. +full_base_version: + - "2.10.0 eigen_py38h4111cb8_0" + - "2.10.0 eigen_py39h4111cb8_0" + - "2.10.0 eigen_py310h4111cb8_0" + +select_version: + - "2.2.0 eigen" + - "2.2.0 eigen" + - "2.2.0 eigen" + +tflow_variant: + - "eigen" + - "eigen" + - "eigen" + +py_version: + - 3.8 + - 3.9 + - 3.10 + +zip_keys: + - full_base_version + - select_version + - tflow_variant + - py_version diff --git a/tensorflow/conda_build_config_win_cpu.yaml b/tensorflow/conda_build_config_win_cpu.yaml index 1238fcd..509daf5 100644 --- a/tensorflow/conda_build_config_win_cpu.yaml +++ b/tensorflow/conda_build_config_win_cpu.yaml @@ -1,13 +1,13 @@ # configuration for win-64 eigen and mkl variants full_base_version: - - "2.9.1 eigen_py37he3c91d7_0" - - "2.9.1 eigen_py38he3c91d7_0" - - "2.9.1 eigen_py39he3c91d7_0" - - "2.9.1 eigen_py310he3c91d7_0" - - "2.9.1 mkl_py37h6a7f48e_0" - - "2.9.1 mkl_py38h6a7f48e_0" - - "2.9.1 mkl_py39h6a7f48e_0" - - "2.9.1 mkl_py310h6a7f48e_0" + - "2.10.0 eigen_py37he3c91d7_0" + - "2.10.0 eigen_py38he3c91d7_0" + - "2.10.0 eigen_py39he3c91d7_0" + - "2.10.0 eigen_py310he3c91d7_0" + - "2.10.0 mkl_py37h6a7f48e_0" + - "2.10.0 mkl_py38h6a7f48e_0" + - "2.10.0 mkl_py39h6a7f48e_0" + - "2.10.0 mkl_py310h6a7f48e_0" select_version: - "2.2.0 eigen" diff --git a/tensorflow/conda_build_config_win_cuda113.yaml b/tensorflow/conda_build_config_win_cuda113.yaml index e6e8531..d029c9c 100644 --- a/tensorflow/conda_build_config_win_cuda113.yaml +++ b/tensorflow/conda_build_config_win_cuda113.yaml @@ -1,9 +1,9 @@ # configuration for win-64 gpu, cuda 11.3 full_base_version: - - "2.9.1 gpu_py37h9761872_0" - - "2.9.1 gpu_py38h9761872_0" - - "2.9.1 gpu_py39h9761872_0" - - "2.9.1 gpu_py310h9761872_0" + - "2.10.0 gpu_py37h9761872_0" + - "2.10.0 gpu_py38h9761872_0" + - "2.10.0 gpu_py39h9761872_0" + - "2.10.0 gpu_py310h9761872_0" select_version: - "2.1.0 gpu" diff --git a/tensorflow/meta.yaml b/tensorflow/meta.yaml index b6acae7..685730e 100644 --- a/tensorflow/meta.yaml +++ b/tensorflow/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.9.1" %} +{% set version = "2.10.0" %} {% set major_minor = version.rsplit('.', 1)[0] %} package: