Merge cpp_tests1 and cpp_tests2 into single shard (#9298)

Force merging as this PR removes some required checks.

Author: ghpvnist

.circleci/common.sh

@@ -202,7 +202,7 @@ function run_torch_xla_tests() {
   export PYTORCH_TESTING_DEVICE_ONLY_FOR="xla"
   export CXX_ABI=$(python -c "import torch;print(int(torch._C._GLIBCXX_USE_CXX11_ABI))")
 
-  if [[ -z "$RUN_BENCHMARK_TESTS" && -z "$RUN_CPP_TESTS1" && -z "$RUN_CPP_TESTS2" && -z "$RUN_PYTHON_TESTS" ]]; then
+  if [[ -z "$RUN_BENCHMARK_TESTS" && -z "$RUN_CPP_TESTS" && -z "$RUN_PYTHON_TESTS" ]]; then
     run_torch_xla_python_tests $PYTORCH_DIR $XLA_DIR $USE_COVERAGE
     run_torch_xla_cpp_tests $PYTORCH_DIR $XLA_DIR $USE_COVERAGE
     run_torch_xla_benchmark_tests $XLA_DIR

.github/scripts/run_tests.sh

@@ -40,14 +40,14 @@ function run_torch_xla_cpp_tests() {
   fi
   export XLA_EXPERIMENTAL="nonzero:masked_select:nms"
 
-  test_names1=("test_aten_xla_tensor_1"
+  test_names=("test_aten_xla_tensor_1"
                "test_aten_xla_tensor_2"
                "test_aten_xla_tensor_3"
                "test_aten_xla_tensor_4"
-               "pjrt_computation_client_test")
+               "pjrt_computation_client_test"
                # Disable IFRT test as it currently crashes
                #"ifrt_computation_client_test")
-  test_names2=("test_aten_xla_tensor_5"
+               "test_aten_xla_tensor_5"
                "test_aten_xla_tensor_6"
                "test_ir"
                "test_lazy"
@@ -56,14 +56,6 @@ function run_torch_xla_cpp_tests() {
                # disable test_xla_backend_intf since it is flaky on upstream
                #"test_xla_backend_intf"
                "test_xla_sharding")
-  if [[ "$RUN_CPP_TESTS1" == "cpp_tests1" ]]; then
-    test_names=("${test_names1[@]}")
-  elif [[ "$RUN_CPP_TESTS2" == "cpp_tests2" ]]; then
-    test_names=("${test_names2[@]}")
-  else
-    test_names=("${test_names1[@]}" "${test_names2[@]}")
-  fi
-
   for name in "${test_names[@]}"; do
     echo "Running $name cpp test..."
     /tmp/test/bin/${name}
@@ -95,7 +87,7 @@ fi
 export PYTORCH_TESTING_DEVICE_ONLY_FOR="xla"
 export CXX_ABI=$(python -c "import torch;print(int(torch._C._GLIBCXX_USE_CXX11_ABI))")
 
-if [[ -z "$RUN_BENCHMARK_TESTS" && -z "$RUN_CPP_TESTS1" && -z "$RUN_CPP_TESTS2" && -z "$RUN_PYTHON_TESTS" ]]; then
+if [[ -z "$RUN_BENCHMARK_TESTS" && -z "$RUN_CPP_TESTS" && -z "$RUN_PYTHON_TESTS" ]]; then
   run_torch_xla_python_tests $XLA_DIR $USE_COVERAGE
   run_torch_xla_cpp_tests $XLA_DIR $USE_COVERAGE
   run_torch_xla_benchmark_tests $XLA_DIR

.github/workflows/_test.yml

@@ -66,9 +66,6 @@ jobs:
           - run_python_tests: 'python_tests'
             run_torch_mp_op_tests: 'torch_mp_op'
           - run_cpp_tests: 'cpp_tests'
-            run_cpp_tests1: 'cpp_tests1'
-          - run_cpp_tests: 'cpp_tests'
-            run_cpp_tests2: 'cpp_tests2'
     timeout-minutes: ${{ inputs.timeout-minutes }}
     env:
       GCLOUD_SERVICE_KEY: ${{ secrets.gcloud-service-key }}
@@ -82,8 +79,7 @@ jobs:
       RUN_XLA_OP_TESTS4: ${{ matrix.run_xla_op_tests4 }}
       RUN_XLA_OP_TESTS5: ${{ matrix.run_xla_op_tests5 }}
       RUN_TORCH_MP_OP_TESTS: ${{ matrix.run_torch_mp_op_tests }}
-      RUN_CPP_TESTS1: ${{ matrix.run_cpp_tests1 }}
-      RUN_CPP_TESTS2: ${{ matrix.run_cpp_tests2 }}
+      RUN_CPP_TESTS: ${{ matrix.run_cpp_tests }}
       BAZEL_JOBS: ''  # Let bazel decide the parallelism based on the number of CPUs.
       BAZEL_REMOTE_CACHE: 1
     steps:
@@ -160,7 +156,7 @@ jobs:
           CIRCLE_BUILD_NUM: ${{ github.run_number }}
           BENCHMARK_TEST_NAME: ${{ env.RUN_BENCHMARK_TESTS }}
           PYTHON_TEST_NAME: ${{ env.RUN_PYTHON_TESTS }}${{ env.RUN_XLA_OP_TESTS1 }}${{ env.RUN_XLA_OP_TESTS2 }}${{ env.RUN_XLA_OP_TESTS3 }}${{ env.RUN_XLA_OP_TESTS4 }}${{ env.RUN_XLA_OP_TESTS5 }}${{ env.RUN_TORCH_MP_OP_TESTS }}
-          CPP_TEST_NAME: ${{ env.RUN_CPP_TESTS1 }}${{ env.RUN_CPP_TESTS2 }}
+          CPP_TEST_NAME: ${{ env.RUN_CPP_TESTS }}
         run: |
             # TODO(yeounoh) collect coverage report as needed.
             if [ -n "${BENCHMARK_TEST_NAME}" ]; then
@@ -187,7 +183,7 @@ jobs:
                 gsutil cp ${GITHUB_WORKSPACE}/htmlcov/cpp_lcov.info gs://ng3-metrics/ng3-pytorchxla-coverage/incremental/pytorchxla/${CIRCLE_WORKFLOW_ID}/cpu_cpp_coverage_${CPP_TEST_NAME}.out
               fi
 
-              if [ "${CPP_TEST_NAME}" == "cpp_tests1" ]; then
+              if [ "${CPP_TEST_NAME}" == "cpp_tests" ]; then
                 ABS_METADATA='{"host": "github", "project": "pytorchxla", "trace_type": "LCOV", "commit_id": '\"${GITHUB_SHA}\"', "ref": "HEAD", "source": "https://github.com/pytorch/xla", "owner": "cloud-tpu-pt-dev", "bug_component": "587012"}'
                 echo $ABS_METADATA > abs_metadata.json
                 gsutil cp abs_metadata.json gs://ng3-metrics/ng3-pytorchxla-coverage/absolute/pytorchxla/${CIRCLE_WORKFLOW_ID}/metadata.json

test/cpp/run_tests.sh

@@ -86,13 +86,12 @@ if [[ "$BAZEL_VERB" == "coverage" ]]; then
 fi
 
 test_names=("all")
-if [[ "$RUN_CPP_TESTS1" == "cpp_tests1" ]]; then
+if [[ "$RUN_CPP_TESTS" == "cpp_tests" ]]; then
   test_names=("test_aten_xla_tensor_1"
               "test_aten_xla_tensor_2"
               "test_aten_xla_tensor_3"
-              "test_aten_xla_tensor_4")
-elif [[ "$RUN_CPP_TESTS2" == "cpp_tests2" ]]; then
-  test_names=("test_aten_xla_tensor_5"
+              "test_aten_xla_tensor_4"
+              "test_aten_xla_tensor_5"
               "test_aten_xla_tensor_6"
               "test_ir"
               "test_lazy"