Skip to content

Commit 8ffba3f

Browse files
okakarpaethanwee1
andauthored
[AUTOGENERATED] [rocm7.0_internal_testing] Removing --user flag from all pip install commands (#2283)
Cherry-pick of #2238 --------- Co-authored-by: Ethan Wee <[email protected]>
1 parent a0a9d81 commit 8ffba3f

File tree

6 files changed

+18
-26
lines changed

6 files changed

+18
-26
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
@@ -263,7 +263,7 @@ tb-nightly==2.13.0a20230426
263263
#Pinned versions:
264264
#test that import:
265265

266-
tlparse==0.3.25
266+
tlparse==0.3.30
267267
#Description: parse logs produced by torch.compile
268268
#Pinned versions:
269269
#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: 9 additions & 13 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,16 +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.30"
164-
PATH="$(python -m site --user-base)/bin:$PATH"
165-
}
166162

167163
function install_torchrec_and_fbgemm() {
168164
local torchrec_commit
@@ -178,7 +174,7 @@ function install_torchrec_and_fbgemm() {
178174

179175
if [[ "$BUILD_ENVIRONMENT" == *rocm* ]] ; then
180176
# install torchrec first because it installs fbgemm nightly on top of rocm fbgemm
181-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/torchrec.git@${torchrec_commit}"
177+
pip_install --no-use-pep517 "git+https://github.com/pytorch/torchrec.git@${torchrec_commit}"
182178
pip_uninstall fbgemm-gpu-nightly
183179

184180
pip_install tabulate # needed for newer fbgemm
@@ -195,8 +191,8 @@ function install_torchrec_and_fbgemm() {
195191
rm -rf fbgemm
196192
else
197193
# See https://github.com/pytorch/pytorch/issues/106971
198-
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"
199-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/torchrec.git@${torchrec_commit}"
194+
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"
195+
pip_install --no-use-pep517 "git+https://github.com/pytorch/torchrec.git@${torchrec_commit}"
200196
fi
201197
}
202198

@@ -239,7 +235,7 @@ function checkout_install_torchbench() {
239235
function install_torchao() {
240236
local commit
241237
commit=$(get_pinned_commit torchao)
242-
pip_install --no-use-pep517 --user "git+https://github.com/pytorch/ao.git@${commit}"
238+
pip_install --no-use-pep517 "git+https://github.com/pytorch/ao.git@${commit}"
243239
}
244240

245241
function print_sccache_stats() {

.ci/pytorch/macos-test.sh

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

280-
install_tlparse
281-
282280
if [[ $TEST_CONFIG == *"perf_all"* ]]; then
283281
test_torchbench_perf
284282
test_hf_perf

.ci/pytorch/test.sh

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

198198
if [[ "$BUILD_ENVIRONMENT" != *-bazel-* ]] ; then
199199
# JIT C++ extensions require ninja.
200-
pip_install --user "ninja==1.10.2"
200+
pip_install "ninja==1.10.2"
201201
# ninja is installed in $HOME/.local/bin, e.g., /var/lib/jenkins/.local/bin for CI user jenkins
202202
# but this script should be runnable by any user, including root
203203
export PATH="$HOME/.local/bin:$PATH"
@@ -208,8 +208,6 @@ if [[ "$BUILD_ENVIRONMENT" == *aarch64* ]]; then
208208
export VALGRIND=OFF
209209
fi
210210

211-
install_tlparse
212-
213211
# DANGER WILL ROBINSON. The LD_PRELOAD here could cause you problems
214212
# if you're not careful. Check this if you made some changes and the
215213
# ASAN test is not working
@@ -464,7 +462,7 @@ DYNAMO_BENCHMARK_FLAGS=()
464462

465463
pr_time_benchmarks() {
466464

467-
pip_install --user "fbscribelogger"
465+
pip_install "fbscribelogger"
468466

469467
TEST_REPORTS_DIR=$(pwd)/test/test-reports
470468
mkdir -p "$TEST_REPORTS_DIR"
@@ -1423,8 +1421,8 @@ test_bazel() {
14231421

14241422
test_benchmarks() {
14251423
if [[ "$BUILD_ENVIRONMENT" == *cuda* && $TEST_CONFIG != *nogpu* ]]; then
1426-
pip_install --user "pytest-benchmark==3.2.3"
1427-
pip_install --user "requests"
1424+
pip_install "pytest-benchmark==3.2.3"
1425+
pip_install "requests"
14281426
BENCHMARK_DATA="benchmarks/.data"
14291427
mkdir -p ${BENCHMARK_DATA}
14301428
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)