Skip to content

Commit dae14f9

Browse files
okakarpaethanwee1
andauthored
[AUTOGENERATED] [release/2.6] Removing --user flag from all pip install commands (#2284)
Cherry-pick of #2238 Mirror upstream release/2.6 to use same tlparse and remove all --user flags https://github.com/pytorch/pytorch/blob/1eba9b3aa3c43f86f4a2c807ac8e12c4a7767340/.ci/pytorch/common_utils.sh#L163 --------- Co-authored-by: Ethan Wee <[email protected]>
1 parent 0154656 commit dae14f9

File tree

6 files changed

+15
-24
lines changed

6 files changed

+15
-24
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
@@ -261,7 +261,7 @@ tb-nightly==2.13.0a20230426
261261
#Pinned versions:
262262
#test that import:
263263

264-
tlparse==0.3.7
264+
tlparse==0.3.25
265265
#Description: parse logs produced by torch.compile
266266
#Pinned versions:
267267
#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: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ function install_torchaudio() {
127127
if [[ "$1" == "cuda" ]]; then
128128
# TODO: This is better to be passed as a parameter from _linux-test workflow
129129
# so that it can be consistent with what is set in build
130-
TORCH_CUDA_ARCH_LIST="8.0;8.6" pip_install --no-use-pep517 --user "git+https://github.com/pytorch/audio.git@${commit}"
130+
TORCH_CUDA_ARCH_LIST="8.0;8.6" pip_install --no-use-pep517 "git+https://github.com/pytorch/audio.git@${commit}"
131131
else
132-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/audio.git@${commit}"
132+
pip_install --no-use-pep517 "git+https://github.com/pytorch/audio.git@${commit}"
133133
fi
134134

135135
}
@@ -139,8 +139,8 @@ function install_torchtext() {
139139
local text_commit
140140
data_commit=$(get_pinned_commit data)
141141
text_commit=$(get_pinned_commit text)
142-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/data.git@${data_commit}"
143-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/text.git@${text_commit}"
142+
pip_install --no-use-pep517 "git+https://github.com/pytorch/data.git@${data_commit}"
143+
pip_install --no-use-pep517 "git+https://github.com/pytorch/text.git@${text_commit}"
144144
}
145145

146146
function install_torchvision() {
@@ -153,17 +153,12 @@ function install_torchvision() {
153153
echo 'char* dlerror(void) { return "";}'|gcc -fpic -shared -o "${HOME}/dlerror.so" -x c -
154154
LD_PRELOAD=${orig_preload}:${HOME}/dlerror.so
155155
fi
156-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/vision.git@${commit}"
156+
pip_install --no-use-pep517 "git+https://github.com/pytorch/vision.git@${commit}"
157157
if [ -n "${LD_PRELOAD}" ]; then
158158
LD_PRELOAD=${orig_preload}
159159
fi
160160
}
161161

162-
function install_tlparse() {
163-
pip_install --user "tlparse==0.3.25"
164-
PATH="$(python -m site --user-base)/bin:$PATH"
165-
}
166-
167162
function install_torchrec_and_fbgemm() {
168163
local torchrec_commit
169164
torchrec_commit=$(get_pinned_commit torchrec)
@@ -224,7 +219,7 @@ function checkout_install_torchbench() {
224219
function install_torchao() {
225220
local commit
226221
commit=$(get_pinned_commit torchao)
227-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/ao.git@${commit}"
222+
pip_install --no-use-pep517 "git+https://github.com/pytorch/ao.git@${commit}"
228223
}
229224

230225
function print_sccache_stats() {

.ci/pytorch/macos-test.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,6 @@ test_timm_perf() {
274274
echo "timm benchmark on mps device completed"
275275
}
276276

277-
install_tlparse
278-
279277
if [[ $TEST_CONFIG == *"perf_all"* ]]; then
280278
test_torchbench_perf
281279
test_hf_perf

.ci/pytorch/test.sh

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

183183
if [[ "$BUILD_ENVIRONMENT" != *-bazel-* ]] ; then
184184
# JIT C++ extensions require ninja.
185-
pip_install --user "ninja==1.10.2"
185+
pip_install "ninja==1.10.2"
186186
# ninja is installed in $HOME/.local/bin, e.g., /var/lib/jenkins/.local/bin for CI user jenkins
187187
# but this script should be runnable by any user, including root
188188
export PATH="$HOME/.local/bin:$PATH"
@@ -193,8 +193,6 @@ if [[ "$BUILD_ENVIRONMENT" == *aarch64* ]]; then
193193
export VALGRIND=OFF
194194
fi
195195

196-
install_tlparse
197-
198196
# DANGER WILL ROBINSON. The LD_PRELOAD here could cause you problems
199197
# if you're not careful. Check this if you made some changes and the
200198
# ASAN test is not working
@@ -424,7 +422,7 @@ DYNAMO_BENCHMARK_FLAGS=()
424422

425423
pr_time_benchmarks() {
426424

427-
pip_install --user "fbscribelogger"
425+
pip_install "fbscribelogger"
428426

429427
TEST_REPORTS_DIR=$(pwd)/test/test-reports
430428
mkdir -p "$TEST_REPORTS_DIR"
@@ -1312,8 +1310,8 @@ test_bazel() {
13121310

13131311
test_benchmarks() {
13141312
if [[ "$BUILD_ENVIRONMENT" == *cuda* && $TEST_CONFIG != *nogpu* ]]; then
1315-
pip_install --user "pytest-benchmark==3.2.3"
1316-
pip_install --user "requests"
1313+
pip_install "pytest-benchmark==3.2.3"
1314+
pip_install "requests"
13171315
BENCHMARK_DATA="benchmarks/.data"
13181316
mkdir -p ${BENCHMARK_DATA}
13191317
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)