Skip to content

Commit fac2ef0

Browse files
[release/2.5] Removing --user flag from all pip install commands (#2544)
Cherry pick of #2238 Validation: http://rocm-ci.amd.com/view/Release-7.0/job/pytorch2.5-manylinux-wheels_rel-7.0/34/ --------- Co-authored-by: Jithun Nair <[email protected]>
1 parent c949a0a commit fac2ef0

File tree

6 files changed

+16
-25
lines changed

6 files changed

+16
-25
lines changed

.ci/caffe2/test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
55

66
if [[ ${BUILD_ENVIRONMENT} == *onnx* ]]; then
77
pip install click mock tabulate networkx==2.0
8-
pip -q install --user "file:///var/lib/jenkins/workspace/third_party/onnx#egg=onnx"
8+
pip -q install "file:///var/lib/jenkins/workspace/third_party/onnx#egg=onnx"
99
fi
1010

1111
# Skip tests in environments where they are not built/applicable
@@ -151,8 +151,8 @@ export DNNL_MAX_CPU_ISA=AVX2
151151
if [[ "${SHARD_NUMBER:-1}" == "1" ]]; then
152152
# TODO([email protected]) remove this when the linked issue resolved.
153153
# py is temporary until https://github.com/Teemu/pytest-sugar/issues/241 is fixed
154-
pip install --user py==1.11.0
155-
pip install --user pytest-sugar
154+
pip install py==1.11.0
155+
pip install pytest-sugar
156156
# NB: Warnings are disabled because they make it harder to see what
157157
# the actual erroring test is
158158
"$PYTHON" \

.ci/docker/requirements-ci.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ tb-nightly==2.13.0a20230426
256256
#Pinned versions:
257257
#test that import:
258258

259-
tlparse==0.3.7
259+
tlparse==0.3.30
260260
#Description: parse logs produced by torch.compile
261261
#Pinned versions:
262262
#test that import: dynamo/test_structured_trace.py

.ci/onnx/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ git config --global --add safe.directory /var/lib/jenkins/workspace
1919

2020
if [[ "$BUILD_ENVIRONMENT" == *onnx* ]]; then
2121
# TODO: This can be removed later once vision is also part of the Docker image
22-
pip install -q --user --no-use-pep517 "git+https://github.com/pytorch/vision.git@$(cat .github/ci_commit_pins/vision.txt)"
22+
pip install -q --no-use-pep517 "git+https://github.com/pytorch/vision.git@$(cat .github/ci_commit_pins/vision.txt)"
2323
# JIT C++ extensions require ninja, so put it into PATH.
2424
export PATH="/var/lib/jenkins/.local/bin:$PATH"
2525
# NB: ONNX test is fast (~15m) so it's ok to retry it few more times to avoid any flaky issue, we

.ci/pytorch/common_utils.sh

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ function install_torchaudio() {
146146
if [[ "$1" == "cuda" ]]; then
147147
# TODO: This is better to be passed as a parameter from _linux-test workflow
148148
# so that it can be consistent with what is set in build
149-
TORCH_CUDA_ARCH_LIST="8.0;8.6" pip_install --no-use-pep517 --user "git+https://github.com/pytorch/audio.git@${commit}"
149+
TORCH_CUDA_ARCH_LIST="8.0;8.6" pip_install --no-use-pep517 "git+https://github.com/pytorch/audio.git@${commit}"
150150
else
151-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/audio.git@${commit}"
151+
pip_install --no-use-pep517 "git+https://github.com/pytorch/audio.git@${commit}"
152152
fi
153153

154154
}
@@ -158,8 +158,8 @@ function install_torchtext() {
158158
local text_commit
159159
data_commit=$(get_pinned_commit data)
160160
text_commit=$(get_pinned_commit text)
161-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/data.git@${data_commit}"
162-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/text.git@${text_commit}"
161+
pip_install --no-use-pep517 "git+https://github.com/pytorch/data.git@${data_commit}"
162+
pip_install --no-use-pep517 "git+https://github.com/pytorch/text.git@${text_commit}"
163163
}
164164

165165
function install_torchvision() {
@@ -172,16 +172,12 @@ function install_torchvision() {
172172
echo 'char* dlerror(void) { return "";}'|gcc -fpic -shared -o "${HOME}/dlerror.so" -x c -
173173
LD_PRELOAD=${orig_preload}:${HOME}/dlerror.so
174174
fi
175-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/vision.git@${commit}"
175+
pip_install --no-use-pep517 "git+https://github.com/pytorch/vision.git@${commit}"
176176
if [ -n "${LD_PRELOAD}" ]; then
177177
LD_PRELOAD=${orig_preload}
178178
fi
179179
}
180180

181-
function install_tlparse() {
182-
pip_install --user "tlparse==0.3.25"
183-
PATH="$(python -m site --user-base)/bin:$PATH"
184-
}
185181

186182
function install_torchrec_and_fbgemm() {
187183
local torchrec_commit
@@ -192,8 +188,8 @@ function install_torchrec_and_fbgemm() {
192188
pip_uninstall fbgemm-gpu-nightly
193189
pip_install setuptools-git-versioning scikit-build pyre-extensions
194190
# See https://github.com/pytorch/pytorch/issues/106971
195-
CUDA_PATH=/usr/local/cuda-12.1 pip_install --no-use-pep517 --user "git+https://github.com/pytorch/FBGEMM.git@${fbgemm_commit}#egg=fbgemm-gpu&subdirectory=fbgemm_gpu"
196-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/torchrec.git@${torchrec_commit}"
191+
CUDA_PATH=/usr/local/cuda-12.1 pip_install --no-use-pep517 "git+https://github.com/pytorch/FBGEMM.git@${fbgemm_commit}#egg=fbgemm-gpu&subdirectory=fbgemm_gpu"
192+
pip_install --no-use-pep517 "git+https://github.com/pytorch/torchrec.git@${torchrec_commit}"
197193
}
198194

199195
function clone_pytorch_xla() {

.ci/pytorch/macos-test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@ test_jit_hooks() {
148148
popd
149149
assert_git_not_dirty
150150
}
151-
152-
install_tlparse
153-
154151
if [[ $NUM_TEST_SHARDS -gt 1 ]]; then
155152
test_python_shard "${SHARD_NUMBER}"
156153
if [[ "${SHARD_NUMBER}" == 1 ]]; then

.ci/pytorch/test.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ fi
178178

179179
if [[ "$BUILD_ENVIRONMENT" != *-bazel-* ]] ; then
180180
# JIT C++ extensions require ninja.
181-
pip_install --user "ninja==1.10.2"
181+
pip_install "ninja==1.10.2"
182182
# ninja is installed in $HOME/.local/bin, e.g., /var/lib/jenkins/.local/bin for CI user jenkins
183183
# but this script should be runnable by any user, including root
184184
export PATH="$HOME/.local/bin:$PATH"
@@ -189,8 +189,6 @@ if [[ "$BUILD_ENVIRONMENT" == *aarch64* ]]; then
189189
export VALGRIND=OFF
190190
fi
191191

192-
install_tlparse
193-
194192
# DANGER WILL ROBINSON. The LD_PRELOAD here could cause you problems
195193
# if you're not careful. Check this if you made some changes and the
196194
# ASAN test is not working
@@ -397,7 +395,7 @@ DYNAMO_BENCHMARK_FLAGS=()
397395

398396
pr_time_benchmarks() {
399397

400-
pip_install --user "fbscribelogger"
398+
pip_install "fbscribelogger"
401399

402400
TEST_REPORTS_DIR=$(pwd)/test/test-reports
403401
mkdir -p "$TEST_REPORTS_DIR"
@@ -1305,8 +1303,8 @@ test_bazel() {
13051303

13061304
test_benchmarks() {
13071305
if [[ "$BUILD_ENVIRONMENT" == *cuda* && $TEST_CONFIG != *nogpu* ]]; then
1308-
pip_install --user "pytest-benchmark==3.2.3"
1309-
pip_install --user "requests"
1306+
pip_install "pytest-benchmark==3.2.3"
1307+
pip_install "requests"
13101308
BENCHMARK_DATA="benchmarks/.data"
13111309
mkdir -p ${BENCHMARK_DATA}
13121310
pytest benchmarks/fastrnns/test_bench.py --benchmark-sort=Name --benchmark-json=${BENCHMARK_DATA}/fastrnns_default.json --fuser=default --executor=default

0 commit comments

Comments
 (0)