From 5309ffbf23900d04ac69fd6054c22873755f2ca0 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 9f2f15944d316..7df47def4c43d 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 c790ae63ed90ff05d015386806cb853c65689889 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Wed, 14 May 2025 09:04:34 -0700 Subject: [PATCH 2/4] merge conflicts --- .ci/pytorch/common_utils.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.ci/pytorch/common_utils.sh b/.ci/pytorch/common_utils.sh index 7df47def4c43d..f5210dd8bdedd 100644 --- a/.ci/pytorch/common_utils.sh +++ b/.ci/pytorch/common_utils.sh @@ -56,10 +56,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 +75,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 1f10f6e03e49b2b38a20b29bf58ccd288449a457 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Wed, 14 May 2025 09:13:19 -0700 Subject: [PATCH 3/4] revert but remove no deps --- .ci/pytorch/common_utils.sh | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/.ci/pytorch/common_utils.sh b/.ci/pytorch/common_utils.sh index f5210dd8bdedd..91381197a8c94 100644 --- a/.ci/pytorch/common_utils.sh +++ b/.ci/pytorch/common_utils.sh @@ -56,25 +56,7 @@ 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 - # 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 384771280fbf82e782c936faced08a035fe36276 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Thu, 15 May 2025 11:36:28 -0700 Subject: [PATCH 4/4] Lint --- .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 91381197a8c94..6cfdffbf72a7f 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 # without using any network connection - python3 -mpip install --no-index "$@" + python3 -mpip install "$@" } function pip_install() {