From 33f00f8dc5004b0eb7a2027381fa793ab9c9251f Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Fri, 5 Jul 2024 16:05:52 -0400
Subject: [PATCH 1/5] [validations] Add mkl version print (#1915)

---
 test/smoke_test/smoke_test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/smoke_test/smoke_test.py b/test/smoke_test/smoke_test.py
index 2d3ccf45a..f59ee7a28 100644
--- a/test/smoke_test/smoke_test.py
+++ b/test/smoke_test/smoke_test.py
@@ -323,6 +323,7 @@ def main() -> None:
     )
     options = parser.parse_args()
     print(f"torch: {torch.__version__}")
+    print(torch.__config__.parallel_info())
 
     check_version(options.package)
     smoke_test_conv2d()

From e463b5c89000940da5f328b6ff6cafef29f94756 Mon Sep 17 00:00:00 2001
From: Sahan Paliskara <sahancpal@gmail.com>
Date: Fri, 5 Jul 2024 15:11:38 -0700
Subject: [PATCH 2/5] [Split Build] remove unnessary file removal (#1912)

---
 manywheel/build_common.sh | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/manywheel/build_common.sh b/manywheel/build_common.sh
index 9b9ad7b42..08ca92466 100644
--- a/manywheel/build_common.sh
+++ b/manywheel/build_common.sh
@@ -437,19 +437,6 @@ for pkg in /$WHEELHOUSE_DIR/torch_no_python*.whl /$WHEELHOUSE_DIR/torch*linux*.w
         popd
     fi
 
-    if [[ "$USE_SPLIT_BUILD" == "true" ]]; then
-        # @sahanp todo: Remove this line
-        echo "current files in directory"
-        ls -l
-
-        echo "removing extraneous .so and .a files"
-        # todo @PaliC: Remove these .so and .a files before hand in the split build
-        rm *.so *.a || true
-
-        echo "Packaging the following files"
-        ls -alR
-    fi
-
     # zip up the wheel back
     zip -rq $(basename $pkg) $PREIX*
 

From d9e5fefb8c26b5cdbbc1e2ceb862617e48ab0f29 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 8 Jul 2024 10:55:22 -0400
Subject: [PATCH 3/5] Add CUDA_VISIBLE_DEVICES check (#1916)

---
 .github/scripts/validate_binaries.sh | 5 +++++
 test/smoke_test/smoke_test.py        | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/scripts/validate_binaries.sh b/.github/scripts/validate_binaries.sh
index bf5c15690..0eab2d5e8 100755
--- a/.github/scripts/validate_binaries.sh
+++ b/.github/scripts/validate_binaries.sh
@@ -69,6 +69,11 @@ else
         export PATH=${OLD_PATH}
     fi
 
+    # Use case CUDA_VISIBLE_DEVICES: https://github.com/pytorch/pytorch/issues/128819
+    if [[ ${MATRIX_GPU_ARCH_TYPE} == 'cuda' ]]; then
+        python3 -c "import torch;import os;print(torch.cuda.device_count(), torch.__version__);os.environ['CUDA_VISIBLE_DEVICES']='0';print(torch.empty(2, device='cuda'))"
+    fi
+
     # this is optional step
     if [[ ${TARGET_OS} != linux*  ]]; then
         conda deactivate
diff --git a/test/smoke_test/smoke_test.py b/test/smoke_test/smoke_test.py
index f59ee7a28..5b1681c48 100644
--- a/test/smoke_test/smoke_test.py
+++ b/test/smoke_test/smoke_test.py
@@ -181,13 +181,6 @@ def smoke_test_cuda(package: str, runtime_error_check: str, torch_compile_check:
         if (sys.platform in ["linux", "linux2"]):
             print(f"torch nccl version: {torch.cuda.nccl.version()}")
 
-
-         # test settind CUDA_VISIBLE_DEVICES
-        print(f"torch.cuda.device_count: {torch.cuda.device_count()}")
-        os.environ['CUDA_VISIBLE_DEVICES']='0'
-        print(torch.empty(2, device='cuda'))
-        del os.environ['CUDA_VISIBLE_DEVICES']
-
         if runtime_error_check == "enabled":
             test_cuda_runtime_errors_captured()
 

From 21680fdc8089c1d3748ff2716a8a44f66e889c20 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 8 Jul 2024 15:54:08 -0400
Subject: [PATCH 4/5] Update linux manywheel mkl to 2024.2.0 (#1917)

---
 common/install_mkl.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/install_mkl.sh b/common/install_mkl.sh
index bf97b8236..42a1779b0 100644
--- a/common/install_mkl.sh
+++ b/common/install_mkl.sh
@@ -2,7 +2,7 @@
 set -ex
 
 # MKL
-MKL_VERSION=2022.2.1
+MKL_VERSION=2024.2.0
 
 mkdir -p /opt/intel/
 pushd /tmp

From 987dcb03dd25b41fdc196e5e07bb8fb75c40f32f Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 8 Jul 2024 19:22:29 -0400
Subject: [PATCH 5/5] Don't run cuda check on xpu devices (#1918)

---
 check_binary.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_binary.sh b/check_binary.sh
index be2b5252b..db609979c 100755
--- a/check_binary.sh
+++ b/check_binary.sh
@@ -375,7 +375,7 @@ if [[ "$OSTYPE" == "msys" ]]; then
 fi
 
 # Test that CUDA builds are setup correctly
-if [[ "$DESIRED_CUDA" != 'cpu' && "$DESIRED_CUDA" != 'cpu-cxx11-abi' && "$DESIRED_CUDA" != *"rocm"* && "$(uname -m)" != "s390x" ]]; then
+if [[ "$DESIRED_CUDA" != 'cpu' && "$DESIRED_CUDA" != 'xpu' && "$DESIRED_CUDA" != 'cpu-cxx11-abi' && "$DESIRED_CUDA" != *"rocm"* && "$(uname -m)" != "s390x" ]]; then
   if [[ "$PACKAGE_TYPE" == 'libtorch' ]]; then
     build_and_run_example_cpp check-torch-cuda
   else