Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions keras/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "keras" %}
{% set version = "2.9.0" %}
{% set version = "2.10.0" %}
{% set major_minor = version.rsplit('.', 1)[0] %}

package:
Expand All @@ -8,7 +8,7 @@ package:

source:
- url: https://pypi.io/packages/py2.py3/k/keras/keras-{{ version }}-py2.py3-none-any.whl
sha256: 55911256f89cfc9343c9fbe4b61ec45a2d33d89729cbe1ab9dcacf8b07b8b6ab
sha256: 26a6e2c2522e7468ddea22710a99b3290493768fc08a39e75d1173a0e3452fdf
- url: https://raw.githubusercontent.com/keras-team/keras/v{{ version }}/LICENSE
sha256: 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd

Expand All @@ -25,8 +25,6 @@ requirements:
- wheel
run:
- python
- pyyaml
- scipy 1.7.3
- keras-preprocessing >=1.1.2
run_constrained:
# Other dependencies (such as h5py, numpy, ...) in their correct versions
Expand Down
4 changes: 2 additions & 2 deletions tensorboard/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% set name = "tensorboard" %}
{% set version = "2.9.0" %}
{% set version = "2.10.0" %}

package:
name: {{ name|lower }}
version: {{ version }}

source:
url: https://pypi.io/packages/py3/t/tensorboard/tensorboard-{{ version }}-py3-none-any.whl
sha256: bd78211076dca5efa27260afacfaa96cd05c7db12a6c09cc76a1d6b2987ca621
sha256: 76c91a5e8959cd2208cc32cb17a0cb002badabb66a06ac2af02a7810f49a59e3

build:
number: 0
Expand Down
2 changes: 0 additions & 2 deletions tensorflow-base-cpu-gpu-linwin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,8 @@ bazel build ${BAZEL_MKL_OPT} ${BAZEL_CUDA_OPT} ${BAZEL_OPT_FLAG} \
--copt=-fPIC \
--copt=-fstack-protector-strong \
--copt=-O2 \
--copt=-DNO_CONSTEXPR_FOR_YOU=1 \
--cxxopt=-fvisibility-inlines-hidden \
--cxxopt=-fmessage-length=0 \
--host_copt=-DNO_CONSTEXPR_FOR_YOU=1 \
--linkopt=-zrelro \
--linkopt=-znow \
--linkopt="-L${PREFIX}/lib" \
Expand Down
14 changes: 9 additions & 5 deletions tensorflow-base-cpu-gpu-linwin/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
cxx_compiler: # [win]
- vs2019 # [win]
c_compiler: # [win]
- vs2019 # [win]
cxx_compiler: # [win]
- vs2019 # [win]
c_compiler: # [win]
- vs2019 # [win]
cxx_compiler_version: # [linux64]
- 9.3.0 # [linux64]
c_compiler_version: # [linux64]
- 9.3.0 # [linux64]
tflow_variant:
- mkl
- eigen
- gpu
- gpu # [linux64]
cudatoolkit:
- 11.3
cudnn:
Expand Down
24 changes: 12 additions & 12 deletions tensorflow-base-cpu-gpu-linwin/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "2.9.1" %}
{% set version = "2.10.0" %}
{% set major_minor = version.rsplit('.', 1)[0] %}

# This is the recipe for the "mkl", "eigen" and "gpu" variants of tensorflow-base
Comment thread
sumit0190 marked this conversation as resolved.
Expand All @@ -9,7 +9,7 @@ package:
source:
fn: tensorflow-{{ version }}.tar.gz
url: https://github.com/tensorflow/tensorflow/archive/v{{ version }}.tar.gz
sha256: 6eaf86ead73e23988fe192da1db68f4d3828bcdd0f3a9dc195935e339c95dbdc
sha256: b5a1bb04c84b6fe1538377e5a1f649bb5d5f0b2e3625a3c526ff3a8af88633e8
patches:
- patches/0101-include-c-and-cc-headers.patch # [unix]
- patches/0103-BUILD-changes-for-external-sqlite-package.patch # [linux]
Expand Down Expand Up @@ -73,7 +73,7 @@ requirements:
- dill >=0.3.1.1
- giflib
- grpc-cpp
- flatbuffers >=1.12
- flatbuffers 2.0
- icu
- jpeg
- libpng
Expand All @@ -83,11 +83,10 @@ requirements:
- sqlite
- snappy
- zlib
- abseil-cpp
- absl-py 0.10 # [py<39]
- absl-py 0.11 # [py>=39]
- requests
- absl-py 1.3.0
- astunparse 1.6.3
- python-flatbuffers
- python-flatbuffers 2.0
- gast >=0.2.1
- google-pasta >=0.1.1
- grpcio >=1.24.3,<2.0
Expand Down Expand Up @@ -118,18 +117,19 @@ requirements:
- numpy >=1.20,<2
- scipy >=1.7.3,<2
- packaging
- absl-py >=0.10.0
- absl-py >=1.0.0
- astunparse >=1.6.3
- flatbuffers >=1.12
- flatbuffers >=2.0
- gast >=0.2.1
Comment thread
sumit0190 marked this conversation as resolved.
Outdated
- google-pasta >=0.1.1
- grpcio >=1.24.3,<2.0
- h5py >=2.9.0
- keras {{ major_minor }}.*
- opt_einsum >=2.3.2
- python
- python-flatbuffers
- python-flatbuffers >=2.0
- setuptools
- requests
- six >=1.12.0
- tensorboard {{ major_minor }}.*
- tensorflow-estimator {{ major_minor }}.*
Expand Down Expand Up @@ -165,8 +165,8 @@ about:
provides you with complete programming control.
Base package contains only tensorflow, not tensorflow-tensorboard.
dev_url: https://github.com/tensorflow/tensorflow
doc_url: https://www.tensorflow.org/get_started/get_started
doc_source_url: https://github.com/tensorflow/tensorflow/tree/master/tensorflow/docs_src
doc_url: https://www.tensorflow.org/api_docs
doc_source_url: https://github.com/tensorflow/docs/

extra:
tflow_variant: {{ tflow_variant }}
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ diff --git a/tensorflow/core/platform/default/cuda_libdevice_path.cc b/tensorflo
index 25eb6ab463..44522e5528 100644
--- a/tensorflow/core/platform/default/cuda_libdevice_path.cc
+++ b/tensorflow/core/platform/default/cuda_libdevice_path.cc
@@ -27,7 +27,16 @@ namespace tensorflow {
@@ -27,8 +27,15 @@

std::vector<string> CandidateCudaRoots() {
VLOG(3) << "CUDA root = " << TF_CUDA_TOOLKIT_PATH;
#if !defined(PLATFORM_GOOGLE)
- VLOG(3) << "CUDA root = " << TF_CUDA_TOOLKIT_PATH;
- return {TF_CUDA_TOOLKIT_PATH, string("/usr/local/cuda")};
+
+/* WML-CE Issue #11827 - TF_CUDA_TOOLKIT_PATH will be stored as an
+absolute path during the bazel build. Conda uses build paths that are
+256 characters long. During conda install, it will replace the build path
+with the shorter install path and append null terminators to keep the
+binary file the same size. We need to use c_str() to remove the extra
+null terminators.
+*/
+ /* WML-CE Issue #11827 - TF_CUDA_TOOLKIT_PATH will be stored as an
+ absolute path during the bazel build. Conda uses build paths that are
+ 256 characters long. During conda install, it will replace the build path
+ with the shorter install path and append null terminators to keep the
+ binary file the same size. We need to use c_str() to remove the extra
+ null terminators.
+ */
+ string cuda_toolkit_path = TF_CUDA_TOOLKIT_PATH;
+ return {cuda_toolkit_path.c_str(), string("/usr/local/cuda")};
}

} // namespace tensorflow
#else
return {string("/usr/local/cuda")};
#endif
--
2.20.1
22 changes: 12 additions & 10 deletions tensorflow-base-cpu-osx/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "2.9.1" %}
{% set version = "2.10.0" %}
{% set major_minor = version.rsplit('.', 1)[0] %}

# This is the recipe for the "mkl" and "eigen" variants of tensorflow-base, but the MKL variant
Comment thread
sumit0190 marked this conversation as resolved.
Expand All @@ -10,7 +10,7 @@ package:
source:
fn: tensorflow-{{ version }}.tar.gz
url: https://github.com/tensorflow/tensorflow/archive/v{{ version }}.tar.gz
sha256: 6eaf86ead73e23988fe192da1db68f4d3828bcdd0f3a9dc195935e339c95dbdc
sha256: b5a1bb04c84b6fe1538377e5a1f649bb5d5f0b2e3625a3c526ff3a8af88633e8
patches:
- 0101-include-c-and-cc-headers.patch
- 0107-do-not-hardcode-ca-cert-location.patch
Expand Down Expand Up @@ -67,7 +67,7 @@ requirements:
- dill >=0.3.1.1
- giflib
- grpc-cpp
- flatbuffers 1.12.*
- flatbuffers 2.0
- icu
- jpeg
- libpng
Expand All @@ -78,9 +78,10 @@ requirements:
- snappy
- zlib
- abseil-cpp
- requests
- absl-py 0.11
- astunparse 1.6.3
- python-flatbuffers 1.12.*
- python-flatbuffers 2.0
- gast 0.4.0
- google-pasta 0.2
- grpcio
Expand Down Expand Up @@ -108,7 +109,7 @@ requirements:
- python
- absl-py >=0.10.0
- astunparse >=1.6.3
- python-flatbuffers 1.12.*
- python-flatbuffers >=2.0
- google-pasta >=0.2
- h5py >=3.1.0
- keras {{ major_minor }}.*
Expand All @@ -122,10 +123,11 @@ requirements:
- wrapt >=1.11.2
- grpcio
- packaging
- requests
# upstream wants exact pin for gast
- gast ==0.4.0
- scipy >=1.7.3,<2
- flatbuffers
- flatbuffers >=2.0
- llvm-openmp
- tensorboard {{ major_minor }}.*
- tensorflow-estimator {{ major_minor }}.*
Expand All @@ -142,17 +144,17 @@ test:
- toco_from_protos --help

about:
home: http://tensorflow.org/
license: Apache 2.0
home: https://tensorflow.org/
license: Apache-2.0
license_family: Apache
summary: TensorFlow is a machine learning library, base package contains only tensorflow.
description: |
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
doc_url: https://www.tensorflow.org/api_docs
doc_source_url: https://github.com/tensorflow/docs/

extra:
tflow_variant: {{ tflow_variant }}
4 changes: 2 additions & 2 deletions tensorflow-estimator/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "tensorflow-estimator" %}
{% set version = "2.9.0" %}
{% set version = "2.10.0" %}
{% set major_minor = version.rsplit('.', 1)[0] %}

package:
Expand All @@ -8,7 +8,7 @@ package:

source:
url: https://pypi.io/packages/py2.py3/t/tensorflow-estimator/tensorflow_estimator-{{ version }}-py2.py3-none-any.whl
sha256: e9762bb302f51bc1eb2f35d19f0190a6a2d809d754d5def788c4328fe3746744
sha256: f324ea17cd57f16e33bf188711d5077e6b2e5f5a12c328d6e01a07b23888edcd

build:
Comment thread
sumit0190 marked this conversation as resolved.
number: 0
Expand Down