Skip to content

Commit

Permalink
Update base for Update on "Extra CR comments from #95621"
Browse files Browse the repository at this point in the history
Specifically:
https://github.com/pytorch/pytorch/pull/95621/files/063e44147152f4dd7e51852cf8c679692bd9fd53#r1120306196
#95621 (comment)

Signed-off-by: Edward Z. Yang <ezyangmeta.com>

cc soumith voznesenskym penguinwu anijain2305 EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng Xia-Weiwen wenzhe-nrv jiayisunx desertfire

[ghstack-poisoned]
  • Loading branch information
ezyang committed Mar 8, 2023
2 parents 78da315 + 3f840cc commit 0f6aeae
Show file tree
Hide file tree
Showing 244 changed files with 6,372 additions and 5,083 deletions.
13 changes: 5 additions & 8 deletions .ci/docker/common/install_cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,11 @@ if [ -n "$ROCM_VERSION" ]; then
curl --retry 3 http://repo.radeon.com/misc/.sccache_amd/sccache -o /opt/cache/bin/sccache
else
ID=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
case "$ID" in
ubuntu)
install_ubuntu
;;
*)
install_binary
;;
esac
# TODO: Install the pre-built binary from S3 as building from source
# https://github.com/pytorch/sccache has started failing mysteriously
# in which sccache server couldn't start with the following error:
# sccache: error: Invalid argument (os error 22)
install_binary
fi
chmod a+x /opt/cache/bin/sccache

Expand Down
6 changes: 3 additions & 3 deletions .ci/docker/requirements-ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,9 @@ unittest-xml-reporting<=3.2.0,>=2.0.0
#Pinned versions:
#test that import:

lintrunner==0.9.2
#Description: all about linters
#Pinned versions: 0.9.2
lintrunner==0.10.7
#Description: all about linters!
#Pinned versions: 0.10.7
#test that import:

rockset==1.0.3
Expand Down
6 changes: 1 addition & 5 deletions .ci/pytorch/build-asan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,13 @@ clang --version

python tools/stats/export_test_times.py

# detect_leaks=0: Python is very leaky, so we need suppress it
# symbolize=1: Gives us much better errors when things go wrong
export ASAN_OPTIONS=detect_leaks=0:detect_stack_use_after_return=1:symbolize=1:detect_odr_violation=0
if [ -n "$(which conda)" ]; then
export CMAKE_PREFIX_PATH=/opt/conda
fi

# TODO: Make the ASAN flags a centralized env var and unify with USE_ASAN option
CC="clang" CXX="clang++" LDSHARED="clang --shared" \
CFLAGS="-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize-address-use-after-scope -shared-libasan" \
USE_ASAN=1 USE_CUDA=0 USE_MKLDNN=0 \
UBSAN_FLAGS="-fno-sanitize-recover=all" \
python setup.py bdist_wheel
pip_install_whl "$(echo dist/*.whl)"

Expand Down
1 change: 0 additions & 1 deletion .ci/pytorch/build-tsan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ if [ -n "$(which conda)" ]; then
fi

CC="clang" CXX="clang++" LDSHARED="clang --shared" \
CFLAGS="-fsanitize=thread" \
USE_TSAN=1 USE_CUDA=0 USE_MKLDNN=0 \
python setup.py bdist_wheel
pip_install_whl "$(echo dist/*.whl)"
Expand Down
8 changes: 8 additions & 0 deletions .ci/pytorch/common_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,14 @@ function clone_pytorch_xla() {
fi
}

function install_matplotlib() {
pip_install matplotlib
}

function install_tabulate() {
pip_install tabulate
}

function setup_torchdeploy_deps(){
conda install -y -n "py_${ANACONDA_PYTHON_VERSION}" "libpython-static=${ANACONDA_PYTHON_VERSION}"
local CC
Expand Down
Loading

0 comments on commit 0f6aeae

Please sign in to comment.