From 9401f920040d4a61ba8b92902272093a6140f9d6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 22 Nov 2021 22:47:49 +1100 Subject: [PATCH 1/7] bump to 2.7.0 --- README.md | 5 +- recipe/meta.yaml | 213 ++++++++---------- ...relax-tolerence-in-special_math_test.patch | 6 +- ...p-read-only-debugger_cli_common-test.patch | 4 +- ...elax-precision-in-matrix_log_op_test.patch | 4 +- recipe/patches/0004-loosen-requirements.patch | 24 +- ...d-absl-Status-error_message-call-wi.patch} | 11 +- .../0006-protobuf_3_18_comaptibility.patch | 32 --- ...uf_errors_when_using_system_protobuf.patch | 26 --- .../legacy/0001-add-rt-to-linkopts.patch | 46 ---- .../0002-stable-image-rotate-test.patch | 38 ---- .../legacy/0005-fix-lookup_ops-test.patch | 30 --- ...ol-names-prefixed-with-an-underscore.patch | 53 ----- ...ock_gettime-implementation-for-macOS.patch | 55 ----- ..._tensorflow_base.py => test_tensorflow.py} | 0 15 files changed, 123 insertions(+), 424 deletions(-) rename recipe/patches/{0005-remove_deprecated_use_of_error_message.patch => 0005-Replace-deprecated-absl-Status-error_message-call-wi.patch} (79%) delete mode 100644 recipe/patches/0006-protobuf_3_18_comaptibility.patch delete mode 100644 recipe/patches/51450-Fix_protobuf_errors_when_using_system_protobuf.patch delete mode 100644 recipe/patches/legacy/0001-add-rt-to-linkopts.patch delete mode 100644 recipe/patches/legacy/0002-stable-image-rotate-test.patch delete mode 100644 recipe/patches/legacy/0005-fix-lookup_ops-test.patch delete mode 100644 recipe/patches/legacy/0007-Add-init-symbol-names-prefixed-with-an-underscore.patch delete mode 100644 recipe/patches/legacy/0008-Add-alternate-clock_gettime-implementation-for-macOS.patch rename recipe/{test_tensorflow_base.py => test_tensorflow.py} (100%) diff --git a/README.md b/README.md index 4ba9410b..c4b918f7 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,14 @@ Package license: Apache-2.0 Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/tensorflow-feedstock/blob/master/LICENSE.txt) -Summary: TensorFlow is an open source machine learning framework for everyone. +Summary: An Open Source Machine Learning Framework for Everyone. Development: https://github.com/tensorflow/tensorflow Documentation: https://www.tensorflow.org/get_started/get_started -TensorFlow provides multiple APIs.The lowest level API, TensorFlow Core +TensorFlow provides multiple APIs. The lowest level API, TensorFlow Core provides you with complete programming control. -Base package contains only tensorflow, not tensorflow-tensorboard. Current build status diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c9a48107..787f0fe3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,38 +1,32 @@ -{% set version = "2.6.2" %} -{% set estimator_version = "2.6.0" %} +{% set version = "2.7.0" %} package: name: tensorflow-split version: {{ version }} source: - - url: https://github.com/tensorflow/tensorflow/archive/v{{ version }}.tar.gz - sha256: e68c1d346fc3d529653530ca346b2c62f5b31bd4fcca7ffc9c65bb39ab2f6ed3 + - url: https://github.com/tensorflow/tensorflow/archive/refs/tags/v{{ version }}.tar.gz + sha256: bb124905c7fdacd81e7c842b287c169bbf377d29c74c9dacc04f96c9793747bb 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 - - patches/0005-remove_deprecated_use_of_error_message.patch - - patches/0006-protobuf_3_18_comaptibility.patch - # can be dropped for v>=2.7 - - patches/51450-Fix_protobuf_errors_when_using_system_protobuf.patch - # can be dropped for v>=2.7 - - patches/0007-relax_six_requirement.patch - - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version }}.tar.gz - sha256: 947705c60c50da0b4a8ceec1bc058aaf6bf567a7efdcd50d5173ebf6bafcf30f + - patches/0005-Replace-deprecated-absl-Status-error_message-call-wi.patch + - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ version }}.tar.gz + sha256: e5164e802638d3cf110ecc17912be9d514a9d3354ec48e77200b9403dcc15965 folder: tensorflow-estimator build: - number: 2 + number: 0 skip: true # [win] requirements: build: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - - numpy 1.19.* # [build_platform != target_platform] + - numpy # [build_platform != target_platform] - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] @@ -70,9 +64,9 @@ requirements: # but so far there have been no problems with leaving these # unpinned; though some restrictions come in for packages # that are also listed as a requirement for the pip_package. - - astor >=0.7.1 - - cython >=0.28.4 - - dill >=0.3.1.1 + - astor + - cython + - dill - giflib - grpc-cpp - flatbuffers @@ -87,38 +81,40 @@ 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,<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,<3.4 + - absl-py >=0.4.0 + - astunparse >=1.6.0 + - gast >=0.2.1,<0.5.0 + - google-pasta >=0.1.1 + - h5py >=2.9.0 + - keras-preprocessing >=1.1.1 + - numpy + - opt_einsum >=2.3.2 - protobuf >=3.9.2 - # 2021/12/05: hmaarrfk - # While tensorflow has an upper bound on six - # six has been highly backward compatible - # We remove the upper bound so that we can be more compatible with - # The rest of the conda-forge ecosystem - - six >=1.15 - - 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.4.0 + - python-flatbuffers >=1.12,<3 + - six >=1.12 + - tensorflow-io-gcs-filesystem >=0.21.0 + - termcolor >=1.1.0 + - typing_extensions >=3.6.6 + - wheel >=0.32,<1 + - wrapt >=1.11.0 # TF-API needs to move in sync + # XXX: actually, TF 2.7.0 still demands tb 2.6 - tensorboard >=2.6,<2.7 - - keras >=2.6,<2.7 + - keras >=2.7,<2.8 outputs: - - name: tensorflow-base + # as of tensorflow 2.7.0, we don't need tensorflow-base anymore; + # we still build it as a compatibility output (see below), but the + # main package is being built in the "tensorflow" output directly. + - name: tensorflow script: build_pkg.sh # [not win] script: build_pkg.bat # [win] build: string: cuda{{ cuda_compiler_version | replace('.', '') }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] + # weigh down cpu implementation and give cuda preference + track_features: + - tensorflow-cpu # [cuda_compiler_version == "None"] entry_points: - toco_from_protos = tensorflow.lite.toco.python.toco_from_protos:main - tflite_convert = tensorflow.lite.python.tflite_convert:main @@ -142,9 +138,9 @@ outputs: - python - pip # TF_SYSTEM_LIBS - - astor >=0.7.1 - - cython >=0.28.4 - - dill >=0.3.1.1 + - astor + - cython + - dill - giflib - grpc-cpp - flatbuffers @@ -159,132 +155,114 @@ outputs: - sqlite - zlib # requirements specified by the package itself - - 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 + - absl-py >=0.4.0 + - astunparse >=1.6.0 + - gast >=0.2.1,<0.5.0 + - google-pasta >=0.1.1 + - h5py >=2.9.0 + - keras-preprocessing >=1.1.1 + - numpy + - opt_einsum >=2.3.2 - protobuf >=3.9.2 - - 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.4.0 + - python-flatbuffers >=1.12,<3 + - six >=1.12 + - tensorflow-io-gcs-filesystem >=0.21.0 + - termcolor >=1.1.0 + - typing_extensions >=3.6.6 + - wheel >=0.32,<1 + - wrapt >=1.11.0 # TF-API needs to move in sync + # XXX: actually, TF 2.7.0 still demands tb 2.6 - tensorboard >=2.6,<2.7 - - keras >=2.6,<2.7 + - keras >=2.7,<2.8 run: - python - - absl-py >=0.10,<1 - - astunparse >=1.6.3,<1.7 - - python-flatbuffers >=1.12,<2 - - google-pasta >=0.2,<1 + - absl-py >=0.4.0 + - astunparse >=1.6.0 + - gast >=0.2.1,<0.5.0 + - google-pasta >=0.1.1 - grpcio {{ grpc_cpp }}.* - - 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 + - h5py >=2.9.0 + - keras-preprocessing >=1.1.1 + - {{ pin_compatible('numpy') }} + - opt_einsum >=2.3.2 - protobuf >=3.9.2 - - 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.4.0 + - python-flatbuffers >=1.12,<3 + - six >=1.12 + - tensorflow-io-gcs-filesystem >=0.21.0 + - termcolor >=1.1.0 + - typing_extensions >=3.6.6 + - wheel >=0.32,<1 + - wrapt >=1.11.0 # TF-API needs to move in sync + # XXX: actually, TF 2.7.0 still demands tb 2.6 - tensorboard >=2.6,<2.7 - - keras >=2.6,<2.7 + - keras >=2.7,<2.8 # avoid that people without GPUs needlessly download ~0.5-1GB - __cuda # [cuda_compiler_version != "None"] test: files: - - test_tensorflow_base.py + - test_tensorflow.py commands: - - cat test_tensorflow_base.py # [unix] - - python test_tensorflow_base.py + - cat test_tensorflow.py # [unix] + - python test_tensorflow.py - 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] - build: - string: cuda{{ cuda_compiler_version | replace('.', '') }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] - string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] + # compatibility output wrapping core package, since tensorflow-base + # was used as an output before 2.7 (should we add a deprecation warning?) + - name: tensorflow-base requirements: - build: - - {{ compiler('c') }} - - {{ compiler('cxx') }} - # Keep the cuda compiler here since it helps package solvers - # decide on the cuda variant - # https://github.com/conda-forge/tensorflow-feedstock/issues/162 - - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - - bazel - - bazel >=4.2.1 # [osx and arm64] host: - python - - pip - - setuptools - - wheel - # This ensures that a consistent version of openssl is chosen between - # all packages. - # https://github.com/conda-forge/conda-forge.github.io/issues/1528 - openssl - - {{ pin_subpackage('tensorflow-base', exact=True) }} + - {{ pin_subpackage('tensorflow', exact=True) }} run: - python - - {{ pin_subpackage('tensorflow-base', exact=True) }} + - {{ pin_subpackage('tensorflow', exact=True) }} test: requires: - pip + imports: + - tensorflow commands: - pip check - - - name: tensorflow + - name: tensorflow-estimator + script: build_estimator.sh # [not win] + script: build_estimator.bat # [win] build: string: cuda{{ cuda_compiler_version | replace('.', '') }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] - - # weigh down cpu implementation and give cuda preference - track_features: - - tensorflow-cpu # [cuda_compiler_version == "None"] - requirements: build: - # Keep the other compilers here so as to help solve for the - # required version of libc - {{ compiler('c') }} - {{ compiler('cxx') }} # Keep the cuda compiler here since it helps package solvers # decide on the cuda variant # https://github.com/conda-forge/tensorflow-feedstock/issues/162 - - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] + - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] + - bazel + - bazel >=4.2.1 # [osx and arm64] host: - python + - pip + - setuptools + - wheel # This ensures that a consistent version of openssl is chosen between # all packages. # https://github.com/conda-forge/conda-forge.github.io/issues/1528 - openssl - - {{ pin_subpackage('tensorflow-base', exact=True) }} + - {{ pin_subpackage('tensorflow', exact=True) }} run: - python - - {{ pin_subpackage('tensorflow-estimator', exact=True) }} - - {{ pin_subpackage('tensorflow-base', exact=True) }} + - {{ pin_subpackage('tensorflow', exact=True) }} test: requires: - pip - imports: - - tensorflow commands: - pip check @@ -398,11 +376,10 @@ about: license: Apache-2.0 license_file: LICENSE license_family: Apache - summary: TensorFlow is an open source machine learning framework for everyone. + summary: An Open Source Machine Learning Framework for Everyone. description: | - TensorFlow provides multiple APIs.The lowest level API, TensorFlow Core + TensorFlow provides multiple APIs. The lowest level API, TensorFlow Core 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 diff --git a/recipe/patches/0001-relax-tolerence-in-special_math_test.patch b/recipe/patches/0001-relax-tolerence-in-special_math_test.patch index 0b857b9d..bd4d5df9 100644 --- a/recipe/patches/0001-relax-tolerence-in-special_math_test.patch +++ b/recipe/patches/0001-relax-tolerence-in-special_math_test.patch @@ -1,4 +1,4 @@ -From 59ddc914ccd9a223c8411dc8a00eab9206971cd6 Mon Sep 17 00:00:00 2001 +From 21677ffb7d4de4660f4c2c03a04a13a13828355c Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 20 Jun 2017 15:13:14 -0500 Subject: [PATCH 1/5] relax tolerence in special_math_test @@ -8,7 +8,7 @@ Subject: [PATCH 1/5] relax tolerence in special_math_test 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/python/kernel_tests/distributions/special_math_test.py b/tensorflow/python/kernel_tests/distributions/special_math_test.py -index ce2cd8614f5..091753b4ef5 100644 +index 4041a7e1a79..4418b4a3212 100644 --- a/tensorflow/python/kernel_tests/distributions/special_math_test.py +++ b/tensorflow/python/kernel_tests/distributions/special_math_test.py @@ -256,7 +256,7 @@ class LogNdtrTestUpper(NdtrTest): @@ -21,5 +21,5 @@ index ce2cd8614f5..091753b4ef5 100644 -- -2.29.2.windows.3 +2.32.0.windows.2 diff --git a/recipe/patches/0002-skip-read-only-debugger_cli_common-test.patch b/recipe/patches/0002-skip-read-only-debugger_cli_common-test.patch index 2153e586..0ccc13b1 100644 --- a/recipe/patches/0002-skip-read-only-debugger_cli_common-test.patch +++ b/recipe/patches/0002-skip-read-only-debugger_cli_common-test.patch @@ -1,4 +1,4 @@ -From 5d04da7f2b31df87f38bebc5ed806589880e7eed Mon Sep 17 00:00:00 2001 +From a047e1572d7bc5f1658b2fb771fca724c8b91764 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 4 Jan 2018 17:17:23 -0600 Subject: [PATCH 2/5] skip read only debugger_cli_common test @@ -27,5 +27,5 @@ index 93df845c4c5..814ddf13a16 100644 self._restoreFileReadWritePermissions(self._history_file_path) -- -2.29.2.windows.3 +2.32.0.windows.2 diff --git a/recipe/patches/0003-relax-precision-in-matrix_log_op_test.patch b/recipe/patches/0003-relax-precision-in-matrix_log_op_test.patch index 42b39f8f..6a145051 100644 --- a/recipe/patches/0003-relax-precision-in-matrix_log_op_test.patch +++ b/recipe/patches/0003-relax-precision-in-matrix_log_op_test.patch @@ -1,4 +1,4 @@ -From 2e72112b3dd2e6e8c234546935bcad5dbd05280d Mon Sep 17 00:00:00 2001 +From 5b9c6d80a8ce64bc8f7ed279920728019f579cc1 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Mon, 20 Aug 2018 12:19:04 -0500 Subject: [PATCH 3/5] relax precision in matrix_log_op_test @@ -21,5 +21,5 @@ index 5004a9c5588..62c2bfe1abe 100644 def _verifyLogarithmComplex(self, x): for np_type in [np.complex64, np.complex128]: -- -2.29.2.windows.3 +2.32.0.windows.2 diff --git a/recipe/patches/0004-loosen-requirements.patch b/recipe/patches/0004-loosen-requirements.patch index 771b89b9..bd7fb735 100644 --- a/recipe/patches/0004-loosen-requirements.patch +++ b/recipe/patches/0004-loosen-requirements.patch @@ -1,7 +1,7 @@ -From b6371c3abefb0ab2b3e943f43088ab42fac9c5bc Mon Sep 17 00:00:00 2001 +From 59100b60d2aeaa9110346995777b6ffc255e8999 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 8 Sep 2021 06:57:09 +0200 -Subject: [PATCH] Fixup requirements +Subject: [PATCH 4/5] loosen requirements * Set grpcio pin to the built grpc version * Remove unused clang requirement @@ -10,26 +10,26 @@ Subject: [PATCH] Fixup requirements 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index 3d4a64de..3ea8ac5e 100644 +index 26306e43aaf..bf5d21aca5b 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -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 ~= 3.1.0', -@@ -126,7 +125,7 @@ if 'tf_nightly' in project_name: + 'absl-py >= 0.4.0', + 'astunparse >= 1.6.0', +- 'libclang >= 9.0.1', + 'flatbuffers >= 1.12, < 3.0', # capped as jax 0.1.71 needs < 3.0 + 'google_pasta >= 0.1.1', + 'h5py >= 2.9.0', # capped since 3.3.0 lacks py3.6 +@@ -129,7 +128,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.37.0, < 2.0') +- REQUIRED_PACKAGES.append('grpcio >= 1.24.3, < 2.0') + REQUIRED_PACKAGES.append('grpcio >= GRPCIO_VERSION, < 2.0') # Packages which are only needed for testing code. -- -2.30.1 (Apple Git-130) +2.32.0.windows.2 diff --git a/recipe/patches/0005-remove_deprecated_use_of_error_message.patch b/recipe/patches/0005-Replace-deprecated-absl-Status-error_message-call-wi.patch similarity index 79% rename from recipe/patches/0005-remove_deprecated_use_of_error_message.patch rename to recipe/patches/0005-Replace-deprecated-absl-Status-error_message-call-wi.patch index ac59e24f..05e5c586 100644 --- a/recipe/patches/0005-remove_deprecated_use_of_error_message.patch +++ b/recipe/patches/0005-Replace-deprecated-absl-Status-error_message-call-wi.patch @@ -1,8 +1,8 @@ -From ec2cc392f3a78d5cda64a36c615572693a80c8d7 Mon Sep 17 00:00:00 2001 +From 6b6e31e057a070942f9eb3acba7578be517bb173 Mon Sep 17 00:00:00 2001 From: Zachary Garrett Date: Mon, 27 Sep 2021 08:40:23 -0700 -Subject: [PATCH] Replace deprecated `absl::Status::error_message` call with - `absl::Status::message`. +Subject: [PATCH 5/5] Replace deprecated `absl::Status::error_message` call + with `absl::Status::message`. PiperOrigin-RevId: 399198325 Change-Id: Ib4a5e1d3a5e1447fefe9de428946341522a021a4 @@ -11,7 +11,7 @@ Change-Id: Ib4a5e1d3a5e1447fefe9de428946341522a021a4 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/core/kernels/example_parsing_ops.cc b/tensorflow/core/kernels/example_parsing_ops.cc -index a1265cfb5c6a1..ada919bbd7b13 100644 +index a1265cfb5c6..ada919bbd7b 100644 --- a/tensorflow/core/kernels/example_parsing_ops.cc +++ b/tensorflow/core/kernels/example_parsing_ops.cc @@ -1218,7 +1218,7 @@ class DecodeJSONExampleOp : public OpKernel { @@ -23,3 +23,6 @@ index a1265cfb5c6a1..ada919bbd7b13 100644 } } +-- +2.32.0.windows.2 + diff --git a/recipe/patches/0006-protobuf_3_18_comaptibility.patch b/recipe/patches/0006-protobuf_3_18_comaptibility.patch deleted file mode 100644 index bb63f133..00000000 --- a/recipe/patches/0006-protobuf_3_18_comaptibility.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 62ce49b7f775289558f66a6b3f67395333016e6e Mon Sep 17 00:00:00 2001 -From: "A. Unique TensorFlower" -Date: Wed, 14 Jul 2021 19:11:43 -0700 -Subject: [PATCH] Clean up usages of deprecated - CodedInputStream::SetTotalBytesLimit() method - -PiperOrigin-RevId: 384833682 -Change-Id: If82466312db207de143cacef2727927c7b6a7880 ---- - tensorflow/core/distributed_runtime/tensor_coding.cc | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/tensorflow/core/distributed_runtime/tensor_coding.cc b/tensorflow/core/distributed_runtime/tensor_coding.cc -index 78b56b6d363b4..dc08ee8b76e0f 100644 ---- a/tensorflow/core/distributed_runtime/tensor_coding.cc -+++ b/tensorflow/core/distributed_runtime/tensor_coding.cc -@@ -82,7 +82,6 @@ void TensorResponse::InitPartial(const RecvTensorResponse& response, - Status TensorResponse::ParseFrom(Source* source) { - if (!on_host_) { - protobuf::io::CodedInputStream input(source->contents()); -- input.SetTotalBytesLimit(INT_MAX, INT_MAX); // Unlimited - - // Pre-parse into local storage, then delegate to device. - if (!meta_.ParseFromCodedStream(&input) || !input.ConsumedEntireMessage()) { -@@ -218,7 +217,6 @@ bool TensorResponse::ParseTensorSubmessage( - - bool TensorResponse::ParseFast(Source* source) { - protobuf::io::CodedInputStream input(source->contents()); -- input.SetTotalBytesLimit(INT_MAX, INT_MAX); // Unlimited - while (true) { - auto p = input.ReadTagWithCutoff(127); - int tag = GetTagFieldNumber(p.first); diff --git a/recipe/patches/51450-Fix_protobuf_errors_when_using_system_protobuf.patch b/recipe/patches/51450-Fix_protobuf_errors_when_using_system_protobuf.patch deleted file mode 100644 index 35ae53f3..00000000 --- a/recipe/patches/51450-Fix_protobuf_errors_when_using_system_protobuf.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7fbc5be3b5a3cc17c05f1ae5b0577fdca8a0e0e2 Mon Sep 17 00:00:00 2001 -From: sclarkson -Date: Thu, 12 Aug 2021 03:23:28 -0700 -Subject: [PATCH] Fix protobuf errors when using system protobuf - -When tensorflow and python protobuf use the same instance of -libprotobuf, pywrap_tensorflow must be imported before anything -else that would import protobuf definitions. ---- - tensorflow/python/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tensorflow/python/__init__.py b/tensorflow/python/__init__.py -index c90336802e26f..39b57ffecab3f 100644 ---- a/tensorflow/python/__init__.py -+++ b/tensorflow/python/__init__.py -@@ -37,8 +37,8 @@ - # go/tf-wildcard-import - # pylint: disable=wildcard-import,g-bad-import-order,g-import-not-at-top - --from tensorflow.python.eager import context - from tensorflow.python import pywrap_tensorflow as _pywrap_tensorflow -+from tensorflow.python.eager import context - - # pylint: enable=wildcard-import - diff --git a/recipe/patches/legacy/0001-add-rt-to-linkopts.patch b/recipe/patches/legacy/0001-add-rt-to-linkopts.patch deleted file mode 100644 index 84b9c183..00000000 --- a/recipe/patches/legacy/0001-add-rt-to-linkopts.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 30a4ed9b097f1ea9a2a1e9303e044015d0041d63 Mon Sep 17 00:00:00 2001 -From: Jonathan Helmus -Date: Wed, 27 Jun 2018 12:46:18 -0500 -Subject: [PATCH 1/8] add rt to linkopts - ---- - tensorflow/BUILD | 1 + - tensorflow/tensorflow.bzl | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tensorflow/BUILD b/tensorflow/BUILD -index 823ad8f..96e12cb 100644 ---- a/tensorflow/BUILD -+++ b/tensorflow/BUILD -@@ -429,5 +429,6 @@ tf_cc_shared_object( - "//tensorflow:darwin": [], - "//tensorflow:windows": [], - "//conditions:default": [ -+ "-lrt", - "-Wl,--version-script,$(location //tensorflow:tf_framework_version_script.lds)", - ], -diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl -index d93e0df..b8438d2 100644 ---- a/tensorflow/tensorflow.bzl -+++ b/tensorflow/tensorflow.bzl -@@ -377,7 +377,7 @@ def tf_cc_shared_object( - srcs = [], - deps = [], - data = [], -- linkopts = [], -+ linkopts = ['-lrt'], - framework_so = tf_binary_additional_srcs(), - kernels = [], - **kwargs): -@@ -413,7 +413,7 @@ def tf_cc_binary( - srcs = [], - deps = [], - data = [], -- linkopts = [], -+ linkopts = ['-lrt'], - copts = tf_copts(), - kernels = [], - **kwargs): --- -2.7.4 - diff --git a/recipe/patches/legacy/0002-stable-image-rotate-test.patch b/recipe/patches/legacy/0002-stable-image-rotate-test.patch deleted file mode 100644 index 2a2c4448..00000000 --- a/recipe/patches/legacy/0002-stable-image-rotate-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 11a1f8a90ccffb2746c1d6a3356fc2033be38bea Mon Sep 17 00:00:00 2001 -From: Jonathan Helmus -Date: Thu, 8 Jun 2017 10:48:30 -0500 -Subject: [PATCH 2/8] stable image rotate test - ---- - tensorflow/contrib/image/python/kernel_tests/image_ops_test.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py -index ba5cdfe..41ffac4 100644 ---- a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py -+++ b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py -@@ -54,7 +54,7 @@ class ImageOpsTest(test_util.TensorFlowTestCase): - image = array_ops.reshape( - math_ops.cast(math_ops.range(36), dtype), (6, 6)) - image_rep = array_ops.tile(image[None, :, :, None], [3, 1, 1, 1]) -- angles = constant_op.constant([0.0, np.pi / 4.0, np.pi / 2.0], -+ angles = constant_op.constant([0.0, -np.pi / 2.0, np.pi / 2.0], - dtypes.float32) - image_rotated = image_ops.rotate(image_rep, angles) - self.assertAllEqual(image_rotated[:, :, :, 0].eval(), -@@ -63,9 +63,9 @@ class ImageOpsTest(test_util.TensorFlowTestCase): - [18, 19, 20, 21, 22, 23], - [24, 25, 26, 27, 28, 29], - [30, 31, 32, 33, 34, 35]], -- [[0, 3, 4, 11, 17, 0], [2, 3, 9, 16, 23, 23], -- [1, 8, 15, 21, 22, 29], [6, 13, 20, 21, 27, 34], -- [12, 18, 19, 26, 33, 33], [0, 18, 24, 31, 32, 0]], -+ [[30, 24, 18, 12, 6, 0], [31, 25, 19, 13, 7, 1], -+ [32, 26, 20, 14, 8, 2], [33, 27, 21, 15, 9, 3], -+ [34, 28, 22, 16, 10, 4], [35, 29, 23, 17, 11, 5]], - [[5, 11, 17, 23, 29, 35], [4, 10, 16, 22, 28, 34], - [3, 9, 15, 21, 27, 33], [2, 8, 14, 20, 26, 32], - [1, 7, 13, 19, 25, 31], [0, 6, 12, 18, 24, 30]]]) --- -2.7.4 - diff --git a/recipe/patches/legacy/0005-fix-lookup_ops-test.patch b/recipe/patches/legacy/0005-fix-lookup_ops-test.patch deleted file mode 100644 index ffdc1550..00000000 --- a/recipe/patches/legacy/0005-fix-lookup_ops-test.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 908dba7dcc7d21e5479a37c5c1acccb6d0b90056 Mon Sep 17 00:00:00 2001 -From: Jonathan Helmus -Date: Thu, 11 Jan 2018 13:05:31 -0600 -Subject: [PATCH 5/8] fix lookup_ops test - -The order of the exported data is undefined, perform a valid sort before -comparing. ---- - tensorflow/contrib/lookup/lookup_ops_test.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tensorflow/contrib/lookup/lookup_ops_test.py b/tensorflow/contrib/lookup/lookup_ops_test.py -index 9b2c2dd..81d0648 100644 ---- a/tensorflow/contrib/lookup/lookup_ops_test.py -+++ b/tensorflow/contrib/lookup/lookup_ops_test.py -@@ -505,9 +505,9 @@ class MutableHashTableOpTest(test.TestCase): - msg="Saw shape %s" % exported_values.shape) - # exported data is in the order of the internal map, i.e. undefined - sorted_keys = np.sort(exported_keys.eval()) -- sorted_values = np.sort(exported_values.eval()) -+ sorted_values = np.sort(exported_values.eval(), axis=0) - self.assertAllEqual([b"brain", b"salad", b"surgery"], sorted_keys) -- self.assertAllEqual([[4, 5], [2, 3], [0, 1]], sorted_values) -+ self.assertAllEqual([[0, 1], [2, 3], [4, 5]], sorted_values) - - def testMutableHashTableExportInsert(self): - with self.cached_session(): --- -2.7.4 - diff --git a/recipe/patches/legacy/0007-Add-init-symbol-names-prefixed-with-an-underscore.patch b/recipe/patches/legacy/0007-Add-init-symbol-names-prefixed-with-an-underscore.patch deleted file mode 100644 index 9f9a6fa4..00000000 --- a/recipe/patches/legacy/0007-Add-init-symbol-names-prefixed-with-an-underscore.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 03d0d2bf4e47ac6b768d9f3371cdb941bf3d36e4 Mon Sep 17 00:00:00 2001 -From: Nehal J Wani -Date: Thu, 23 Aug 2018 11:34:00 -0500 -Subject: [PATCH 7/8] Add (init) symbol names prefixed with an underscore -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The command: `python -c 'from tensorflow.contrib import tensorrt as trt'` fails -with: - -File "/xxx/lib/python2.7/site-packages/tensorflow/contrib/tensorrt/wrap_conversion.py", line 24, in swig_import_helper - _mod = imp.load_module('_wrap_conversion', fp, pathname, description) -ImportError: dynamic module does not define init function (init_wrap_conversion) - -➜ 1534993632 nm /xxx/lib/python2.7/site-packages/tensorflow/contrib/tensorrt/_wrap_conversion.so | grep wrap_conversion -0000000000003670 t _init_wrap_conversion <---------- symbol defined, but local, not exposed - U init_wrap_conversion - I init_wrap_conversion (indirect for init_wrap_conversion) - -Happens because the linker version script has: `init_wrap_conversion` instead of `_init_wrap_conversion` - -xref: https://github.com/tensorflow/tensorflow/issues/21818 -xref: https://stackoverflow.com/a/37534357 ---- - tensorflow/tensorflow.bzl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl -index b8438d2..f6850e3 100644 ---- a/tensorflow/tensorflow.bzl -+++ b/tensorflow/tensorflow.bzl -@@ -1594,7 +1594,7 @@ def _append_init_to_versionscript_impl(ctx): - template = ctx.file.template_file, - output = ctx.outputs.versionscript, - substitutions = { -- "global:": "global:\n init_%s;\n PyInit_*;" % (mod_name), -+ "global:": "global:\n init_%s;\n _init_%s;\n PyInit_*;\n _PyInit_*;"%(mod_name, mod_name), - }, - is_executable = False, - ) -@@ -1603,7 +1603,7 @@ def _append_init_to_versionscript_impl(ctx): - template = ctx.file.template_file, - output = ctx.outputs.versionscript, - substitutions = { -- "*tensorflow*": "*tensorflow*\ninit_%s\nPyInit_*\n" % (mod_name), -+ "*tensorflow*": "*tensorflow*\ninit_%s\n_init_%s\nPyInit_*\n_PyInit_*\n"%(mod_name, mod_name), - }, - is_executable = False, - ) --- -2.7.4 - diff --git a/recipe/patches/legacy/0008-Add-alternate-clock_gettime-implementation-for-macOS.patch b/recipe/patches/legacy/0008-Add-alternate-clock_gettime-implementation-for-macOS.patch deleted file mode 100644 index 8c04e0ff..00000000 --- a/recipe/patches/legacy/0008-Add-alternate-clock_gettime-implementation-for-macOS.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2f0373b5f8ea3e1ab8708cb9c64c404922b96b81 Mon Sep 17 00:00:00 2001 -From: Nehal J Wani -Date: Sun, 30 Sep 2018 09:16:53 -0500 -Subject: [PATCH 8/8] Add alternate clock_gettime() implementation for macOS < - 10.12 - -clock_gettime is not available in macOS SDK < 10.12 ---- - tensorflow/core/platform/posix/env_time.cc | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/tensorflow/core/platform/posix/env_time.cc b/tensorflow/core/platform/posix/env_time.cc -index 59a67b1..88f8a6c 100644 ---- a/tensorflow/core/platform/posix/env_time.cc -+++ b/tensorflow/core/platform/posix/env_time.cc -@@ -18,6 +18,23 @@ limitations under the License. - - #include "tensorflow/core/platform/env_time.h" - -+// Slightly pruned version of https://gist.github.com/alfwatt/3588c5aa1f7a1ef7a3bb -+// Copyright (c) 2015-2018 Alf Watt - Open Source - https://opensource.org/licenses/MIT -+#if defined __APPLE__ -+#include -+#include -+int alt_clock_gettime (int clock_id, timespec *ts) { -+ clock_serv_t cclock; -+ mach_timespec_t mts; -+ host_get_clock_service (mach_host_self (), clock_id, &cclock); -+ clock_get_time (cclock, &mts); -+ mach_port_deallocate (mach_task_self (), cclock); -+ ts->tv_sec = mts.tv_sec; -+ ts->tv_nsec = mts.tv_nsec; -+ return 0; -+} -+#endif -+ - namespace tensorflow { - - namespace { -@@ -28,7 +45,11 @@ class PosixEnvTime : public EnvTime { - - uint64 NowNanos() override { - struct timespec ts; -+#if defined __APPLE__ -+ alt_clock_gettime(CALENDAR_CLOCK, &ts); -+#else - clock_gettime(CLOCK_REALTIME, &ts); -+#endif - return (static_cast(ts.tv_sec) * kSecondsToNanos + - static_cast(ts.tv_nsec)); - } --- -2.7.4 - - diff --git a/recipe/test_tensorflow_base.py b/recipe/test_tensorflow.py similarity index 100% rename from recipe/test_tensorflow_base.py rename to recipe/test_tensorflow.py From 9d76035c6a6e928ac87500cbbc10f9af160dd760 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 5 Dec 2021 18:47:30 -0500 Subject: [PATCH 2/7] Migrate libprotobuf 3.19, python 3.10 and patch tensorflow 2.7 --- .ci_support/migrations/libprotobuf319.yaml | 7 ++ .ci_support/migrations/python310.yaml | 34 +++++++++ .scripts/build_steps.sh | 3 +- recipe/README.md | 46 ++++++++++++ recipe/conda_build_config.yaml | 5 +- recipe/meta.yaml | 74 +++++++++++-------- recipe/patches/0004-loosen-requirements.patch | 38 ++++++---- recipe/test_libtensorflow_cc.sh | 2 +- 8 files changed, 159 insertions(+), 50 deletions(-) create mode 100644 .ci_support/migrations/libprotobuf319.yaml create mode 100644 .ci_support/migrations/python310.yaml create mode 100644 recipe/README.md diff --git a/.ci_support/migrations/libprotobuf319.yaml b/.ci_support/migrations/libprotobuf319.yaml new file mode 100644 index 00000000..bafbe1ff --- /dev/null +++ b/.ci_support/migrations/libprotobuf319.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libprotobuf: +- '3.19' +migrator_ts: 1634806373.384677 diff --git a/.ci_support/migrations/python310.yaml b/.ci_support/migrations/python310.yaml new file mode 100644 index 00000000..c31e9914 --- /dev/null +++ b/.ci_support/migrations/python310.yaml @@ -0,0 +1,34 @@ +migrator_ts: 1634137107 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + paused: false + longterm: True + pr_limit: 40 + max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.10.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.21 +python_impl: + - cpython diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beba4b58..28f68006 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -29,6 +29,7 @@ GET_BOA=boa BUILD_CMD=mambabuild conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge +# Without lief_dev builds take much longer on OSX conda update --yes -c conda-forge/label/lief_dev -c conda-forge py-lief # set up the condarc @@ -74,4 +75,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/recipe/README.md b/recipe/README.md new file mode 100644 index 00000000..daf15639 --- /dev/null +++ b/recipe/README.md @@ -0,0 +1,46 @@ +To build a conda TensorFlow package with or without GPU support you can use +docker and the `build-locally.py` script. + +1. Install docker. Ensure that the following command succeeds: + +```bash +docker run hello-world +``` + +2. Build a specific version with the command +```bash +python build-locally.py +``` + +3. Generally speaking, this package takes too long to compile on any of our CI + resources. One should follow CFEP-03 to package this feedstock. + +The following script may help build all cuda version sequentially: +```bash +#!/usr/env/bin bash + +set -ex +conda activate base + +docker system prune --force +configs=$(find .ci_support/ -type f -name 'linux_64_*' -printf "%p ") + +# Assuming a powerful enough machine with many cores +# 10 seems to be a good point where things don't run out of RAM too much. +export CPU_COUNT=10 + +mkdir -p build_artifacts + +for config_filename in $configs; do + filename=$(basename ${config_filename}) + config=${filename%.*} + if [ -f build_artifacts/conda-forge-build-done-${config} ]; then + echo skipped $config + continue + fi + + python build-locally.py $config | tee build_artifacts/${config}-log.txt + # docker images get quite big clean them up after each build to save your disk.... + docker system prune --force +done +``` diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index f8760c8b..d6f370e3 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,5 @@ +# 2021/12/05 hmaarrfk +# Tensorflow 2.7.0 requires futimens which is only +# available on 10.13 MACOSX_SDK_VERSION: # [osx and x86_64] - - "10.12" # [osx and x86_64] + - "10.13" # [osx and x86_64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 787f0fe3..9ccc4c62 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,6 +21,7 @@ source: build: number: 0 skip: true # [win] + skip: true # [python_impl == 'pypy'] requirements: build: @@ -92,10 +93,8 @@ requirements: - protobuf >=3.9.2 - python-flatbuffers >=1.12,<3 - six >=1.12 - - tensorflow-io-gcs-filesystem >=0.21.0 - termcolor >=1.1.0 - typing_extensions >=3.6.6 - - wheel >=0.32,<1 - wrapt >=1.11.0 # TF-API needs to move in sync # XXX: actually, TF 2.7.0 still demands tb 2.6 @@ -103,10 +102,12 @@ requirements: - keras >=2.7,<2.8 outputs: - # as of tensorflow 2.7.0, we don't need tensorflow-base anymore; - # we still build it as a compatibility output (see below), but the - # main package is being built in the "tensorflow" output directly. - - name: tensorflow + # 2021/12/29: hmaarrfk + # as of tensorflow 2.7.0 we need the tensorflow-base package to break + # circular dependency when buliding tensorflow extra packages This annoying + # circularity is broken upstream by the fact that they have to bootstrap + # their builds + - name: tensorflow-base script: build_pkg.sh # [not win] script: build_pkg.bat # [win] build: @@ -137,6 +138,7 @@ outputs: # conda build requirements - python - pip + - wheel # TF_SYSTEM_LIBS - astor - cython @@ -166,10 +168,8 @@ outputs: - protobuf >=3.9.2 - python-flatbuffers >=1.12,<3 - six >=1.12 - - tensorflow-io-gcs-filesystem >=0.21.0 - termcolor >=1.1.0 - typing_extensions >=3.6.6 - - wheel >=0.32,<1 - wrapt >=1.11.0 # TF-API needs to move in sync # XXX: actually, TF 2.7.0 still demands tb 2.6 @@ -189,10 +189,8 @@ outputs: - protobuf >=3.9.2 - python-flatbuffers >=1.12,<3 - six >=1.12 - - tensorflow-io-gcs-filesystem >=0.21.0 - termcolor >=1.1.0 - typing_extensions >=3.6.6 - - wheel >=0.32,<1 - wrapt >=1.11.0 # TF-API needs to move in sync # XXX: actually, TF 2.7.0 still demands tb 2.6 @@ -200,36 +198,46 @@ outputs: - keras >=2.7,<2.8 # avoid that people without GPUs needlessly download ~0.5-1GB - __cuda # [cuda_compiler_version != "None"] - test: - files: - - test_tensorflow.py - commands: - - cat test_tensorflow.py # [unix] - - python test_tensorflow.py - - tf_upgrade_v2 --help - - saved_model_cli --help - - tflite_convert --help # [not win] - - toco_from_protos --help # [not win] - - toco --help # [not win] + # TODO: decide on the name of the package + # run_constrained: + # What is the difference between these two packages? + # - tensorflow-io-gcs-filesystem >=0.21.0 + # - tensorflow-io >=0.21.0 - # compatibility output wrapping core package, since tensorflow-base - # was used as an output before 2.7 (should we add a deprecation warning?) - - name: tensorflow-base + - name: tensorflow + build: + string: cuda{{ cuda_compiler_version | replace('.', '') }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] + string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] + # weigh down cpu implementation and give cuda preference + track_features: + - tensorflow-cpu # [cuda_compiler_version == "None"] requirements: host: + # Require python so that the CONDA_PY gets populated - python - - openssl - - {{ pin_subpackage('tensorflow', exact=True) }} run: - python - - {{ pin_subpackage('tensorflow', exact=True) }} + - {{ pin_subpackage('tensorflow-base', exact=True) }} + - {{ pin_subpackage('tensorflow-estimator', exact=True) }} + # avoid that people without GPUs needlessly download ~0.5-1GB + # This also helps mamba give preference to the CPU build + - __cuda # [cuda_compiler_version != "None"] test: + files: + - test_tensorflow.py requires: - pip imports: - tensorflow commands: - pip check + - cat test_tensorflow.py # [unix] + - python test_tensorflow.py + - 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] @@ -256,10 +264,10 @@ outputs: # all packages. # https://github.com/conda-forge/conda-forge.github.io/issues/1528 - openssl - - {{ pin_subpackage('tensorflow', exact=True) }} + - {{ pin_subpackage('tensorflow-base', exact=True) }} run: - python - - {{ pin_subpackage('tensorflow', exact=True) }} + - {{ pin_subpackage('tensorflow-base', exact=True) }} test: requires: - pip @@ -376,10 +384,12 @@ about: license: Apache-2.0 license_file: LICENSE license_family: Apache - summary: An Open Source Machine Learning Framework for Everyone. + summary: TensorFlow is an end-to-end open source platform for machine learning. description: | - TensorFlow provides multiple APIs. The lowest level API, TensorFlow Core - provides you with complete programming control. + TensorFlow offers multiple levels of abstraction so you can choose the + right one for your needs. Build and train models by using the high-level + Keras API, which makes getting started with TensorFlow and machine learning + easy. 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 diff --git a/recipe/patches/0004-loosen-requirements.patch b/recipe/patches/0004-loosen-requirements.patch index bd7fb735..0a22769f 100644 --- a/recipe/patches/0004-loosen-requirements.patch +++ b/recipe/patches/0004-loosen-requirements.patch @@ -1,16 +1,19 @@ -From 59100b60d2aeaa9110346995777b6ffc255e8999 Mon Sep 17 00:00:00 2001 +From b6371c3abefb0ab2b3e943f43088ab42fac9c5bc Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" -Date: Wed, 8 Sep 2021 06:57:09 +0200 -Subject: [PATCH 4/5] loosen requirements +Date: Thu, 30 Dec 2021 06:57:09 +0200 +Subject: [PATCH] Fixup requirements -* Set grpcio pin to the built grpc version -* Remove unused clang requirement +* Remove unused libclang requirement +* Remove unused wheel requirement +* Remove unecessary tensorflow-io-gcs-filesystem + +Co-authored-by: Mark Harfouche --- 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 26306e43aaf..bf5d21aca5b 100644 +index 26306e43aaf..60cefcad10d 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -82,7 +82,6 @@ REQUIRED_PACKAGES = [ @@ -21,15 +24,20 @@ index 26306e43aaf..bf5d21aca5b 100644 'flatbuffers >= 1.12, < 3.0', # capped as jax 0.1.71 needs < 3.0 'google_pasta >= 0.1.1', 'h5py >= 2.9.0', # capped since 3.3.0 lacks py3.6 -@@ -129,7 +128,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.24.3, < 2.0') -+ REQUIRED_PACKAGES.append('grpcio >= GRPCIO_VERSION, < 2.0') +@@ -92,7 +91,6 @@ REQUIRED_PACKAGES = [ + 'six >= 1.12.0', + 'termcolor >= 1.1.0', + 'typing_extensions >= 3.6.6', +- 'wheel >= 0.32.0, < 1.0', # capped as astunparse 1.6.0-1.6.3 requires < 1.0 + 'wrapt >= 1.11.0', + # These packages need to be pinned exactly as newer versions are + # incompatible with the rest of the ecosystem +@@ -106,7 +104,6 @@ REQUIRED_PACKAGES = [ + # Keras release is not backward compatible with old tf release, and we have + # to make the version aligned between TF and Keras. + 'keras >= 2.7.0rc0, < 2.8', +- 'tensorflow-io-gcs-filesystem >= 0.21.0', + ] - # Packages which are only needed for testing code. --- -2.32.0.windows.2 diff --git a/recipe/test_libtensorflow_cc.sh b/recipe/test_libtensorflow_cc.sh index aa702674..e102dff5 100755 --- a/recipe/test_libtensorflow_cc.sh +++ b/recipe/test_libtensorflow_cc.sh @@ -2,5 +2,5 @@ set -exuo pipefail -$CXX -std=c++11 -o test_cc -L${PREFIX}/lib/ -ltensorflow_cc -ltensorflow_framework -lrt -I${PREFIX}/include/ test_cc.cc +$CXX -std=c++14 -o test_cc -L${PREFIX}/lib/ -ltensorflow_cc -ltensorflow_framework -lrt -I${PREFIX}/include/ test_cc.cc ./test_cc From 5f7bc979365b5bdad4fd604a02dc7973351e47fb Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 26 Jan 2022 09:29:18 -0500 Subject: [PATCH 3/7] MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.16.2, and conda-forge-pinning 2022.01.26.09.22.36 --- .azure-pipelines/azure-pipelines-linux.yml | 80 ++++++---- .azure-pipelines/azure-pipelines-osx.yml | 26 ++-- ...rsion7numpy1.18python3.7.____cpython.yaml} | 9 +- ...rsion7numpy1.18python3.8.____cpython.yaml} | 9 +- ...rsion7numpy1.19python3.9.____cpython.yaml} | 9 +- ...rsion7numpy1.21python3.10.____cpython.yaml | 78 ++++++++++ ...rsion9numpy1.18python3.7.____cpython.yaml} | 9 +- ...rsion9numpy1.18python3.8.____cpython.yaml} | 9 +- ...rsion9numpy1.19python3.9.____cpython.yaml} | 9 +- ...rsion9numpy1.21python3.10.____cpython.yaml | 78 ++++++++++ ...rsion9numpy1.18python3.7.____cpython.yaml} | 9 +- ...rsion9numpy1.18python3.8.____cpython.yaml} | 9 +- ...rsion9numpy1.19python3.9.____cpython.yaml} | 9 +- ...rsion9numpy1.21python3.10.____cpython.yaml | 78 ++++++++++ ...rsion9numpy1.18python3.7.____cpython.yaml} | 9 +- ...rsion9numpy1.18python3.8.____cpython.yaml} | 9 +- ...rsion9numpy1.19python3.9.____cpython.yaml} | 9 +- ...rsion9numpy1.21python3.10.____cpython.yaml | 78 ++++++++++ ...rsion9numpy1.18python3.7.____cpython.yaml} | 9 +- ...rsion9numpy1.18python3.8.____cpython.yaml} | 9 +- ...rsion9numpy1.19python3.9.____cpython.yaml} | 9 +- ...rsion9numpy1.21python3.10.____cpython.yaml | 78 ++++++++++ .ci_support/migrations/grpc_cpp142.yaml | 7 - .ci_support/migrations/libprotobuf318.yaml | 7 - ...sx_64_numpy1.18python3.7.____cpython.yaml} | 11 +- ...sx_64_numpy1.18python3.8.____cpython.yaml} | 11 +- ...sx_64_numpy1.19python3.9.____cpython.yaml} | 11 +- ...sx_64_numpy1.21python3.10.____cpython.yaml | 70 +++++++++ ...arm64_numpy1.19python3.8.____cpython.yaml} | 9 +- ...arm64_numpy1.19python3.9.____cpython.yaml} | 9 +- ...arm64_numpy1.21python3.10.____cpython.yaml | 68 +++++++++ .scripts/build_steps.sh | 14 +- .scripts/run_osx_build.sh | 14 +- LICENSE.txt | 2 +- README.md | 142 ++++++++++++------ 35 files changed, 869 insertions(+), 137 deletions(-) rename .ci_support/{linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython.yaml => linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython.yaml => linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython.yaml => linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml} (90%) create mode 100644 .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml} (90%) create mode 100644 .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.7.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.8.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.9.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml} (90%) create mode 100644 .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.7.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.8.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.9.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml} (90%) create mode 100644 .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.7.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.8.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.9.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython.yaml} (90%) create mode 100644 .ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython.yaml delete mode 100644 .ci_support/migrations/grpc_cpp142.yaml delete mode 100644 .ci_support/migrations/libprotobuf318.yaml rename .ci_support/{osx_64_python3.7.____cpython.yaml => osx_64_numpy1.18python3.7.____cpython.yaml} (88%) rename .ci_support/{osx_64_python3.8.____cpython.yaml => osx_64_numpy1.18python3.8.____cpython.yaml} (88%) rename .ci_support/{osx_64_python3.9.____cpython.yaml => osx_64_numpy1.19python3.9.____cpython.yaml} (88%) create mode 100644 .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename .ci_support/{osx_arm64_python3.8.____cpython.yaml => osx_arm64_numpy1.19python3.8.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_python3.9.____cpython.yaml => osx_arm64_numpy1.19python3.9.____cpython.yaml} (89%) create mode 100644 .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 1dcdca03..1bc0275d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,64 +8,84 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython + linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython: + CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython + linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython: + CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython + linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython: + CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython + linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython: + CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 + linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.7.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.7.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 + linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 + linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.8.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.8.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.9.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.9.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.7.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.7.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.8.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.8.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.9.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.9.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.7.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.7.____cpython + linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.8.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.8.____cpython + linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.9.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.9.____cpython + linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 4087d69b..0bea91f6 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,20 +8,26 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_python3.7.____cpython: - CONFIG: osx_64_python3.7.____cpython + osx_64_numpy1.18python3.7.____cpython: + CONFIG: osx_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython + osx_64_numpy1.18python3.8.____cpython: + CONFIG: osx_64_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython + osx_64_numpy1.19python3.9.____cpython: + CONFIG: osx_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython + osx_64_numpy1.21python3.10.____cpython: + CONFIG: osx_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.9.____cpython: - CONFIG: osx_arm64_python3.9.____cpython + osx_arm64_numpy1.19python3.8.____cpython: + CONFIG: osx_arm64_numpy1.19python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.19python3.9.____cpython: + CONFIG: osx_arm64_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.21python3.10.____cpython: + CONFIG: osx_arm64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython.yaml index 2557cbf7..7b2a898e 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython.yaml index 0db53641..318dbb84 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml index 6e17caed..ec6e6fc6 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000..34bc60f8 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '10.2' +cudnn: +- '7' +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 +giflib: +- '5.2' +grpc_cpp: +- '1.42' +icu: +- '69' +jpeg: +- '9' +libcurl: +- '7' +libpng: +- '1.6' +libprotobuf: +- '3.19' +nccl: +- '2' +numpy: +- '1.21' +openssl: +- 1.1.1 +pin_run_as_build: + jpeg: + max_pin: x + libcurl: + max_pin: x + libpng: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + sqlite: + max_pin: x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +python_impl: +- cpython +snappy: +- '1' +sqlite: +- '3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cudnn + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml index cb3ded58..c4f2845b 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml index 43428aaf..1e9307be 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml index 68d7bd91..69697a24 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000..dfd9f2b0 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.0' +cudnn: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.0 +giflib: +- '5.2' +grpc_cpp: +- '1.42' +icu: +- '69' +jpeg: +- '9' +libcurl: +- '7' +libpng: +- '1.6' +libprotobuf: +- '3.19' +nccl: +- '2' +numpy: +- '1.21' +openssl: +- 1.1.1 +pin_run_as_build: + jpeg: + max_pin: x + libcurl: + max_pin: x + libpng: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + sqlite: + max_pin: x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +python_impl: +- cpython +snappy: +- '1' +sqlite: +- '3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cudnn + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml index 3991c041..b02f6327 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml index 84d95b9e..1dffbd96 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml index 7f2a9ba8..104d6ee6 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000..55cdc0d9 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.1' +cudnn: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.1 +giflib: +- '5.2' +grpc_cpp: +- '1.42' +icu: +- '69' +jpeg: +- '9' +libcurl: +- '7' +libpng: +- '1.6' +libprotobuf: +- '3.19' +nccl: +- '2' +numpy: +- '1.21' +openssl: +- 1.1.1 +pin_run_as_build: + jpeg: + max_pin: x + libcurl: + max_pin: x + libpng: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + sqlite: + max_pin: x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +python_impl: +- cpython +snappy: +- '1' +sqlite: +- '3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cudnn + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml index 94482991..8cc80844 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml index a029ac93..863f4f6a 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml index e20f07f8..8ad22a2a 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000..213f9237 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.2' +cudnn: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.2 +giflib: +- '5.2' +grpc_cpp: +- '1.42' +icu: +- '69' +jpeg: +- '9' +libcurl: +- '7' +libpng: +- '1.6' +libprotobuf: +- '3.19' +nccl: +- '2' +numpy: +- '1.21' +openssl: +- 1.1.1 +pin_run_as_build: + jpeg: + max_pin: x + libcurl: + max_pin: x + libpng: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + sqlite: + max_pin: x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +python_impl: +- cpython +snappy: +- '1' +sqlite: +- '3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cudnn + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython.yaml index 8e2b7d27..065dbb6d 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython.yaml index 19f524b7..62fe4c08 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython.yaml index f07aa0e2..a7eb1546 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython.yaml @@ -33,9 +33,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' nccl: - '2' +numpy: +- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -54,6 +56,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -67,5 +71,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000..a5f67332 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None +cudnn: +- undefined +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' +grpc_cpp: +- '1.42' +icu: +- '69' +jpeg: +- '9' +libcurl: +- '7' +libpng: +- '1.6' +libprotobuf: +- '3.19' +nccl: +- '2' +numpy: +- '1.21' +openssl: +- 1.1.1 +pin_run_as_build: + jpeg: + max_pin: x + libcurl: + max_pin: x + libpng: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + sqlite: + max_pin: x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +python_impl: +- cpython +snappy: +- '1' +sqlite: +- '3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cudnn + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.ci_support/migrations/grpc_cpp142.yaml b/.ci_support/migrations/grpc_cpp142.yaml deleted file mode 100644 index 622aabc3..00000000 --- a/.ci_support/migrations/grpc_cpp142.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -grpc_cpp: -- '1.42' -migrator_ts: 1637242857.2922714 diff --git a/.ci_support/migrations/libprotobuf318.yaml b/.ci_support/migrations/libprotobuf318.yaml deleted file mode 100644 index 328967a5..00000000 --- a/.ci_support/migrations/libprotobuf318.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.18' -migrator_ts: 1631764220.7977521 diff --git a/.ci_support/osx_64_python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml similarity index 88% rename from .ci_support/osx_64_python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml index dcc6b5e8..c3e9b0e3 100644 --- a/.ci_support/osx_64_python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: @@ -29,9 +29,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -50,6 +52,8 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -59,5 +63,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml similarity index 88% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.8.____cpython.yaml index 23d40fbe..9a90e52a 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: @@ -29,9 +29,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '1.18' openssl: - 1.1.1 pin_run_as_build: @@ -50,6 +52,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -59,5 +63,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml similarity index 88% rename from .ci_support/osx_64_python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index d0d42927..7110d423 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: @@ -29,9 +29,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -50,6 +52,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -59,5 +63,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000..29c424e0 --- /dev/null +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,70 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +giflib: +- '5.2' +grpc_cpp: +- '1.42' +icu: +- '69' +jpeg: +- '9' +libcurl: +- '7' +libpng: +- '1.6' +libprotobuf: +- '3.19' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.21' +openssl: +- 1.1.1 +pin_run_as_build: + jpeg: + max_pin: x + libcurl: + max_pin: x + libpng: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + sqlite: + max_pin: x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +python_impl: +- cpython +snappy: +- '1' +sqlite: +- '3' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml index 036ef27c..e55f7d76 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml @@ -27,9 +27,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' macos_machine: - arm64-apple-darwin20.0.0 +numpy: +- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -48,6 +50,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -57,5 +61,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml index beea7a7e..077ad2e2 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml @@ -27,9 +27,11 @@ libcurl: libpng: - '1.6' libprotobuf: -- '3.18' +- '3.19' macos_machine: - arm64-apple-darwin20.0.0 +numpy: +- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -48,6 +50,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython snappy: - '1' sqlite: @@ -57,5 +61,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy + - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000..ddfde84e --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,68 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +giflib: +- '5.2' +grpc_cpp: +- '1.42' +icu: +- '69' +jpeg: +- '9' +libcurl: +- '7' +libpng: +- '1.6' +libprotobuf: +- '3.19' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.21' +openssl: +- 1.1.1 +pin_run_as_build: + jpeg: + max_pin: x + libcurl: + max_pin: x + libpng: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + sqlite: + max_pin: x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +python_impl: +- cpython +snappy: +- '1' +sqlite: +- '3' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 28f68006..ff01283b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -5,6 +5,8 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +# -*- mode: jinja-shell -*- + set -xeuo pipefail export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh @@ -25,12 +27,10 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC -GET_BOA=boa -BUILD_CMD=mambabuild -conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge -# Without lief_dev builds take much longer on OSX -conda update --yes -c conda-forge/label/lief_dev -c conda-forge py-lief + +mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -55,7 +55,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" ( startgroup "Validating outputs" ) 2> /dev/null @@ -75,4 +75,4 @@ fi ( startgroup "Final checks" ) 2> /dev/null -touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" +touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 15783f8a..d10e0c2c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# -*- mode: jinja-shell -*- + source .scripts/logging_utils.sh set -xe @@ -9,7 +11,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="Mambaforge-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -18,15 +20,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} ( startgroup "Configuring conda" ) 2> /dev/null -GET_BOA=boa -BUILD_CMD=mambabuild - source ${MINIFORGE_HOME}/etc/profile.d/conda.sh 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 -c conda-forge py-lief +mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa +mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa + echo -e "\n\nSetting up the condarc and mangling the compiler." @@ -55,7 +55,7 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} +conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/LICENSE.txt b/LICENSE.txt index ed3f451e..6ec14012 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2021, conda-forge contributors +Copyright (c) 2015-2022, conda-forge contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index c4b918f7..8c16fd78 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,16 @@ Package license: Apache-2.0 Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/tensorflow-feedstock/blob/master/LICENSE.txt) -Summary: An Open Source Machine Learning Framework for Everyone. +Summary: TensorFlow is an end-to-end open source platform for machine learning. Development: https://github.com/tensorflow/tensorflow Documentation: https://www.tensorflow.org/get_started/get_started -TensorFlow provides multiple APIs. The lowest level API, TensorFlow Core -provides you with complete programming control. +TensorFlow offers multiple levels of abstraction so you can choose the +right one for your needs. Build and train models by using the high-level +Keras API, which makes getting started with TensorFlow and machine learning +easy. Current build status @@ -35,143 +37,192 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + @@ -193,6 +244,7 @@ Current release info | [![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--cpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | | [![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) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--gpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | Installing tensorflow ===================== @@ -204,10 +256,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, tensorflow-cpu, tensorflow-estimator` can be installed with: +Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base, tensorflow-cpu, tensorflow-estimator, tensorflow-gpu` can be installed with: ``` -conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator +conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator tensorflow-gpu ``` It is possible to list all of the versions of `libtensorflow` available on your platform with: From 352e0e5906568343ca9a07c96ea651516fd28809 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 3 Feb 2022 14:44:31 +0100 Subject: [PATCH 4/7] Explicitly codesign on osx-arm64 --- recipe/custom_toolchain/cc_wrapper.sh.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/custom_toolchain/cc_wrapper.sh.template b/recipe/custom_toolchain/cc_wrapper.sh.template index 559bc1e5..43ecf321 100644 --- a/recipe/custom_toolchain/cc_wrapper.sh.template +++ b/recipe/custom_toolchain/cc_wrapper.sh.template @@ -105,3 +105,6 @@ for rpath in ${RPATHS}; do done done +if [[ "${target_plaform}" == "osx-arm64" ]]; then + /usr/bin/codesign -s - -f ${OUTPUT} +fi From 7091a25394370b025a57087004237abb5972fd83 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 3 Feb 2022 18:29:45 +0100 Subject: [PATCH 5/7] Fix typo --- recipe/custom_toolchain/cc_wrapper.sh.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/custom_toolchain/cc_wrapper.sh.template b/recipe/custom_toolchain/cc_wrapper.sh.template index 43ecf321..5fc36344 100644 --- a/recipe/custom_toolchain/cc_wrapper.sh.template +++ b/recipe/custom_toolchain/cc_wrapper.sh.template @@ -105,6 +105,6 @@ for rpath in ${RPATHS}; do done done -if [[ "${target_plaform}" == "osx-arm64" ]]; then +if [[ "${target_platform}" == "osx-arm64" ]]; then /usr/bin/codesign -s - -f ${OUTPUT} fi From f10ef544d12c5cde4e4cd16655f12fe200449c5d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 3 Feb 2022 19:26:45 +0100 Subject: [PATCH 6/7] Persist target_platform --- recipe/gen-bazel-toolchain.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/gen-bazel-toolchain.sh b/recipe/gen-bazel-toolchain.sh index acdfea1f..63e3098e 100755 --- a/recipe/gen-bazel-toolchain.sh +++ b/recipe/gen-bazel-toolchain.sh @@ -35,11 +35,13 @@ pushd custom_toolchain if [[ "${target_platform}" == osx-* ]]; then export BAZEL_TOOLCHAIN_COMPILER_VERSION=$($CC -v 2>&1 | head -n1 | cut -d' ' -f3) sed -e "s:\${CLANG}:${CLANG}:" \ + -e "s:\${target_platform}:${target_platform}:" \ -e "s:\${INSTALL_NAME_TOOL}:${INSTALL_NAME_TOOL}:" \ -e "s:\${CONDA_BUILD_SYSROOT}:${CONDA_BUILD_SYSROOT}:" \ cc_wrapper.sh.template > cc_wrapper.sh chmod +x cc_wrapper.sh sed -e "s:\${CLANG}:${CC_FOR_BUILD}:" \ + -e "s:\${target_platform}:${target_platform}:" \ -e "s:\${INSTALL_NAME_TOOL}:${INSTALL_NAME_TOOL//${HOST}/${BUILD}}:" \ -e "s:\${CONDA_BUILD_SYSROOT}:${CONDA_BUILD_SYSROOT}:" \ cc_wrapper.sh.template > cc_wrapper_build.sh From ed8a50654acb2ee4642272a0374c8c55462c0e68 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 4 Feb 2022 12:42:26 +0100 Subject: [PATCH 7/7] Use lief_dev --- .scripts/build_steps.sh | 1 + .scripts/run_osx_build.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ff01283b..d56dd183 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,6 +31,7 @@ CONDARC mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba update --update-specs --yes --quiet -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 d10e0c2c..d4176f78 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,6 +26,7 @@ conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa +mamba update -n base --update-specs --quiet --yes -c conda-forge/label/lief_dev -c conda-forge py-lief
VariantStatus
linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpythonlinux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython - variant + variant
linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpythonlinux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython - variant + variant
linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpythonlinux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpythonlinux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.7.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.8.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9python3.9.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.7.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.8.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9python3.9.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.7.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.8.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9python3.9.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython - variant + variant
osx_64_python3.7.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython - variant + variant
osx_64_python3.8.____cpythonlinux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython - variant + variant
osx_64_python3.9.____cpythonlinux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython - variant + variant
osx_arm64_python3.8.____cpythonlinux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython - variant + variant
osx_arm64_python3.9.____cpythonlinux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython - variant + variant + +
osx_64_numpy1.18python3.7.____cpython + + variant + +
osx_64_numpy1.18python3.8.____cpython + + variant + +
osx_64_numpy1.19python3.9.____cpython + + variant + +
osx_64_numpy1.21python3.10.____cpython + + variant + +
osx_arm64_numpy1.19python3.8.____cpython + + variant + +
osx_arm64_numpy1.19python3.9.____cpython + + variant + +
osx_arm64_numpy1.21python3.10.____cpython + + variant