Skip to content

Commit 3ca3029

Browse files
committed
Merge branch 'master' into yimei/stb_conv_bts
2 parents f78dc25 + aa8f32e commit 3ca3029

File tree

9,746 files changed

+459787
-264676
lines changed

Some content is hidden

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

9,746 files changed

+459787
-264676
lines changed

.bazelrc

+190-77
Large diffs are not rendered by default.

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
6.1.0
1+
6.5.0
22
# NOTE: Update Bazel version in tensorflow/tools/ci_build/release/common.sh.oss

.github/workflows/arm-cd.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,10 @@ jobs:
3131
build:
3232
if: github.repository == 'tensorflow/tensorflow' # Don't do this in forks
3333
runs-on: [self-hosted, linux, ARM64]
34-
continue-on-error: ${{ matrix.experimental }}
3534
strategy:
3635
fail-fast: false
3736
matrix:
38-
pyver: ['3.9', '3.10']
39-
experimental: [false]
40-
include:
41-
- pyver: '3.11'
42-
experimental: true
37+
pyver: ['3.9', '3.10', '3.11', '3.12']
4338
steps:
4439
- name: Stop old running containers (if any)
4540
shell: bash
@@ -57,12 +52,12 @@ jobs:
5752
run: find /home/ubuntu/actions-runner/_work/tensorflow/tensorflow/. -name . -o -prune -exec sudo rm -rf -- {} + || true
5853
- name: Checkout repository for nightly (skipped for releases)
5954
if: ${{ github.event_name == 'schedule' }}
60-
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
55+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6156
with:
6257
ref: 'nightly'
6358
- name: Checkout repository for releases (skipped for nightly)
6459
if: ${{ github.event_name == 'push' }}
65-
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
60+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6661
- name: Build and test pip wheel
6762
shell: bash
6863
run: |

.github/workflows/arm-ci-extended-cpp.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ jobs:
5050
run: find /home/ubuntu/actions-runner/_work/tensorflow/tensorflow/. -name . -o -prune -exec sudo rm -rf -- {} + || true
5151
- name: Checkout repository for nightly (skipped for releases)
5252
if: ${{ github.event_name == 'schedule' }}
53-
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
53+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5454
with:
5555
ref: 'nightly'
5656
- name: Checkout repository
5757
if: ${{ github.event_name == 'push' }}
58-
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
58+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5959
- name: Build binary and run C++ tests
6060
shell: bash
6161
run: |

.github/workflows/arm-ci-extended.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
pyver: ['3.9', '3.10', '3.11']
35+
pyver: ['3.9', '3.10', '3.11', '3.12']
3636
steps:
3737
- name: Stop old running containers (if any)
3838
shell: bash
@@ -51,12 +51,12 @@ jobs:
5151
run: find /home/ubuntu/actions-runner/_work/tensorflow/tensorflow/. -name . -o -prune -exec sudo rm -rf -- {} + || true
5252
- name: Checkout repository for nightly (skipped for releases)
5353
if: ${{ github.event_name == 'schedule' }}
54-
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
54+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5555
with:
5656
ref: 'nightly'
5757
- name: Checkout repository
5858
if: ${{ github.event_name == 'push' }}
59-
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
59+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6060
- name: Build binary and run python tests on nightly for all python versions
6161
shell: bash
6262
run: |

.github/workflows/arm-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
shell: bash
4848
run: find /home/ubuntu/actions-runner/_work/tensorflow/tensorflow/. -name . -o -prune -exec sudo rm -rf -- {} + || true
4949
- name: Checkout repository
50-
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
50+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5151
- name: Build binary and run python tests
5252
shell: bash
5353
run: |

.github/workflows/osv-scanner-scheduled.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ permissions:
2828
jobs:
2929
scan-scheduled:
3030
if: github.repository == 'tensorflow/tensorflow'
31-
uses: "google/osv-scanner/.github/workflows/osv-scanner-reusable.yml@main"
31+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.6.2-beta1"
3232
with:
3333
scan-args: |-
3434
--lockfile=requirements.txt:./requirements_lock_3_9.txt

.github/workflows/update-rbe.yml

+15-3
Original file line numberDiff line numberDiff line change
@@ -106,24 +106,36 @@ jobs:
106106
map sigbuild-r2.14-clang-python3.10 2.14-python3.10
107107
map sigbuild-r2.14-clang-python3.11 2.14-python3.11
108108
# TF 2.16
109-
map sigbuild-r2.16 2.16-python3.9
109+
map sigbuild-r2.16 2.16-python3.11
110110
map sigbuild-r2.16-python3.9 2.16-python3.9
111111
map sigbuild-r2.16-python3.10 2.16-python3.10
112112
map sigbuild-r2.16-python3.11 2.16-python3.11
113113
map sigbuild-r2.16-python3.12 2.16-python3.12
114114
# TF 2.16 + Clang (containers are the same, but env vars in configs.bzl are different)
115-
map sigbuild-r2.16-clang 2.16-python3.9
115+
map sigbuild-r2.16-clang 2.16-python3.11
116116
map sigbuild-r2.16-clang-python3.9 2.16-python3.9
117117
map sigbuild-r2.16-clang-python3.10 2.16-python3.10
118118
map sigbuild-r2.16-clang-python3.11 2.16-python3.11
119119
map sigbuild-r2.16-clang-python3.12 2.16-python3.12
120+
# TF 2.17
121+
map sigbuild-r2.17 2.17-python3.11
122+
map sigbuild-r2.17-python3.9 2.17-python3.9
123+
map sigbuild-r2.17-python3.10 2.17-python3.10
124+
map sigbuild-r2.17-python3.11 2.17-python3.11
125+
map sigbuild-r2.17-python3.12 2.17-python3.12
126+
# TF 2.17 + Clang (containers are the same, but env vars in configs.bzl are different)
127+
map sigbuild-r2.17-clang 2.17-python3.11
128+
map sigbuild-r2.17-clang-python3.9 2.17-python3.9
129+
map sigbuild-r2.17-clang-python3.10 2.17-python3.10
130+
map sigbuild-r2.17-clang-python3.11 2.17-python3.11
131+
map sigbuild-r2.17-clang-python3.12 2.17-python3.12
120132
- name: Create Pull Request with changes
121133
uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
122134
with:
123135
title: Update the RBE images to the latest container versions
124136
committer: TensorFlow Release Automation <jenkins@tensorflow.org>
125137
token: ${{ secrets.JENKINS_TOKEN }}
126-
reviewers: angerson,mihaimaruseac,learning-to-play,nitins17
138+
reviewers: mihaimaruseac,learning-to-play,nitins17
127139
body: |
128140
This PR was created by a GitHub Actions workflow to update all the SIG Build-based RBE containers to the most recent containers. See:
129141

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
node_modules
44
/.bazelrc.user
55
/.tf_configure.bazelrc
6+
/xla_configure.bazelrc
67
/bazel-*
78
/bazel_pip
89
/tools/python_bin_path.sh

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Before sending your pull requests, make sure you do the following:
4444
- If a change is needed, the contributor is requested to make the suggested
4545
change.
4646
- You make the change and submit it for the review again.
47-
- This cycle repeats itself untill the PR gets approved.
47+
- This cycle repeats itself until the PR gets approved.
4848
- Note: As a friendly reminder, we may reach out to you if the PR is awaiting
4949
your response for more than 2 weeks.
5050

@@ -71,7 +71,7 @@ Before sending your pull requests, make sure you do the following:
7171

7272
In a graphical form, the entire lifetime of a PR looks like
7373

74-
![image](https://user-images.githubusercontent.com/323199/229561784-0a2f5509-b731-493f-ad88-bad487688c8d.png)
74+
![image](https://github.com/tensorflow/tensorflow/assets/52792999/3eea4ca5-daa0-4570-b0b5-2a2b03a724a3)
7575

7676
### Contributor License Agreements
7777

ISSUE_TEMPLATE.md

-47
This file was deleted.

0 commit comments

Comments
 (0)