Skip to content

Commit 987d4be

Browse files
Merge pull request #4 from tensorflow/master
Stay up to date
2 parents 95190c7 + 37ec018 commit 987d4be

File tree

2,214 files changed

+50502
-23020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,214 files changed

+50502
-23020
lines changed

.bazelrc

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ build --define framework_shared_object=true
103103
build --java_toolchain=@tf_toolchains//toolchains/java:tf_java_toolchain
104104
build --host_java_toolchain=@tf_toolchains//toolchains/java:tf_java_toolchain
105105

106-
# Do not enable the mlir generated GPU kernels by default.
107-
build --//tensorflow/core/kernels/mlir_generated:enable_gpu=false
108-
109106
build --define=use_fast_cpp_protos=true
110107
build --define=allow_oversize_protos=true
111108

@@ -218,7 +215,8 @@ build:mkl_threadpool --define=tensorflow_mkldnn_contraction_kernel=0
218215
build:mkl_threadpool --define=build_with_mkl_opensource=true
219216
build:mkl_threadpool -c opt
220217

221-
# Config setting to build with oneDNN for Arm.
218+
# Config setting to build oneDNN with Compute Library for the Arm Architecture (ACL).
219+
# This build is for the inference regime only.
222220
build:mkl_aarch64 --define=build_with_mkl_aarch64=true --define=enable_mkl=true
223221
build:mkl_aarch64 --define=tensorflow_mkldnn_contraction_kernel=0
224222
build:mkl_aarch64 --define=build_with_mkl_opensource=true
@@ -230,9 +228,6 @@ build:cuda --repo_env TF_NEED_CUDA=1
230228
build:cuda --crosstool_top=@local_config_cuda//crosstool:toolchain
231229
build:cuda --@local_config_cuda//:enable_cuda
232230

233-
# This option overrides the line above for cuda builds.
234-
build:cuda --//tensorflow/core/kernels/mlir_generated:enable_gpu=true
235-
236231
# This config refers to building CUDA op kernels with clang.
237232
build:cuda_clang --config=cuda
238233
build:cuda_clang --repo_env TF_CUDA_CLANG=1
@@ -340,7 +335,6 @@ build:windows --linkopt=/OPT:REF
340335
build:windows --host_linkopt=/OPT:REF
341336
build:windows --linkopt=/OPT:ICF
342337
build:windows --host_linkopt=/OPT:ICF
343-
build:windows --experimental_strict_action_env=true
344338

345339
# Verbose failure logs when something goes wrong
346340
build:windows --verbose_failures
@@ -404,7 +398,6 @@ build:rbe_linux --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
404398

405399
# Non-rbe settings we should include because we do not run configure
406400
build:rbe_linux --config=avx_linux
407-
build:rbe_linux --config=short_logs
408401
# TODO(gunan): Check why we need this specified in rbe, but not in other builds.
409402
build:rbe_linux --linkopt=-lrt
410403
build:rbe_linux --host_linkopt=-lrt
@@ -423,12 +416,12 @@ build:rbe_cpu_linux --platforms="@ubuntu16.04-manylinux2010-py3_config_platform/
423416
build:rbe_linux_cuda_base --config=rbe_linux
424417
build:rbe_linux_cuda_base --config=cuda
425418
build:rbe_linux_cuda_base --config=tensorrt
419+
build:rbe_linux_cuda_base --action_env=TF_CUDA_VERSION=11
420+
build:rbe_linux_cuda_base --action_env=TF_CUDNN_VERSION=8
426421
build:rbe_linux_cuda_base --repo_env=REMOTE_GPU_TESTING=1
427422
test:rbe_linux_cuda_base --test_env=LD_LIBRARY_PATH="/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64"
428423

429424
build:rbe_linux_cuda11.2_nvcc_base --config=rbe_linux_cuda_base
430-
build:rbe_linux_cuda11.2_nvcc_base --action_env=TF_CUDA_VERSION=11
431-
build:rbe_linux_cuda11.2_nvcc_base --action_env=TF_CUDNN_VERSION=8
432425
build:rbe_linux_cuda11.2_nvcc_base --host_crosstool_top="@ubuntu18.04-gcc7_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_cuda//crosstool:toolchain"
433426
build:rbe_linux_cuda11.2_nvcc_base --crosstool_top="@ubuntu18.04-gcc7_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_cuda//crosstool:toolchain"
434427
build:rbe_linux_cuda11.2_nvcc_base --extra_toolchains="@ubuntu18.04-gcc7_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_cuda//crosstool:toolchain-linux-x86_64"
@@ -454,8 +447,8 @@ build:rbe_linux_cuda_nvcc --config=rbe_linux_cuda_nvcc_py36
454447
build:rbe_gpu_linux --config=rbe_linux_cuda_nvcc
455448

456449
build:rbe_linux_cuda_clang_base --config=rbe_linux_cuda_base
457-
build:rbe_linux_cuda_clang_base --action_env=TF_CUDA_VERSION=11
458-
build:rbe_linux_cuda_clang_base --action_env=TF_CUDNN_VERSION=8
450+
build:rbe_linux_cuda_clang_base --repo_env TF_CUDA_CLANG=1
451+
build:rbe_linux_cuda_clang_base --@local_config_cuda//:cuda_compiler=clang
459452
build:rbe_linux_cuda_clang_base --crosstool_top="@ubuntu18.04-clang_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_cuda//crosstool:toolchain"
460453
build:rbe_linux_cuda_clang_base --extra_toolchains="@ubuntu18.04-clang_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_cuda//crosstool:toolchain-linux-x86_64"
461454
build:rbe_linux_cuda_clang_base --extra_execution_platforms="@ubuntu18.04-clang_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_platform//:platform"
@@ -464,7 +457,6 @@ build:rbe_linux_cuda_clang_base --platforms="@ubuntu18.04-clang_manylinux2010-cu
464457
build:rbe_linux_cuda_clang_base --repo_env=TF_CUDA_CONFIG_REPO="@ubuntu18.04-clang_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_cuda"
465458
build:rbe_linux_cuda_clang_base --repo_env=TF_TENSORRT_CONFIG_REPO="@ubuntu18.04-clang_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_tensorrt"
466459
build:rbe_linux_cuda_clang_base --repo_env=TF_NCCL_CONFIG_REPO="@ubuntu18.04-clang_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_nccl"
467-
build:rbe_linux_cuda_clang_base --define=using_cuda_clang=true
468460
build:rbe_linux_cuda_clang_py27 --config=rbe_linux_cuda_clang_base --repo_env=TF_PYTHON_CONFIG_REPO="@ubuntu18.04-clang_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_python2.7"
469461
build:rbe_linux_cuda_clang_py35 --config=rbe_linux_cuda_clang_base --repo_env=TF_PYTHON_CONFIG_REPO="@ubuntu18.04-clang_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_python3.5"
470462
build:rbe_linux_cuda_clang_py36 --config=rbe_linux_cuda_clang_base --repo_env=TF_PYTHON_CONFIG_REPO="@ubuntu18.04-clang_manylinux2010-cuda11.2-cudnn8.1-tensorrt7.2_config_python3.6"
@@ -506,6 +498,7 @@ build:rbe_win --extra_execution_platforms="@org_tensorflow//third_party/toolchai
506498
build:rbe_win --host_platform="@org_tensorflow//third_party/toolchains/preconfig/win:rbe_windows_ltsc2019"
507499
build:rbe_win --platforms="@org_tensorflow//third_party/toolchains/preconfig/win:rbe_windows_ltsc2019"
508500
build:rbe_win --shell_executable=C:\\tools\\msys64\\usr\\bin\\bash.exe
501+
build:rbe_win --experimental_strict_action_env=true
509502

510503
# TODO(gunan): Remove once we use MSVC 2019 with latest patches.
511504
build:rbe_win --define=override_eigen_strong_inline=true
@@ -525,8 +518,6 @@ build:rbe_win_py38 --python_path=C:\\Python38\\python.exe
525518
build:tensorflow_testing_rbe --project_id=tensorflow-testing
526519
common:tensorflow_testing_rbe_linux --remote_instance_name=projects/tensorflow-testing/instances/default_instance
527520
build:tensorflow_testing_rbe_linux --config=tensorflow_testing_rbe
528-
build:tensorflow_testing_rbe_linux --config=rbe
529-
build:tensorflow_testing_rbe_linux --config=rbe_linux
530521

531522
common:tensorflow_testing_rbe_win --remote_instance_name=projects/tensorflow-testing/instances/windows
532523
build:tensorflow_testing_rbe_win --config=tensorflow_testing_rbe

.github/bot_config.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
# A list of assignees
1717
assignees:
18-
- amahendrakar
19-
- ravikyram
20-
- Saduf2019
18+
- tilakrayal
19+
- usharanipagadala
20+
- saikumarchalla
2121
# A list of assignees for compiler folder
2222
compiler_assignees:
2323
- joker-eph
@@ -67,7 +67,11 @@ cuda_comment: >
6767
6868
| :-------------: | :-------------: |
6969
70-
| 2.1.0 - 2.2.0 | 10.1 |
70+
| 2.5.0 | 11.2 |
71+
72+
| 2.4.0 | 11.0 |
73+
74+
| 2.1.0 - 2.3.0 | 10.1 |
7175
7276
| 1.13.1 - 2.0 | 10.0 |
7377

CONTRIBUTING.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
## Pull Request Checklist
44

5-
Before sending your pull requests, make sure you followed this list.
5+
Before sending your pull requests, make sure you do the following:
66

7-
- Read [contributing guidelines](CONTRIBUTING.md).
8-
- Read [Code of Conduct](CODE_OF_CONDUCT.md).
9-
- Ensure you have signed the [Contributor License Agreement (CLA)](https://cla.developers.google.com/).
10-
- Check if my changes are consistent with the [guidelines](https://github.com/tensorflow/tensorflow/blob/master/CONTRIBUTING.md#general-guidelines-and-philosophy-for-contribution).
11-
- Changes are consistent with the [Coding Style](https://github.com/tensorflow/tensorflow/blob/master/CONTRIBUTING.md#c-coding-style).
12-
- Run [Unit Tests](https://github.com/tensorflow/tensorflow/blob/master/CONTRIBUTING.md#running-unit-tests).
7+
- Read the [contributing guidelines](CONTRIBUTING.md).
8+
- Read the [Code of Conduct](CODE_OF_CONDUCT.md).
9+
- Ensure you have signed the
10+
[Contributor License Agreement (CLA)](https://cla.developers.google.com/).
11+
- Check if your changes are consistent with the
12+
[guidelines](#general-guidelines-and-philosophy-for-contribution).
13+
- Changes are consistent with the [Coding Style](#c-coding-style).
14+
- Run the [unit tests](#running-unit-tests).
1315

1416
## How to become a contributor and submit your own code
1517

@@ -74,7 +76,8 @@ TensorFlow coding style.
7476
[tensorflow/python](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/python).
7577
TensorFlow has passed version 1.0 and hence cannot make
7678
non-backward-compatible API changes without a major release. Reviewers of
77-
your pull request will comment on any API compatibility issues.
79+
your pull request will comment on any API compatibility issues
80+
[following API review practices](https://github.com/tensorflow/community/blob/master/governance/api-reviews.md).
7881
* When you contribute a new feature to TensorFlow, the maintenance burden is
7982
(by default) transferred to the TensorFlow team. This means that the benefit
8083
of the contribution must be compared against the cost of maintaining the

LICENSE

Lines changed: 83 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Copyright 2019 The TensorFlow Authors. All rights reserved.
2-
31
Apache License
42
Version 2.0, January 2004
53
http://www.apache.org/licenses/
@@ -201,3 +199,86 @@ Copyright 2019 The TensorFlow Authors. All rights reserved.
201199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
202200
See the License for the specific language governing permissions and
203201
limitations under the License.
202+
203+
------------------
204+
Files: third_party/compute_library/...
205+
206+
MIT License
207+
208+
Permission is hereby granted, free of charge, to any person obtaining a copy
209+
of this software and associated documentation files (the "Software"), to deal
210+
in the Software without restriction, including without limitation the rights
211+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
212+
copies of the Software, and to permit persons to whom the Software is
213+
furnished to do so, subject to the following conditions:
214+
215+
The above copyright notice and this permission notice shall be included in all
216+
copies or substantial portions of the Software.
217+
218+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
219+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
220+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
221+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
222+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
223+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
224+
SOFTWARE.
225+
226+
------------------
227+
Files: ACKNOWLEDGEMENTS
228+
LICENSE
229+
230+
Redistribution and use in source and binary forms, with or without
231+
modification, are permitted provided that the following conditions are met:
232+
233+
1. Redistributions of source code must retain the above copyright notice, this
234+
list of conditions and the following disclaimer.
235+
236+
2. Redistributions in binary form must reproduce the above copyright notice,
237+
this list of conditions and the following disclaimer in the documentation
238+
and/or other materials provided with the distribution.
239+
240+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
241+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
242+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
243+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
244+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
245+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
246+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
247+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
248+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
249+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
250+
251+
------------------
252+
Files: third_party/hexagon
253+
254+
Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
255+
256+
Redistribution and use in source and binary forms, with or without
257+
modification, are permitted (subject to the limitations in the
258+
disclaimer below) provided that the following conditions are met:
259+
260+
* Redistributions of source code must retain the above copyright
261+
notice, this list of conditions and the following disclaimer.
262+
263+
* Redistributions in binary form must reproduce the above
264+
copyright notice, this list of conditions and the following
265+
disclaimer in the documentation and/or other materials provided
266+
with the distribution.
267+
268+
* Neither the name of The Linux Foundation nor the names of its
269+
contributors may be used to endorse or promote products derived
270+
from this software without specific prior written permission.
271+
272+
NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
273+
GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
274+
HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
275+
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
276+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
277+
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
278+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
279+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
280+
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
281+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
282+
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
283+
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
284+
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)