Merge remote-tracking branch 'origin/main' into hjhee/aminmax

.github/ci_commit_pins/torchbench.txt

@@ -0,0 +1 @@
+bb5294090a397b15fadf10cd2172f9bd9c461f9a

.github/ci_expected_accuracy/check_expected.py

@@ -48,19 +48,19 @@
         passed_models.append([model_name, test_accuracy])
         if refer_accuracy == "N/A":
             new_models.append([model_name, test_accuracy])
-            refer_data.loc[refer_data.tail(1).index.tolist()[0] + 1,:] = "N/A"
-            refer_data.at[refer_data.tail(1).index, "name"] = model_name
-            refer_data.at[refer_data.tail(1).index, args.dtype] = test_accuracy
+            refer_data.loc[len(refer_data),:] = "N/A"
+            refer_data.at[len(refer_data) - 1, "name"] = model_name
+            refer_data.at[len(refer_data) - 1, args.dtype] = test_accuracy
         elif 'pass' not in refer_accuracy:
             new_pass_models.append([model_name, test_accuracy])
             refer_data.at[refer_row[0], args.dtype] = test_accuracy
     else:
         if refer_accuracy == "N/A":
             new_models.append([model_name, test_accuracy])
             real_failed_models.append([model_name, test_accuracy])
-            refer_data.loc[refer_data.tail(1).index.tolist()[0] + 1,:] = "N/A"
-            refer_data.at[refer_data.tail(1).index, "name"] = model_name
-            refer_data.at[refer_data.tail(1).index, args.dtype] = test_accuracy
+            refer_data.loc[len(refer_data),:] = "N/A"
+            refer_data.at[len(refer_data) - 1, "name"] = model_name
+            refer_data.at[len(refer_data) - 1, args.dtype] = test_accuracy
         elif "pass" in refer_accuracy:
             real_failed_models.append([model_name, test_accuracy])
         else:
@@ -80,7 +80,7 @@
 print("Pass rate: {:.2f}%".format(len(passed_models) / len(model_names) * 100))
 
 if len(new_pass_models + new_models) > 0:
-    print("NOTE: New models result, please update the reference", new_pass_models)
+    print("NOTE: New models result, please update the reference", new_pass_models, new_models)
     if args.update:
         refer_data.to_csv(refer_file, sep=',', encoding='utf-8', index=False)
         print("Updated. Now, confirm the changes to .csvs and `git add` them if satisfied.")

.github/scripts/apply_torch_pr.py

@@ -25,7 +25,7 @@
 
 # check reverted PR is in current code base or not
 def check_reverted_reopen(pr_info):
-    git_cmd = "git log nightly -n 1 2>&1 |grep 'nightly release' |head -1 |sed 's/.*(//;s/).*//' || git rev-parse HEAD"
+    git_cmd = "((git log -n 1 2>&1 |grep 'nightly release' |head -1 |sed 's/.*(//;s/).*//' || true) && git rev-parse HEAD) |head -n 1"
     git_info = subprocess.Popen(git_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
     main_commit = git_info.communicate()[0].decode("utf-8").replace("\n", "")
     revert_cmd = "cur_cmt=$(git rev-parse HEAD) && git fetch origin main > /dev/null 2>&1 && " + \
@@ -40,6 +40,39 @@ def check_reverted_reopen(pr_info):
         reverted = False
     return reverted
 
+def check_merged(pr_info):
+    git_cmd = "((git log -n 1 2>&1 |grep 'nightly release' |head -1 |sed 's/.*(//;s/).*//' || true) && git rev-parse HEAD) |head -n 1"
+    git_info = subprocess.Popen(git_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
+    main_commit = git_info.communicate()[0].decode("utf-8").replace("\n", "")
+    merge_cmd = "cur_cmt=$(git rev-parse HEAD) && git fetch origin main > /dev/null 2>&1 && " + \
+                 "git checkout " + main_commit + " > /dev/null 2>&1 && " + \
+                 "git log |grep 'resolved: " + pr_info["html_url"] + "' || true && " + \
+                 "git checkout $cur_cmt > /dev/null 2>&1"
+    merge_info = subprocess.Popen(merge_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
+    merge_msg = merge_info.communicate()[0].decode("utf-8")
+    if "resolved: " + pr_info["html_url"] in merge_msg:
+        merged = True
+    else:
+        merged = False
+    return merged
+
+def appyly_pr(pr_info, re_apply_msg):
+    # get pr diff
+    pr_file = pr_info["diff_url"].split("/")[-1]
+    urllib.request.urlretrieve(pr_info["diff_url"], pr_file)
+    # apply diff
+    apply_cmd = "git apply --3way " + pr_file + " && rm -f " + pr_file
+    apply_info = subprocess.Popen(apply_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
+    apply_message = apply_info.communicate()[0].decode("utf-8")
+    apply_status = apply_info.returncode
+    # apply status
+    if apply_status == 0:
+        print("{} {}, applied got SUCCESSFUL".format(pr_info["diff_url"], re_apply_msg))
+    else:
+        print("{} {}, applied got FAILED".format(pr_info["diff_url"], apply_message))
+        print(apply_status, apply_message)
+        exit(1)
+
 
 # headers = {'Authorization': 'Bearer ' + args.token} if args.token != None else args.token
 pr_list = args.pr_list + args.extra_pr_list
@@ -53,32 +86,25 @@ def check_reverted_reopen(pr_info):
     if pr_info["state"].lower() == "open":
         # for reverted PR
         reverted_id = next((item["id"] for item in pr_info["labels"] if item["name"] == "Reverted"), -1)
-        re_apply_msg = ""
+        re_apply_msg = "is opened"
         if reverted_id != -1:
             reverted = check_reverted_reopen(pr_info)
             # skip if PR not reverted but re-open in current code base
             if not reverted:
                 print("{} is re-open but not reverted, no need to apply".format(pr_info["diff_url"]))
                 continue
             else:
-                re_apply_msg = "is re-opened & reverted,"
-        # get pr diff
-        pr_file = pr_info["diff_url"].split("/")[-1]
-        urllib.request.urlretrieve(pr_info["diff_url"], pr_file)
-        # apply diff
-        apply_cmd = "git apply --3way " + pr_file + " && rm -f " + pr_file
-        apply_info = subprocess.Popen(apply_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-        apply_message = apply_info.communicate()[0].decode("utf-8")
-        apply_status = apply_info.returncode
-        # apply status
-        if apply_status == 0:
-            print("{} {} applied got SUCCESSFUL".format(pr_info["diff_url"], re_apply_msg))
-        else:
-            print("{} applied got FAILED".format(pr_info["diff_url"]))
-            print(apply_status, apply_message)
-            exit(1)
+                re_apply_msg = "is re-opened and reverted,"
+        appyly_pr(pr_info, re_apply_msg)
     elif pr_info["state"].lower() == "closed":
-        print("{} is ClOSED, no need to apply".format(pr_info["diff_url"]))
+        merged_id = next((item["id"] for item in pr_info["labels"] if item["name"] == "Merged"), -1)
+        re_apply_msg = "is closed but not merged"
+        if merged_id != -1:
+            merged = check_merged(pr_info)
+            if merged:
+                print("{} is closed and merged, no need to apply".format(pr_info["diff_url"]))
+                continue
+        appyly_pr(pr_info, re_apply_msg)
     else:
         print("{} is {}, no need to apply".format(pr_info["diff_url"], pr_info["state"]))
         exit(1)

.github/workflows/_linux_ut.yml

@@ -68,7 +68,7 @@ jobs:
           export USE_XPU=1
           source /opt/intel/oneapi/pytorch-gpu-dev-0.5/oneapi-vars.sh
           export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"}
-          python setup.py bdist_wheel
+          WERROR=1 python setup.py bdist_wheel
           pip install --force-reinstall dist/*.whl
           git clone https://github.com/pytorch/vision && cd vision && python setup.py install && cd ..
           pip install -r .ci/docker/requirements-ci.txt

.github/workflows/nightly_ondemand.yml

@@ -17,10 +17,10 @@ on:
         default: 'false'
         description: Keep torch-xpu-ops pin. `true` means use pined commit
       ut:
-        required: true
+        required: false
         type: string
         default: 'torch_xpu'
-        description: UT scope. `op_example,op_extended,op_ut,torch_xpu` Delimiter is comma
+        description: UT scope. `op_example,op_extended,op_ut,torch_xpu`. Delimiter is comma
       triton:
         required: false
         type: string
@@ -141,7 +141,6 @@ jobs:
           echo "TORCHBENCH_COMMIT_ID=$(<third_party/torch-xpu-ops/.github/ci_commit_pins/torchbench.txt)" |tee -a "${GITHUB_OUTPUT}" >> "${GITHUB_ENV}"
           echo "TORCHVISION_COMMIT_ID=$(<.github/ci_commit_pins/vision.txt)" |tee -a "${GITHUB_OUTPUT}" >> "${GITHUB_ENV}"
           echo "TORCHAUDIO_COMMIT_ID=$(<.github/ci_commit_pins/audio.txt)" |tee -a "${GITHUB_OUTPUT}" >> "${GITHUB_ENV}"
-          # echo "TORCHTEXT_COMMIT_ID=$(<.github/ci_commit_pins/text.txt)" |tee -a "${GITHUB_OUTPUT}" >> "${GITHUB_ENV}"
           echo "TRANSFORMERS_VERSION=$(<.ci/docker/ci_commit_pins/huggingface.txt)" |tee -a "${GITHUB_OUTPUT}" >> "${GITHUB_ENV}"
           echo "TIMM_COMMIT_ID=$(<.ci/docker/ci_commit_pins/timm.txt)" |tee -a "${GITHUB_OUTPUT}" >> "${GITHUB_ENV}"
           echo "MODEL_ONLY_NAME=${{ inputs.model }}" |tee -a "${GITHUB_OUTPUT}" >> "${GITHUB_ENV}"
@@ -257,7 +256,6 @@ jobs:
           TORCHBENCH_COMMIT_ID="${{ needs.Linux-Nightly-Ondemand-E2E-Tests.outputs.TORCHBENCH_COMMIT_ID }}"
           TORCHVISION_COMMIT_ID="${{ needs.Linux-Nightly-Ondemand-E2E-Tests.outputs.TORCHVISION_COMMIT_ID }}"
           TORCHAUDIO_COMMIT_ID="${{ needs.Linux-Nightly-Ondemand-E2E-Tests.outputs.TORCHAUDIO_COMMIT_ID }}"
-          # TORCHTEXT_COMMIT_ID="${{ needs.Linux-Nightly-Ondemand-E2E-Tests.outputs.TORCHTEXT_COMMIT_ID }}"
           TRANSFORMERS_VERSION="${{ needs.Linux-Nightly-Ondemand-E2E-Tests.outputs.TRANSFORMERS_VERSION }}"
           TIMM_COMMIT_ID="${{ needs.Linux-Nightly-Ondemand-E2E-Tests.outputs.TIMM_COMMIT_ID }}"
           TRITON_COMMIT_ID="${{ needs.Linux-Nightly-Ondemand-E2E-Tests.outputs.TRITON_COMMIT_ID }}"
@@ -303,7 +301,7 @@ jobs:
             fi
             echo -e "Inputs | $test_scope\n--- | --- \n" >> ${{ github.workspace }}/report.txt
           fi
-          echo "$cc_comment\n" >> ${{ github.workspace }}/report.txt
+          echo "$cc_comment" >> ${{ github.workspace }}/report.txt
           # Report
           report_txt=$(cat ${{ github.workspace }}/report.txt)
           gh --repo $repo issue comment $test_issue_id --body "$report_txt"

.github/workflows/pull.yml

@@ -82,7 +82,7 @@ jobs:
           cd ../pytorch
           echo "TRITON_COMMIT_ID=$(<.ci/docker/ci_commit_pins/triton-xpu.txt)" >> "${GITHUB_ENV}"
           echo "TORCHVISION_COMMIT_ID=$(<.github/ci_commit_pins/vision.txt)" >> "${GITHUB_ENV}"
-          echo "TORCHTEXT_COMMIT_ID=$(<.github/ci_commit_pins/text.txt)" >> "${GITHUB_ENV}"
+          echo "TORCHBENCH_COMMIT_ID=$(<third_party/torch-xpu-ops/.github/ci_commit_pins/torchbench.txt)" >> "${GITHUB_ENV}"
           echo "TORCHAUDIO_COMMIT_ID=$(<.github/ci_commit_pins/audio.txt)" >> "${GITHUB_ENV}"
           echo "TRANSFORMERS_VERSION=$(<.ci/docker/ci_commit_pins/huggingface.txt)" >> "${GITHUB_ENV}"
           echo "TIMM_COMMIT_ID=$(<.ci/docker/ci_commit_pins/timm.txt)" >> "${GITHUB_ENV}"

src/ATen/native/xpu/BinaryOps.cpp

@@ -9,6 +9,7 @@
 #include <ATen/native/xpu/sycl/BinaryKernels.h>
 #include <ATen/native/xpu/sycl/BinaryMiscBackwardOpsKernels.h>
 #include <ATen/native/xpu/sycl/BinaryRemainderKernel.h>
+#include <ATen/native/xpu/sycl/CopysignKernel.h>
 #include <ATen/native/xpu/sycl/GcdLcmKernels.h>
 #include <ATen/native/xpu/sycl/MaxMinElementwiseKernels.h>
 
@@ -477,4 +478,51 @@ Tensor XPUNativeFunctions::sigmoid_backward(
   return iter.output();
 }
 
+Tensor XPUNativeFunctions::atan2(const Tensor& self, const Tensor& other) {
+  Tensor out;
+  TensorIterator iter;
+  iter.build_borrowing_binary_float_op(out, self, other);
+  native::xpu::atan2_kernel(iter);
+  return iter.output();
+}
+
+Tensor& XPUNativeFunctions::atan2_(Tensor& self, const Tensor& other) {
+  TensorIterator iter;
+  iter.build_borrowing_binary_float_op(self, self, other);
+  native::xpu::atan2_kernel(iter);
+  return self;
+}
+
+Tensor& XPUNativeFunctions::atan2_out(
+    const Tensor& self,
+    const Tensor& other,
+    Tensor& out) {
+  TensorIterator iter;
+  iter.build_borrowing_binary_float_op(out, self, other);
+  native::xpu::atan2_kernel(iter);
+  return out;
+}
+
+Tensor& XPUNativeFunctions::copysign_out(
+    const Tensor& self,
+    const Tensor& other,
+    Tensor& out) {
+  TensorIterator iter;
+  iter.build_borrowing_binary_float_op(out, self, other);
+  native::xpu::copysign_kernel(iter);
+  return out;
+}
+
+Tensor& XPUNativeFunctions::copysign_(Tensor& self, const Tensor& other) {
+  return XPUNativeFunctions::copysign_out(self, other, self);
+}
+
+Tensor XPUNativeFunctions::copysign(const Tensor& self, const Tensor& other) {
+  Tensor out;
+  TensorIterator iter;
+  iter.build_borrowing_binary_float_op(out, self, other);
+  native::xpu::copysign_kernel(iter);
+  return iter.output();
+}
+
 } // namespace at

src/ATen/native/xpu/Indexing.cpp

@@ -43,4 +43,5 @@ Tensor XPUNativeFunctions::index_select(
   auto out = at::empty({0}, self.options());
   return index_select_out(self, dim, index, out);
 }
+
 } // namespace at