Merge branch 'master' into gaurides/mkl_remapper_test

.bazelignore

@@ -0,0 +1,17 @@
+# Copyright 2023 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+# The requirements updater has its own WORKSPACE file
+ci/official/requirements_updater

.bazelversion

@@ -1,2 +1,2 @@
-5.3.0
+6.1.0
 # NOTE: Update Bazel version in tensorflow/tools/ci_build/release/common.sh.oss

.github/ISSUE_TEMPLATE/tensorflow_issue_template.yaml

@@ -1,10 +1,10 @@
-name: Tensorflow Issue Template
-description: Please report security related issue using [Google Bug Hunters reporting form](https://bughunters.google.com/). To report any other TensorFlow related issue please use this template.
+name: TensorFlow Issue Template
+description: Use this template to report TensorFlow-related issues
 body:
   - type: dropdown
     id: issue-type
     attributes:
-      label: Issue Type
+      label: Issue type
       description: What type of issue would you like to report?
       multiple: false
       options:
@@ -21,48 +21,46 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please make sure that this is a bug. As per our [GitHub Policy](https://github.com/tensorflow/tensorflow/blob/master/ISSUES.md),we only address code/doc bugs, performance issues, feature requests and build/installation issues on GitHub.
+        Please make sure that this is a bug. As per our [GitHub Policy](https://github.com/tensorflow/tensorflow/blob/master/ISSUES.md), we only address code/doc bugs, performance issues, feature requests and build/installation issues on GitHub.
 
   - type: dropdown
     id: tf-nightly
     attributes:
-      label: Have you reproduced the bug with TF nightly?
-      description: It is strongly suggested that you have reproduced the bug with [TF nightly](https://www.tensorflow.org/install/pip#nightly)
+      label: Have you reproduced the bug with TensorFlow Nightly?
+      description: It is strongly suggested that you reproduce the bug with [TensorFlow Nightly](https://www.tensorflow.org/install/pip#nightly)
       options:
         - "Yes"
         - "No"
     validations:
       required: true
-          
+
   - type: markdown
     attributes:
-      value: | 
-        You can collect some of this information using our environment capture [script](https://github.com/tensorflow/tensorflow/tree/master/tools/tf_env_collect.sh)  You can also obtain the TensorFlow version with: <br> 1. TF 1.0: `python -c "import tensorflow as tf; print(tf.GIT_VERSION, tf.VERSION)"` <br>2. TF 2.0: `python -c "import tensorflow as tf; print(tf.version.GIT_VERSION, tf.version.VERSION)"`
+      value: |
+        You can collect some of this information using our [environment capture script](https://github.com/tensorflow/tensorflow/tree/master/tools/tf_env_collect.sh). You can also obtain the TensorFlow version with the following: <br> 1. TensorFlow 1.0: `python -c "import tensorflow as tf; print(tf.GIT_VERSION, tf.VERSION)"` <br>2. TensorFlow 2.0: `python -c "import tensorflow as tf; print(tf.version.GIT_VERSION, tf.version.VERSION)"`
 
   - type: dropdown
     id: source
     attributes:
       label: Source
-      description: Tensorflow installed from
+      description: TensorFlow installed from
       options:
         - source
         - binary
     validations:
       required: true
-      
+
   - type: input
     id: tfversion
     attributes:
-      label: Tensorflow Version
-      description: 
-      placeholder: ex,. tf 2.8
+      label: TensorFlow version
+      placeholder: e.g., tf 2.8
     validations:
       required: true
   - type: dropdown
     id: Code
     attributes:
-      label: Custom Code
-      description: 
+      label: Custom code
       options:
         - "Yes"
         - "No"
@@ -71,75 +69,52 @@ body:
   - type: input
     id: OS
     attributes:
-      label: OS Platform and Distribution
-      description: 
+      label: OS platform and distribution
       placeholder: e.g., Linux Ubuntu 16.04
-    validations:
-      required: false
   - type: input
     id: Mobile
     attributes:
       label: Mobile device
-      description: 
       placeholder: e.g., Linux Ubuntu 16.04
-    validations:
-      required: false
   - type: input
     id: Python
     attributes:
       label: Python version
-      description: 
       placeholder: e.g., 3.9
-    validations:
-      required: false
   - type: input
     id: Bazel
     attributes:
       label: Bazel version
-      description: if compiling from source
-      placeholder: 
-    validations:
-      required: false
+      description: If compiling from source
   - type: input
     id: Compiler
     attributes:
-      label: GCC/Compiler version
-      description: if compiling from source
-      placeholder: 
-    validations:
-      required: false
+      label: GCC/compiler version
+      description: If compiling from source
   - type: input
     id: Cuda
     attributes:
       label: CUDA/cuDNN version
-      description:
-      placeholder: 
-    validations:
-      required: false
   - type: input
     id: Gpu
     attributes:
       label: GPU model and memory
-      description: if compiling from source
-      placeholder: 
-    validations:
-      required: false
+      description: If compiling from source
   - type: textarea
     id: what-happened
     attributes:
-      label: Current Behaviour?
+      label: Current behavior?
       description: Also tell us, what did you expect to happen?
       placeholder: Tell us what you see!
-      value: "A bug happened!"
     validations:
       required: true
   - type: textarea
     id: code-to-reproduce
     attributes:
       label: Standalone code to reproduce the issue
-      description: Provide a reproducible test case that is the bare minimum necessary to generate the problem. If possible, please share a link to Colab/Jupyter/any notebook.
+      description: Provide a reproducible test case that is the bare minimum necessary to generate the problem. Please share a link to Colab, Jupyter, or any notebook.
       placeholder: Tell us what you see!
-      value: 
+      value:
       render: shell
     validations:
       required: true

.github/bot_config.yml

@@ -15,9 +15,10 @@
 
 # A list of assignees
 assignees:
-   - synandi
+   - sushreebarsa
    - SuryanarayanaY
    - tilakrayal
+   - Venkat6871
 # A list of assignees for compiler folder
 compiler_assignees:
    - joker-eph

.github/workflows/arm-cd.yml

@@ -19,17 +19,23 @@ on:
   push:
     tags:
       - v2.**
+    branches:
+      - r2.**
   schedule:
     - cron: '0 8 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   build:
     if: github.repository == 'tensorflow/tensorflow' # Don't do this in forks
     runs-on: [self-hosted, linux, ARM64]
     continue-on-error: ${{ matrix.experimental }}
     strategy:
+      fail-fast: false
       matrix:
-        pyver: ['3.8', '3.9', '3.10']
+        pyver: ['3.9', '3.10']
         experimental: [false]
         include:
           - pyver: '3.11'
@@ -63,7 +69,8 @@ jobs:
           is_nightly=0 && tf_project_name='tensorflow_cpu_aws' && ${{ github.event_name == 'schedule' }} && is_nightly=1 && tf_project_name='tf_nightly_cpu_aws'
           echo "PyPI project name:" $tf_project_name
           CI_DOCKER_BUILD_EXTRA_PARAMS="--build-arg py_major_minor_version=${{ matrix.pyver }} --build-arg is_nightly=${is_nightly} --build-arg tf_project_name=${tf_project_name}" \
-          ./tensorflow/tools/ci_build/ci_build.sh cpu.arm64 bash tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_pip.sh
+          ./tensorflow/tools/ci_build/ci_build.sh cpu.arm64 bash tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_test_build.sh
       - name: Upload pip wheel to PyPI
+        if: github.event_name == 'schedule' || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v2')) # only if it is a scheduled nightly or tagged
         shell: bash
         run: python3 -m twine upload --verbose /home/ubuntu/actions-runner/_work/tensorflow/tensorflow/whl/* -u "__token__" -p ${{ secrets.AWS_PYPI_ACCOUNT_TOKEN }}

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

@@ -22,6 +22,9 @@ on:
   schedule:
     - cron: '0 2 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   build:
     if: github.repository == 'tensorflow/tensorflow' # Don't do this in forks
@@ -58,4 +61,4 @@ jobs:
         run: |
           is_nightly=0 && tf_project_name='tf_ci_ext_c' && ${{ github.event_name == 'schedule' }} && is_nightly=1 && tf_project_name='tf_nightly_ci_ext_c'
           CI_DOCKER_BUILD_EXTRA_PARAMS="--build-arg py_major_minor_version=${{ matrix.pyver }} --build-arg is_nightly=${is_nightly} --build-arg tf_project_name=${tf_project_name}" \
-          ./tensorflow/tools/ci_build/ci_build.sh cpu.arm64 bash tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_cpp.sh
+          ./tensorflow/tools/ci_build/ci_build.sh cpu.arm64 bash tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_test_cpp.sh

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

@@ -22,13 +22,17 @@ on:
   schedule:
     - cron: '0 4 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   build:
     if: github.repository == 'tensorflow/tensorflow' # Don't do this in forks
     runs-on: [self-hosted, linux, ARM64]
     strategy:
+      fail-fast: false
       matrix:
-        pyver: ['3.8', '3.9', '3.10', '3.11']
+        pyver: ['3.9', '3.10', '3.11']
     steps:
       - name: Stop old running containers (if any)
         shell: bash
@@ -53,9 +57,9 @@ jobs:
       - name: Checkout repository
         if: ${{ github.event_name == 'push' }}
         uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
-      - name: Build binary and run non-pip tests
+      - name: Build binary and run python tests on nightly for all python versions
         shell: bash
         run: |
           is_nightly=0 && tf_project_name='tf_ci_ext' && ${{ github.event_name == 'schedule' }} && is_nightly=1 && tf_project_name='tf_nightly_ci_ext'
           CI_DOCKER_BUILD_EXTRA_PARAMS="--build-arg py_major_minor_version=${{ matrix.pyver }} --build-arg is_nightly=${is_nightly} --build-arg tf_project_name=${tf_project_name}" \
-          ./tensorflow/tools/ci_build/ci_build.sh cpu.arm64 bash tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_nonpip.sh
+          ./tensorflow/tools/ci_build/ci_build.sh cpu.arm64 bash tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_test.sh

.github/workflows/arm-ci.yml

@@ -26,6 +26,9 @@ on:
       - master
       - r2.**
 
+permissions:
+  contents: read
+
 jobs:
   build:
     # Don't do this in forks, and if labeled, only for 'kokoro:force-run'
@@ -51,13 +54,8 @@ jobs:
         run: find /home/ubuntu/actions-runner/_work/tensorflow/tensorflow/. -name . -o -prune -exec sudo rm -rf -- {} + || true
       - name: Checkout repository
         uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
-      - name: Build and test pip wheel
+      - name: Build binary and run python tests
         shell: bash
         run: |
-          CI_DOCKER_BUILD_EXTRA_PARAMS="--build-arg py_major_minor_version=${{ matrix.pyver }} --build-arg is_nightly=1 --build-arg tf_project_name=tf_nightly_ci" \
-          ./tensorflow/tools/ci_build/ci_build.sh cpu.arm64 bash tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_pip.sh
-      - name: Upload pip wheel to GitHub
-        uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
-        with:
-          name: tensorflow_py${{ matrix.pyver }}_wheel
-          path: /home/ubuntu/actions-runner/_work/tensorflow/tensorflow/whl/*.whl
+          CI_DOCKER_BUILD_EXTRA_PARAMS="--pull --build-arg py_major_minor_version=${{ matrix.pyver }} --build-arg is_nightly=1 --build-arg tf_project_name=tf_nightly_ci" \
+          ./tensorflow/tools/ci_build/ci_build.sh cpu.arm64 bash tensorflow/tools/ci_build/rel/ubuntu/cpu_arm64_test.sh

.github/workflows/cffconvert.yml

@@ -20,6 +20,9 @@ on:
     paths:
       - CITATION.cff
 
+permissions:
+  contents: read
+
 jobs:
   validate:
     if: github.repository == 'tensorflow/tensorflow' # Don't do this in forks

.github/workflows/issue-on-pr-rollback.yml

@@ -18,10 +18,16 @@ on:
   push:
     branches:
       - master
+
+permissions: {}
 
 jobs:
   create-issue-on-pr-rollback:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: read
     if: |
       github.repository == 'tensorflow/tensorflow' &&
       startsWith(github.event.head_commit.message, 'Rollback of PR #')

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

@@ -0,0 +1,39 @@
+# Copyright 2023 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+name: OSV-Scanner Scheduled Scan
+
+on:
+  schedule:
+    - cron: 0 4 * * 1
+
+permissions:
+  # Require writing security events to upload SARIF file to security tab
+  security-events: write
+  # Only need to read contents
+  contents: read
+
+jobs:
+  scan-scheduled:
+    uses: "google/osv-scanner/.github/workflows/osv-scanner-reusable.yml@main"
+    with:
+      scan-args: |-
+        --lockfile=requirements.txt:./requirements_lock_3_9.txt
+        --lockfile=requirements.txt:./requirements_lock_3_10.txt
+        --lockfile=requirements.txt:./requirements_lock_3_11.txt
+        --lockfile=requirements.txt:./requirements_lock_3_12.txt
+        --lockfile=requirements.txt:./ci/official/containers/linux_arm64/devel.requirements.txt
+        --lockfile=requirements.txt:./ci/official/containers/linux_arm64/jax.requirements.txt
+        --lockfile=requirements.txt:./ci/official/containers/linux_arm64/devel.usertools/test.requirements.txt

.github/workflows/pylint-presubmit.yml

@@ -19,6 +19,9 @@ on:
     paths:
       - '**.py'
 
+permissions:
+  contents: read
+
 jobs:
   build:
     name: PyLint

.github/workflows/release-branch-cherrypick.yml

@@ -35,6 +35,9 @@ on:
         required: true
         type: string
 
+permissions:
+  contents: read
+
 jobs:
   cherrypick:
     name: Cherrypick to ${{ github.event.inputs.release_branch}} - ${{ github.event.inputs.git_commit }}