From 842a1800a96c6d7561c8099627fdedd27ea4ab22 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Thu, 8 May 2025 13:21:19 -0700 Subject: [PATCH 1/4] Cherry-picked commit with merge conflict --- .ci/pytorch/common_utils.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.ci/pytorch/common_utils.sh b/.ci/pytorch/common_utils.sh index 68a7d5559f5a1..881087c746212 100644 --- a/.ci/pytorch/common_utils.sh +++ b/.ci/pytorch/common_utils.sh @@ -56,7 +56,30 @@ function assert_git_not_dirty() { function pip_install_whl() { # This is used to install PyTorch and other build artifacts wheel locally # without using any network connection +<<<<<<< HEAD python3 -mpip install --no-index --no-deps "$@" +======= + + # Convert the input arguments into an array + local args=("$@") + + # Check if the first argument contains multiple paths separated by spaces + if [[ "${args[0]}" == *" "* ]]; then + # Split the string by spaces into an array + IFS=' ' read -r -a paths <<< "${args[0]}" + # Loop through each path and install individually + for path in "${paths[@]}"; do + echo "Installing $path" + python3 -mpip install "$path" + done + else + # Loop through each argument and install individually + for path in "${args[@]}"; do + echo "Installing $path" + python3 -mpip install "$path" + done + fi +>>>>>>> 5c42a37052 ([release/2.6] Remove --no-index and --no-deps flags (#2103)) } function pip_install() { From b8c72ef441629fbafa20113473737d0c6d14dcc5 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Wed, 14 May 2025 09:01:49 -0700 Subject: [PATCH 2/4] resolved merge conflicts --- .ci/pytorch/common_utils.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.ci/pytorch/common_utils.sh b/.ci/pytorch/common_utils.sh index 881087c746212..eb166a5630acd 100644 --- a/.ci/pytorch/common_utils.sh +++ b/.ci/pytorch/common_utils.sh @@ -55,11 +55,6 @@ function assert_git_not_dirty() { function pip_install_whl() { # This is used to install PyTorch and other build artifacts wheel locally - # without using any network connection -<<<<<<< HEAD - python3 -mpip install --no-index --no-deps "$@" -======= - # Convert the input arguments into an array local args=("$@") @@ -79,7 +74,6 @@ function pip_install_whl() { python3 -mpip install "$path" done fi ->>>>>>> 5c42a37052 ([release/2.6] Remove --no-index and --no-deps flags (#2103)) } function pip_install() { From 4a609e8176f825420547a0db4a4e9163a4951817 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Wed, 14 May 2025 09:13:58 -0700 Subject: [PATCH 3/4] revert back to original but remove no deps --- .ci/pytorch/common_utils.sh | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/.ci/pytorch/common_utils.sh b/.ci/pytorch/common_utils.sh index eb166a5630acd..6a1ffeb4241a0 100644 --- a/.ci/pytorch/common_utils.sh +++ b/.ci/pytorch/common_utils.sh @@ -56,24 +56,7 @@ function assert_git_not_dirty() { function pip_install_whl() { # This is used to install PyTorch and other build artifacts wheel locally # Convert the input arguments into an array - local args=("$@") - - # Check if the first argument contains multiple paths separated by spaces - if [[ "${args[0]}" == *" "* ]]; then - # Split the string by spaces into an array - IFS=' ' read -r -a paths <<< "${args[0]}" - # Loop through each path and install individually - for path in "${paths[@]}"; do - echo "Installing $path" - python3 -mpip install "$path" - done - else - # Loop through each argument and install individually - for path in "${args[@]}"; do - echo "Installing $path" - python3 -mpip install "$path" - done - fi + python3 -mpip install --no-index "$@" } function pip_install() { From dbe9c393158979d784942106392f00665b565da0 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Wed, 14 May 2025 09:27:39 -0700 Subject: [PATCH 4/4] removing no index --- .ci/pytorch/common_utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/pytorch/common_utils.sh b/.ci/pytorch/common_utils.sh index 6a1ffeb4241a0..640490ff99348 100644 --- a/.ci/pytorch/common_utils.sh +++ b/.ci/pytorch/common_utils.sh @@ -56,7 +56,7 @@ function assert_git_not_dirty() { function pip_install_whl() { # This is used to install PyTorch and other build artifacts wheel locally # Convert the input arguments into an array - python3 -mpip install --no-index "$@" + python3 -mpip install "$@" } function pip_install() {