From a6525e660f6051c08fbdf5567fca0f1e7967d9cc Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 8 Sep 2021 20:41:04 +0200 Subject: [PATCH 1/7] tensorflow 2.6.0 --- .scripts/run_osx_build.sh | 4 +- recipe/build.sh | 3 +- recipe/meta.yaml | 110 +++--- recipe/patches/0004-loosen-requirements.patch | 37 +- recipe/patches/0005-osx-arm64.patch | 354 ------------------ 5 files changed, 77 insertions(+), 431 deletions(-) delete mode 100644 recipe/patches/0005-osx-arm64.patch diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index cfc2aafd..96d02787 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -9,7 +9,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -66,4 +66,4 @@ if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml fi -( endgroup "Uploading packages" ) 2> /dev/null +( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file diff --git a/recipe/build.sh b/recipe/build.sh index a1152afa..4c146ee0 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -27,7 +27,6 @@ export TF_SYSTEM_LIBS=" astor_archive astunparse_archive boringssl - com_github_googleapis_googleapis com_github_googlecloudplatform_google_cloud_cpp com_github_grpc_grpc com_google_protobuf @@ -80,6 +79,7 @@ BUILD_OPTS=" --config=opt --define=PREFIX=${PREFIX} --define=PROTOBUF_INCLUDE_PATH=${PREFIX}/include + --config=noaws --cpu=${TARGET_CPU}" if [[ "${target_platform}" == "osx-arm64" ]]; then @@ -111,7 +111,6 @@ sed -i -e "/PROTOBUF_INCLUDE_PATH/c\ " .bazelrc sed -i -e "/PREFIX/c\ " .bazelrc ./configure -echo "build --config=noaws" >> .bazelrc # build using bazel bazel ${BAZEL_OPTS} build ${BUILD_OPTS} ${BUILD_TARGET} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aec53482..2123fc16 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.4.3" %} +{% set version = "2.6.0" %} package: name: tensorflow-split @@ -6,7 +6,7 @@ package: source: url: https://github.com/tensorflow/tensorflow/archive/v{{ version }}.tar.gz - sha256: cafd520c753f8755a9eb1262932f685dc722d8658f08373f8ec88d8acd58d7d4 + sha256: 41b32eeaddcbc02b0583660bcf508469550e4cd0f86b22d2abe72dfebeacde0f patches: - patches/0001-relax-tolerence-in-special_math_test.patch @@ -14,7 +14,6 @@ source: - patches/0003-relax-precision-in-matrix_log_op_test.patch # requires setting GRPCIO_VERSION in build script - patches/0004-loosen-requirements.patch - - patches/0005-osx-arm64.patch # [osx and arm64] build: number: 0 @@ -27,10 +26,8 @@ requirements: - numpy 1.19.* # [build_platform != target_platform] - {{ compiler('c') }} - {{ compiler('cxx') }} - # see https://github.com/tensorflow/tensorflow/blob/v{{ version }}/.bazelversion - - bazel 3.1.0 # [not osx] - # For osx-arm64 cross-compilation to work, we need bazel>=4.1 - - bazel 4.0 # [osx] + - bazel + - bazel >=4.2.1 # [osx and arm64] - grpc-cpp - libprotobuf - nasm @@ -67,25 +64,26 @@ requirements: - zlib # requirements specified by the package itself, see # github.com/tensorflow/tensorflow/blob/v{{ version }}/tensorflow/tools/pip_package/setup.py - - absl-py >=0.10.0 - - astunparse >=1.6.3 - - python-flatbuffers 1.12.* - - google-pasta >=0.2 - - h5py >=2.10 - - keras-preprocessing >=1.1.2 + - absl-py >=0.10,<1 + - astunparse >=1.6.3,<1.7 + - python-flatbuffers >=1.12,<2 + - google-pasta >=0.2,<1 + - h5py >=3.1.0,<3.2 + - keras-preprocessing >=1.1.2,<1.2 - numpy 1.19.* - - opt_einsum 3.3.0.* + - opt_einsum >=3.3,<3.4 - protobuf >=3.9.2 - - six 1.15.0.* - - termcolor >=1.1.0 - - typing_extensions 3.7.4.* - - wheel >=0.35 - - wrapt >=1.11.1 + - six >=1.15,<1.16 + - termcolor >=1.1,<1.2 + - typing_extensions >=3.7.4,<3.8 + - wheel >=0.35,<1 + - wrapt >=1.12.1,<1.13 # upstream wants exact pin for gast - - gast ==0.3.3 + - gast ==0.4.0 # TF-API needs to move in sync - - tensorboard >=2.4.0,<2.5 - - tensorflow-estimator >=2.4.0,<2.5 + - tensorboard >=2.6,<3 + # - tensorflow-estimator >=2.6,<3 + - keras >=2.6,<3 outputs: - name: tensorflow-base @@ -128,47 +126,49 @@ outputs: - sqlite - zlib # requirements specified by the package itself - - absl-py >=0.10.0 - - astunparse >=1.6.3 - - python-flatbuffers 1.12.* - - google-pasta >=0.2 - - h5py 2.10.* - - keras-preprocessing >=1.1.2 - - numpy 1.19.* - - opt_einsum 3.3.0.* + - absl-py >=0.10,<1 + - astunparse >=1.6.3,<1.7 + - python-flatbuffers >=1.12,<2 + - google-pasta >=0.2,<1 + - h5py >=3.1.0,<3.2 + - keras-preprocessing >=1.1.2,<1.2 + - numpy >=1.19.2,<1.20 + - opt_einsum >=3.3,<3.4 - protobuf >=3.9.2 - - six 1.15.0.* - - termcolor >=1.1.0 - - typing_extensions 3.7.4.* - - wheel >=0.35 - - wrapt >=1.11.1 + - six >=1.15,<1.16 + - termcolor >=1.1,<1.2 + - typing_extensions >=3.7.4,<3.8 + - wheel >=0.35,<1 + - wrapt >=1.12.1,<1.13 # upstream wants exact pin for gast - - gast ==0.3.3 + - gast ==0.4.0 # TF-API needs to move in sync - - tensorboard >=2.4.0,<2.5 - - tensorflow-estimator >=2.4.0,<2.5 + - tensorboard >=2.6,<3 + # - tensorflow-estimator >=2.6,<3 + - keras >=2.6,<3 run: - python - - absl-py >=0.10.0 - - astunparse >=1.6.3 - - python-flatbuffers 1.12.* - - google-pasta >=0.2 - - h5py 2.10.* - - keras-preprocessing >=1.1.2 - - numpy >=1.19 - - opt_einsum 3.3.0.* + - absl-py >=0.10,<1 + - astunparse >=1.6.3,<1.7 + - python-flatbuffers >=1.12,<2 + - google-pasta >=0.2,<1 + - h5py >=3.1.0,<3.2 + - keras-preprocessing >=1.1.2,<1.2 + - numpy >=1.19.2,<1.20 + - opt_einsum >=3.3,<3.4 - protobuf >=3.9.2 - - six 1.15.0.* - - termcolor >=1.1.0 - - typing_extensions 3.7.4.* - - wheel >=0.35 - - wrapt >=1.11.1 - - grpcio {{ grpc_cpp }}.* + - six >=1.15,<1.16 + - termcolor >=1.1,<1.2 + - typing_extensions >=3.7.4,<3.8 + - wheel >=0.35,<1 + - wrapt >=1.12.1,<1.13 # upstream wants exact pin for gast - - gast ==0.3.3 + - gast ==0.4.0 # TF-API needs to move in sync - - tensorboard >=2.4.0,<2.5 - - tensorflow-estimator >=2.4.0,<2.5 + - tensorboard >=2.6,<3 + # - tensorflow-estimator >=2.6,<3 + - keras >=2.6,<3 + - grpcio {{ grpc_cpp }}.* test: requires: - pip diff --git a/recipe/patches/0004-loosen-requirements.patch b/recipe/patches/0004-loosen-requirements.patch index f01eeff7..771b89b9 100644 --- a/recipe/patches/0004-loosen-requirements.patch +++ b/recipe/patches/0004-loosen-requirements.patch @@ -1,34 +1,35 @@ -From 5fbf80906ab7cd1bfd429f40fb4ef95cd8ff370d Mon Sep 17 00:00:00 2001 +From b6371c3abefb0ab2b3e943f43088ab42fac9c5bc Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" -Date: Tue, 6 Apr 2021 17:52:09 +0200 -Subject: [PATCH 4/5] loosen requirements +Date: Wed, 8 Sep 2021 06:57:09 +0200 +Subject: [PATCH] Fixup requirements +* Set grpcio pin to the built grpc version +* Remove unused clang requirement --- - tensorflow/tools/pip_package/setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + tensorflow/tools/pip_package/setup.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index 65133afdafe..a749ec320f6 100644 +index 3d4a64de..3ea8ac5e 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py -@@ -81,7 +81,7 @@ REQUIRED_PACKAGES = [ +@@ -82,7 +82,6 @@ REQUIRED_PACKAGES = [ + # Install other dependencies + 'absl-py ~= 0.10', + 'astunparse ~= 1.6.3', +- 'clang ~= 5.0', + 'flatbuffers ~= 1.12.0', 'google_pasta ~= 0.2', - 'h5py ~= 2.10.0', - 'keras_preprocessing ~= 1.1.2', -- 'numpy ~= 1.19.2', -+ 'numpy ~= 1.19', - 'opt_einsum ~= 3.3.0', - 'protobuf >= 3.9.2', - 'six ~= 1.15.0', -@@ -118,7 +118,7 @@ if 'tf_nightly' in project_name: + 'h5py ~= 3.1.0', +@@ -126,7 +125,7 @@ if 'tf_nightly' in project_name: # BoringSSL support. # See https://github.com/tensorflow/tensorflow/issues/17882. if sys.byteorder == 'little': -- REQUIRED_PACKAGES.append('grpcio ~= 1.32.0') -+ REQUIRED_PACKAGES.append('grpcio ~= GRPCIO_VERSION') +- REQUIRED_PACKAGES.append('grpcio >= 1.37.0, < 2.0') ++ REQUIRED_PACKAGES.append('grpcio >= GRPCIO_VERSION, < 2.0') # Packages which are only needed for testing code. -- -2.29.2.windows.3 +2.30.1 (Apple Git-130) diff --git a/recipe/patches/0005-osx-arm64.patch b/recipe/patches/0005-osx-arm64.patch deleted file mode 100644 index 5fb8bdcb..00000000 --- a/recipe/patches/0005-osx-arm64.patch +++ /dev/null @@ -1,354 +0,0 @@ -From d1b4f86fc52acf2701bb2b3843352b0e3bb2d7e2 Mon Sep 17 00:00:00 2001 -From: "Uwe L. Korn" -Date: Thu, 1 Apr 2021 12:43:34 +0200 -Subject: [PATCH 5/5] osx-arm64 - ---- - .bazelrc | 5 +++ - tensorflow/BUILD | 45 +++++++++++++++++-- - tensorflow/compiler/aot/tfcompile.bzl | 3 +- - tensorflow/compiler/xla/service/cpu/BUILD | 3 ++ - tensorflow/core/kernels/BUILD | 2 + - tensorflow/lite/kernels/internal/BUILD | 8 ++++ - tensorflow/tensorflow.bzl | 20 +++++---- - .../tools/pip_package/build_pip_package.sh | 4 +- - third_party/cpuinfo/BUILD.bazel | 11 ++++- - third_party/llvm/llvm.bzl | 10 ++++- - .../remote_platform_configure.bzl | 2 + - 12 files changed, 96 insertions(+), 19 deletions(-) - -diff --git a/.bazelrc b/.bazelrc -index aaf1e10a5c7..3700066ed4b 100644 ---- a/.bazelrc -+++ b/.bazelrc -@@ -135,6 +135,10 @@ build:ios_x86_64 --cpu=ios_x86_64 - build:ios_fat --config=ios - build:ios_fat --ios_multi_cpus=armv7,arm64,i386,x86_64 - -+build:macos_arm64 --config=macos -+build:macos_arm64 --apple_platform_type=macos -+build:macos_arm64 --cpu=darwin_arm64 -+ - # Config to use a mostly-static build and disable modular op registration - # support (this will revert to loading TensorFlow with RTLD_GLOBAL in Python). - # By default, TensorFlow will build with a dependence on -@@ -278,6 +282,7 @@ build:c++1z_gcc --config=c++17_gcc - build --enable_platform_specific_config - build:android --noenable_platform_specific_config - build:ios --noenable_platform_specific_config -+build:macos_arm64 --noenable_platform_specific_config - - # Suppress C++ compiler warnings, otherwise build logs become 10s of MBs. - build:android --copt=-w -diff --git a/tensorflow/BUILD b/tensorflow/BUILD -index 56b33a493fc..7497086eb8f 100644 ---- a/tensorflow/BUILD -+++ b/tensorflow/BUILD -@@ -174,7 +174,7 @@ config_setting( - ) - - config_setting( -- name = "macos", -+ name = "macos_x86_64", - values = { - "apple_platform_type": "macos", - "cpu": "darwin", -@@ -182,6 +182,23 @@ config_setting( - visibility = ["//visibility:public"], - ) - -+config_setting( -+ name = "macos_arm64", -+ values = { -+ "apple_platform_type": "macos", -+ "cpu": "darwin_arm64", -+ }, -+ visibility = ["//visibility:public"], -+) -+ -+selects.config_setting_group( -+ name = "macos", -+ match_any = [ -+ ":macos_x86_64", -+ ":macos_arm64", -+ ], -+) -+ - config_setting( - name = "ios", - values = {"apple_platform_type": "ios"}, -@@ -383,7 +400,7 @@ config_setting( - ) - - config_setting( -- name = "macos_with_framework_shared_object", -+ name = "macos_x86_64_with_framework_shared_object", - define_values = { - "framework_shared_object": "true", - }, -@@ -394,6 +411,26 @@ config_setting( - visibility = ["//visibility:public"], - ) - -+config_setting( -+ name = "macos_arm64_with_framework_shared_object", -+ define_values = { -+ "framework_shared_object": "true", -+ }, -+ values = { -+ "apple_platform_type": "macos", -+ "cpu": "darwin_arm64", -+ }, -+ visibility = ["//visibility:public"], -+) -+ -+selects.config_setting_group( -+ name = "macos_with_framework_shared_object", -+ match_any = [ -+ ":macos_x86_64_with_framework_shared_object", -+ ":macos_arm64_with_framework_shared_object", -+ ], -+) -+ - config_setting( - name = "using_cuda_clang", - define_values = { -@@ -725,7 +762,9 @@ tf_cc_shared_object( - name = "tensorflow_framework", - framework_so = [], - linkopts = select({ -- "//tensorflow:macos": [], -+ "//tensorflow:macos": [ -+ "-Wl,-rename_section,__TEXT,text_env,__TEXT,__text", -+ ], - "//tensorflow:windows": [], - "//tensorflow:freebsd": [ - "-Wl,--version-script,$(location //tensorflow:tf_framework_version_script.lds)", -diff --git a/tensorflow/compiler/aot/tfcompile.bzl b/tensorflow/compiler/aot/tfcompile.bzl -index 29f37bf7498..0d76cf5b1b6 100644 ---- a/tensorflow/compiler/aot/tfcompile.bzl -+++ b/tensorflow/compiler/aot/tfcompile.bzl -@@ -432,7 +432,8 @@ def target_llvm_triple(): - "//tensorflow:ios": "arm64-none-ios", - "//tensorflow:ios_x86_64": "x86_64-apple-ios", - "//tensorflow:linux_ppc64le": "ppc64le-ibm-linux-gnu", -- "//tensorflow:macos": "x86_64-none-darwin", -+ "//tensorflow:macos_x86_64": "x86_64-none-darwin", -+ "//tensorflow:macos_arm64": "aarch64-none-darwin", - "//tensorflow:windows": "x86_64-none-windows", - "//tensorflow:linux_s390x": "systemz-none-linux-gnu", - "//conditions:default": "x86_64-pc-linux", -diff --git a/tensorflow/compiler/xla/service/cpu/BUILD b/tensorflow/compiler/xla/service/cpu/BUILD -index e5c59fc0c7a..fbaf6f4ad19 100644 ---- a/tensorflow/compiler/xla/service/cpu/BUILD -+++ b/tensorflow/compiler/xla/service/cpu/BUILD -@@ -229,6 +229,9 @@ cc_library( - "//tensorflow:linux_ppc64le": [ - "@llvm-project//llvm:PowerPCCodeGen", # fixdeps: keep - ], -+ "//tensorflow:macos_arm64": [ -+ "@llvm-project//llvm:AArch64CodeGen", # fixdeps: keep -+ ], - "//conditions:default": [ - ], - }) + if_llvm_system_z_available([ -diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD -index 53c53ac3ff6..74a18738cdc 100644 ---- a/tensorflow/core/kernels/BUILD -+++ b/tensorflow/core/kernels/BUILD -@@ -773,6 +773,7 @@ cc_library( - "//tensorflow:arm_any": [], - "//tensorflow:ios": [], - "//tensorflow:linux_ppc64le": [], -+ "//tensorflow:macos_arm64": [], - "//conditions:default": [ - "TENSORFLOW_USE_CUSTOM_CONTRACTION_KERNEL", - "TENSORFLOW_USE_MKLDNN_CONTRACTION_KERNEL", -@@ -787,6 +788,7 @@ cc_library( - "//tensorflow:arm_any": [], - "//tensorflow:ios": [], - "//tensorflow:linux_ppc64le": [], -+ "//tensorflow:macos_arm64": [], - "//conditions:default": ["@mkl_dnn//:mkldnn_single_threaded"], - }), - ) -diff --git a/tensorflow/lite/kernels/internal/BUILD b/tensorflow/lite/kernels/internal/BUILD -index 94135c6adbe..be7554ac799 100644 ---- a/tensorflow/lite/kernels/internal/BUILD -+++ b/tensorflow/lite/kernels/internal/BUILD -@@ -186,6 +186,13 @@ config_setting( - }, - ) - -+config_setting( -+ name = "darwin_arm64", -+ values = { -+ "cpu": "darwin_arm64", -+ }, -+) -+ - config_setting( - name = "freebsd", - values = { -@@ -777,6 +784,7 @@ cc_library( - ":ios_armv7", - ":ios_arm64", - ":ios_arm64e", -+ ":darwin_arm64", - ":raspberry_pi_with_neon", - ): [":neon_tensor_utils"], - ( -diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl -index 096cdd17dcb..35f940ec408 100644 ---- a/tensorflow/tensorflow.bzl -+++ b/tensorflow/tensorflow.bzl -@@ -444,6 +444,7 @@ def _rpath_linkopts(name): - return select({ - clean_dep("//tensorflow:macos"): [ - "-Wl,%s" % (_make_search_paths("@loader_path", levels_to_root),), -+ "-Wl,-rename_section,__TEXT,text_env,__TEXT,__text" - ], - clean_dep("//tensorflow:windows"): [], - "//conditions:default": [ -@@ -1942,22 +1943,24 @@ def pywrap_tensorflow_macro( - - if not version_script: - version_script = select({ -- "@local_config_cuda//cuda:darwin": clean_dep("//tensorflow:tf_exported_symbols.lds"), -+ "//tensorflow:macos": clean_dep("//tensorflow:tf_exported_symbols.lds"), - "//conditions:default": clean_dep("//tensorflow:tf_version_script.lds"), - }) - vscriptname = name + "_versionscript" - _append_init_to_versionscript( - name = vscriptname, - is_version_script = select({ -- "@local_config_cuda//cuda:darwin": False, -+ "//tensorflow:macos": False, - "//conditions:default": True, - }), - module_name = module_name, - template_file = version_script, - ) - extra_linkopts = select({ -- "@local_config_cuda//cuda:darwin": [ -- "-Wl,-exported_symbols_list,$(location %s.lds)" % vscriptname, -+ clean_dep("//tensorflow:macos"): [ -+ # TODO: the -w suppresses a wall of harmless warnings about hidden typeinfo symbols -+ # not being exported. There should be a better way to deal with this. -+ "-Wl,-w", "-Wl,-exported_symbols_list,$(location %s.lds)" % vscriptname, - ], - clean_dep("//tensorflow:windows"): [], - "//conditions:default": [ -@@ -1966,9 +1969,6 @@ def pywrap_tensorflow_macro( - ], - }) - extra_deps += select({ -- "@local_config_cuda//cuda:darwin": [ -- "%s.lds" % vscriptname, -- ], - clean_dep("//tensorflow:windows"): [], - "//conditions:default": [ - "%s.lds" % vscriptname, -@@ -2598,8 +2598,10 @@ def pybind_extension( - ], - }), - linkopts = linkopts + _rpath_linkopts(name) + select({ -- "@local_config_cuda//cuda:darwin": [ -- "-Wl,-exported_symbols_list,$(location %s)" % exported_symbols_file, -+ clean_dep("//tensorflow:macos"): [ -+ # TODO: the -w suppresses a wall of harmless warnings about hidden typeinfo symbols -+ # not being exported. There should be a better way to deal with this. -+ "-Wl,-w", "-Wl,-exported_symbols_list,$(location %s)" % exported_symbols_file, - ], - clean_dep("//tensorflow:windows"): [], - "//conditions:default": [ -diff --git a/tensorflow/tools/pip_package/build_pip_package.sh b/tensorflow/tools/pip_package/build_pip_package.sh -index 7a070938045..a1f26821804 100755 ---- a/tensorflow/tools/pip_package/build_pip_package.sh -+++ b/tensorflow/tools/pip_package/build_pip_package.sh -@@ -216,10 +216,10 @@ function prepare_src() { - if [ -d "${TMPDIR}/tensorflow/_api/v1/" ] - then - cp -r ${TMPDIR}/tensorflow/python/keras/api/_v1/keras/ ${TMPDIR}/tensorflow/keras/ -- sed -i'.original' -e 's/.python.keras.api._v1/tensorflow/g' ${TMPDIR}/tensorflow/__init__.py -+ find . -type f -maxdepth 0 -exec sed -i'.original' -e 's/.python.keras.api._v1/tensorflow/g' ${TMPDIR}/tensorflow/__init__.py {} + - else - cp -r ${TMPDIR}/tensorflow/python/keras/api/_v2/keras/ ${TMPDIR}/tensorflow/keras/ -- sed -i'.original' -e 's/.python.keras.api._v2/tensorflow/g' ${TMPDIR}/tensorflow/__init__.py -+ find . -type f -maxdepth 0 -exec sed -i'.original' -e 's/.python.keras.api._v2/tensorflow/g' ${TMPDIR}/tensorflow/__init__.py {} + - fi - } - -diff --git a/third_party/cpuinfo/BUILD.bazel b/third_party/cpuinfo/BUILD.bazel -index 9b007cc0daa..ca4cf59f0ba 100644 ---- a/third_party/cpuinfo/BUILD.bazel -+++ b/third_party/cpuinfo/BUILD.bazel -@@ -103,7 +103,8 @@ cc_library( - ":linux_armeabi": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS, - ":linux_aarch64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS, - ":linux_mips64": COMMON_SRCS + LINUX_SRCS, -- ":macos_x86_64": COMMON_SRCS + X86_SRCS + MACH_SRCS + MACH_X86_SRCS, -+ ":macos_x86_64": COMMON_SRCS + MACH_SRCS + MACH_ARM_SRCS, -+ ":macos_arm64": COMMON_SRCS + MACH_SRCS + MACH_ARM_SRCS, - ":windows_x86_64": COMMON_SRCS + X86_SRCS + WINDOWS_X86_SRCS, - ":android_armv7": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS + ANDROID_ARM_SRCS, - ":android_arm64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS + ANDROID_ARM_SRCS, -@@ -303,6 +304,14 @@ config_setting( - }, - ) - -+config_setting( -+ name = "macos_arm64", -+ values = { -+ "apple_platform_type": "macos", -+ "cpu": "darwin_arm64", -+ }, -+) -+ - config_setting( - name = "watchos_armv7k", - values = { -diff --git a/third_party/llvm/llvm.bzl b/third_party/llvm/llvm.bzl -index dcbaab9edd4..eedb1a02a33 100644 ---- a/third_party/llvm/llvm.bzl -+++ b/third_party/llvm/llvm.bzl -@@ -304,7 +304,7 @@ win32_cmake_vars = { - # TODO(phawkins): use a better method to select the right host triple, rather - # than hardcoding x86_64. - llvm_all_cmake_vars = select({ -- "@org_tensorflow//tensorflow:macos": cmake_var_string( -+ "@org_tensorflow//tensorflow:macos_x86_64": cmake_var_string( - _dict_add( - cmake_vars, - llvm_target_cmake_vars("X86", "x86_64-apple-darwin"), -@@ -312,6 +312,14 @@ llvm_all_cmake_vars = select({ - darwin_cmake_vars, - ), - ), -+ "@org_tensorflow//tensorflow:macos_arm64": cmake_var_string( -+ _dict_add( -+ cmake_vars, -+ llvm_target_cmake_vars("AArch64", "arm64-apple-darwin"), -+ posix_cmake_vars, -+ darwin_cmake_vars, -+ ), -+ ), - "@org_tensorflow//tensorflow:linux_ppc64le": cmake_var_string( - _dict_add( - cmake_vars, -diff --git a/third_party/remote_config/remote_platform_configure.bzl b/third_party/remote_config/remote_platform_configure.bzl -index 29520396905..0c03c7e98b1 100644 ---- a/third_party/remote_config/remote_platform_configure.bzl -+++ b/third_party/remote_config/remote_platform_configure.bzl -@@ -20,6 +20,8 @@ def _remote_platform_configure_impl(repository_ctx): - cpu = "s390x" - elif machine_type.startswith("aarch64"): - cpu = "aarch64" -+ elif machine_type.startswith("arm64"): -+ cpu = "aarch64" - elif machine_type.startswith("arm"): - cpu = "arm" - elif machine_type.startswith("mips64"): --- -2.29.2.windows.3 - From 06bb2da4c833970e984a5a23ed57dceeae1f657a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Sep 2021 21:33:39 +0200 Subject: [PATCH 2/7] Add tensorflow-estimator in the package --- .../osx_arm64_python3.8.____cpython.yaml | 2 +- .../osx_arm64_python3.9.____cpython.yaml | 2 +- README.md | 5 +- recipe/build.sh | 2 +- recipe/meta.yaml | 67 ++++++++++++++----- 5 files changed, 56 insertions(+), 22 deletions(-) diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index debd7f16..41dc6818 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/rust_dev,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 22e3330c..497d95ce 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/rust_dev,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/README.md b/README.md index f2ed3c33..06173520 100644 --- a/README.md +++ b/README.md @@ -122,6 +122,7 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-libtensorflow_cc-green.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libtensorflow_cc.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libtensorflow_cc.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libtensorflow_cc.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow-green.svg)](https://anaconda.org/conda-forge/tensorflow) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow.svg)](https://anaconda.org/conda-forge/tensorflow) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow.svg)](https://anaconda.org/conda-forge/tensorflow) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow.svg)](https://anaconda.org/conda-forge/tensorflow) | | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--base-green.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--estimator-green.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | Installing tensorflow ===================== @@ -133,10 +134,10 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base` can be installed with: +Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base, tensorflow-estimator` can be installed with: ``` -conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base +conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-estimator ``` It is possible to list all of the versions of `libtensorflow` available on your platform with: diff --git a/recipe/build.sh b/recipe/build.sh index 4c146ee0..ffa9a2a2 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -118,4 +118,4 @@ bazel ${BAZEL_OPTS} build ${BUILD_OPTS} ${BUILD_TARGET} # build a whl file mkdir -p $SRC_DIR/tensorflow_pkg bash -x bazel-bin/tensorflow/tools/pip_package/build_pip_package $SRC_DIR/tensorflow_pkg - +bazel clean diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2123fc16..1a570f91 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -5,15 +5,17 @@ package: version: {{ version }} source: - url: https://github.com/tensorflow/tensorflow/archive/v{{ version }}.tar.gz - sha256: 41b32eeaddcbc02b0583660bcf508469550e4cd0f86b22d2abe72dfebeacde0f - - patches: - - patches/0001-relax-tolerence-in-special_math_test.patch - - patches/0002-skip-read-only-debugger_cli_common-test.patch - - patches/0003-relax-precision-in-matrix_log_op_test.patch - # requires setting GRPCIO_VERSION in build script - - patches/0004-loosen-requirements.patch + - url: https://github.com/tensorflow/tensorflow/archive/v{{ version }}.tar.gz + sha256: 41b32eeaddcbc02b0583660bcf508469550e4cd0f86b22d2abe72dfebeacde0f + patches: + - patches/0001-relax-tolerence-in-special_math_test.patch + - patches/0002-skip-read-only-debugger_cli_common-test.patch + - patches/0003-relax-precision-in-matrix_log_op_test.patch + # requires setting GRPCIO_VERSION in build script + - patches/0004-loosen-requirements.patch + - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ version }}.tar.gz + sha256: 947705c60c50da0b4a8ceec1bc058aaf6bf567a7efdcd50d5173ebf6bafcf30f + folder: tensorflow-estimator build: number: 0 @@ -82,7 +84,6 @@ requirements: - gast ==0.4.0 # TF-API needs to move in sync - tensorboard >=2.6,<3 - # - tensorflow-estimator >=2.6,<3 - keras >=2.6,<3 outputs: @@ -144,7 +145,6 @@ outputs: - gast ==0.4.0 # TF-API needs to move in sync - tensorboard >=2.6,<3 - # - tensorflow-estimator >=2.6,<3 - keras >=2.6,<3 run: - python @@ -166,22 +166,47 @@ outputs: - gast ==0.4.0 # TF-API needs to move in sync - tensorboard >=2.6,<3 - # - tensorflow-estimator >=2.6,<3 - keras >=2.6,<3 - grpcio {{ grpc_cpp }}.* test: - requires: - - pip - imports: - - tensorflow commands: - - pip check - tf_upgrade_v2 --help - saved_model_cli --help - tflite_convert --help # [not win] - toco_from_protos --help # [not win] - toco --help # [not win] + - name: tensorflow-estimator + script: build_estimator.sh # [not win] + script: build_estimator.bat # [win] + requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - bazel + host: + - python + - pip + - setuptools + - wheel + - {{ pin_subpackage('tensorflow-base', exact=True) }} + run: + - python >=3.6 + - absl-py >=0.7.0 + - astor >=0.6.0 + - gast >=0.2.0 + - numpy >=1.19 + - six >=1.10.0 + - protobuf >=3.6.1 + - termcolor >=1.1.0 + - wrapt >=1.11.1 + test: + requires: + - pip + commands: + - pip check + + - name: tensorflow requirements: host: @@ -189,7 +214,15 @@ outputs: - {{ pin_subpackage('tensorflow-base', exact=True) }} run: - python + - tensorflow-estimator {{ version }}.* - {{ pin_subpackage('tensorflow-base', exact=True) }} + test: + requires: + - pip + imports: + - tensorflow + commands: + - pip check - name: libtensorflow script: cp_libtensorflow.sh From 62982bfa0584ff3871c1729cb0285a08a0dab8b8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 7 Sep 2021 11:31:45 +0200 Subject: [PATCH 3/7] Use lief_dev --- .scripts/build_steps.sh | 3 ++- .scripts/run_osx_build.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a06860..8ab67a8c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,6 +28,7 @@ CONDARC BUILD_CMD=build conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge +conda update --yes -c conda-forge/label/lief_dev py-lief # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -71,4 +72,4 @@ fi ( startgroup "Final checks" ) 2> /dev/null -touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file +touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 96d02787..58d446ae 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,6 +24,7 @@ conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} +conda update --yes -c conda-forge/label/lief_dev py-lief @@ -66,4 +67,4 @@ if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml fi -( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file +( endgroup "Uploading packages" ) 2> /dev/null From 55dfae7cee6e45992e03c6b89c046bca892c9d7c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 17 Sep 2021 20:36:09 +0200 Subject: [PATCH 4/7] Add missing build_estimator --- recipe/build_estimator.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipe/build_estimator.sh diff --git a/recipe/build_estimator.sh b/recipe/build_estimator.sh new file mode 100644 index 00000000..2c577ffa --- /dev/null +++ b/recipe/build_estimator.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -exuo pipefail + +pushd tensorflow-estimator + +WHEEL_DIR=${PWD}/wheel_dir +mkdir -p ${WHEEL_DIR} +bazel build tensorflow_estimator/tools/pip_package:build_pip_package +bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package ${WHEEL_DIR} +${PYTHON} -m pip install --no-deps ${WHEEL_DIR}/*.whl +bazel clean +popd From 3702e14411cbf18cfcae13d96301826e6d89a251 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 17 Sep 2021 20:37:17 +0200 Subject: [PATCH 5/7] Add conda-forge to update channel --- .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 8ab67a8c..095bf413 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,7 +28,7 @@ CONDARC BUILD_CMD=build conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge -conda update --yes -c conda-forge/label/lief_dev py-lief +conda update --yes -c conda-forge/label/lief_dev -c conda-forge py-lief # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 58d446ae..da32325a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,7 +24,7 @@ conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -conda update --yes -c conda-forge/label/lief_dev py-lief +conda update --yes -c conda-forge/label/lief_dev -c conda-forge py-lief From c4d2785605983d40393783f40f324fbca7fa45fd Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 17 Sep 2021 20:52:36 +0200 Subject: [PATCH 6/7] Add conda-forge/conda-smithy#1497 manually --- .scripts/run_osx_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index da32325a..d4f04eab 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -9,7 +9,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} From 932381bcf7b3d0233acd383c52d7efbd36a969cc Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 20 Sep 2021 11:41:32 +0000 Subject: [PATCH 7/7] Fix libtensorflow builds --- recipe/build.sh | 24 ++++++++++++++++++++++++ recipe/cp_libtensorflow.sh | 2 +- recipe/cp_libtensorflow_cc.sh | 20 +------------------- recipe/meta.yaml | 2 +- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index ffa9a2a2..f0504dc9 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -118,4 +118,28 @@ bazel ${BAZEL_OPTS} build ${BUILD_OPTS} ${BUILD_TARGET} # build a whl file mkdir -p $SRC_DIR/tensorflow_pkg bash -x bazel-bin/tensorflow/tools/pip_package/build_pip_package $SRC_DIR/tensorflow_pkg + +if [[ "${target_platform}" == linux-* ]]; then + cp $SRC_DIR/bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz $SRC_DIR + mkdir -p $SRC_DIR/libtensorflow_cc_output/lib + cp -d bazel-bin/tensorflow/libtensorflow_cc.so* $SRC_DIR/libtensorflow_cc_output/lib/ + cp -d bazel-bin/tensorflow/libtensorflow_framework.so* $SRC_DIR/libtensorflow_cc_output/lib/ + cp -d $SRC_DIR/libtensorflow_cc_output/lib/libtensorflow_framework.so.2 $SRC_DIR/libtensorflow_cc_output/lib/libtensorflow_framework.so + # Make writable so patchelf can do its magic + chmod u+w $SRC_DIR/libtensorflow_cc_output/lib/libtensorflow* + + mkdir -p $SRC_DIR/libtensorflow_cc_output/include/tensorflow + rsync -avzh --exclude '_virtual_includes/' --exclude 'pip_package/' --exclude 'lib_package/' --include '*/' --include '*.h' --include '*.inc' --exclude '*' bazel-bin/ $SRC_DIR/libtensorflow_cc_output/include + rsync -avzh --include '*/' --include '*.h' --include '*.inc' --exclude '*' tensorflow/cc $SRC_DIR/libtensorflow_cc_output/include/tensorflow/ + rsync -avzh --include '*/' --include '*.h' --include '*.inc' --exclude '*' tensorflow/core $SRC_DIR/libtensorflow_cc_output/include/tensorflow/ + rsync -avzh --include '*/' --include '*' --exclude '*.cc' third_party/ $SRC_DIR/libtensorflow_cc_output/include/third_party/ + rsync -avzh --include '*/' --include '*' --exclude '*.txt' bazel-work/external/eigen_archive/Eigen/ $SRC_DIR/libtensorflow_cc_output/include/Eigen/ + rsync -avzh --include '*/' --include '*' --exclude '*.txt' bazel-work/external/eigen_archive/unsupported/ $SRC_DIR/libtensorflow_cc_output/include/unsupported/ + pushd $SRC_DIR/libtensorflow_cc_output + tar cf ../libtensorflow_cc_output.tar . + popd + chmod -R u+rw $SRC_DIR/libtensorflow_cc_output + rm -r $SRC_DIR/libtensorflow_cc_output +fi + bazel clean diff --git a/recipe/cp_libtensorflow.sh b/recipe/cp_libtensorflow.sh index 5e2fd181..303f84ea 100644 --- a/recipe/cp_libtensorflow.sh +++ b/recipe/cp_libtensorflow.sh @@ -1,5 +1,5 @@ # https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/lib_package/README.md -tar -C ${PREFIX} -xzf $SRC_DIR/bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz +tar -C ${PREFIX} -xzf $SRC_DIR/libtensorflow.tar.gz # Make writable so patchelf can do its magic chmod u+w $PREFIX/lib/libtensorflow* diff --git a/recipe/cp_libtensorflow_cc.sh b/recipe/cp_libtensorflow_cc.sh index 65b2b9d1..d72352ff 100644 --- a/recipe/cp_libtensorflow_cc.sh +++ b/recipe/cp_libtensorflow_cc.sh @@ -1,19 +1 @@ -mkdir -p $PREFIX/lib -# copy library -cp -d bazel-bin/tensorflow/libtensorflow_cc.so* $PREFIX/lib/ -cp -d bazel-bin/tensorflow/libtensorflow_framework.so* $PREFIX/lib/ -cp -d $PREFIX/lib/libtensorflow_framework.so.2 $PREFIX/lib/libtensorflow_framework.so -# Make writable so patchelf can do its magic -chmod u+w $PREFIX/lib/libtensorflow* - -mkdir -p $PREFIX/include -mkdir -p $PREFIX/include/tensorflow -# copy headers -rsync -avzh --exclude '_virtual_includes/' --exclude 'pip_package/' --exclude 'lib_package/' --include '*/' --include '*.h' --include '*.inc' --exclude '*' bazel-bin/ $PREFIX/include/ -rsync -avzh --include '*/' --include '*.h' --include '*.inc' --exclude '*' tensorflow/cc $PREFIX/include/tensorflow/ -rsync -avzh --include '*/' --include '*.h' --include '*.inc' --exclude '*' tensorflow/core $PREFIX/include/tensorflow/ -rsync -avzh --include '*/' --include '*' --exclude '*.cc' third_party/ $PREFIX/include/third_party/ -rsync -avzh --include '*/' --include '*' --exclude '*.txt' bazel-work/external/eigen_archive/Eigen/ $PREFIX/include/Eigen/ -rsync -avzh --include '*/' --include '*' --exclude '*.txt' bazel-work/external/eigen_archive/unsupported/ $PREFIX/include/unsupported/ -#rsync -avzh --include '*/' --include '*.h' --include '*.inc' --exclude '*' bazel-work/external/com_google_protobuf/src/google/ $PREFIX/include/google/ -#rsync -avzh --include '*/' --include '*.h' --include '*.inc' --exclude '*' bazel-work/external/com_google_absl/absl/ $PREFIX/include/absl/ +tar -C ${PREFIX} -xf $SRC_DIR/libtensorflow_cc_output.tar diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1a570f91..c421665f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,6 +34,7 @@ requirements: - libprotobuf - nasm - sed + - rsync # [linux] host: # conda build requirements - python @@ -266,7 +267,6 @@ outputs: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - rsync # host requirements to pick up run_exports host: - giflib