8000 Update on "switch aten_headers to use strip_include_prefix instead of… · pytorch/pytorch@abf06d3 · GitHub
[go: up one dir, main page]
Skip to content

Commit abf06d3

Browse files
author
Michael Andreas Dagitses
committed
Update on "switch aten_headers to use strip_include_prefix instead of includes"
This is Bazel best practices and easier to maintain. Differential Revision: [D36521515](https://our.internmc.facebook.com/intern/diff/D36521515/) [ghstack-poisoned]
2 parents 21d4b2b + 92be3d0 commit abf06d3

File tree

650 files changed

+23375
-11401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

650 files changed

+23375
-11401
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 436 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.circleci/docker/build.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,6 @@ case "$image" in
9191
GCC_VERSION=7
9292
# Do not install PROTOBUF, DB, and VISION as a test
9393
;;
94-
pytorch-linux-xenial-py3.7-gcc5.4)
95-
ANACONDA_PYTHON_VERSION=3.7
96-
GCC_VERSION=5
97-
PROTOBUF=yes
98-
DB=yes
99-
VISION=yes
100-
KATEX=yes
101-
;;
10294
pytorch-linux-xenial-py3.7-gcc7.2)
10395
ANACONDA_PYTHON_VERSION=3.7
10496
GCC_VERSION=7

‎.circleci/docker/build_docker.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ fi
4646
# Build new image
4747
./build.sh ${IMAGE_NAME} -t "${image}:${tag}"
4848

49-
docker push "${image}:${tag}"
49+
# Only push if `DOCKER_SKIP_PUSH` = false
50+
if [ "${DOCKER_SKIP_PUSH:-true}" = "false" ]; then
51+
docker push "${image}:${tag}"
52+
fi
5053

5154
if [ -z "${DOCKER_SKIP_S3_UPLOAD:-}" ]; then
5255
trap "rm -rf ${IMAGE_NAME}:${tag}.tar" EXIT

‎.circleci/docker/common/install_katex.sh renamed to ‎.circleci/docker/common/install_docs_reqs.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ if [ -n "$KATEX" ]; then
1717
apt-get install -y --no-install-recommends yarn
1818
yarn global add katex --prefix /usr/local
1919

20+
sudo apt-get -y install doxygen
21+
2022
apt-get autoclean && apt-get clean
2123
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2224

‎.circleci/docker/requirements-ci.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ numba==0.54.1 ; python_version == "3.9"
128128
#Pinned versions:
129129
#test that import:
130130

131-
#protobuf
131+
protobuf==3.20.1
132132
#Description: Google’s data interchange format
133-
#Pinned versions:
133+
#Pinned versions: 3.20.1
134134
#test that import: test_tensorboard.py
135135

136136
psutil

‎.circleci/docker/ubuntu-cuda/Dockerfile

Lines changed: 2 additions & 2 deletions
< 10000 td data-grid-cell-id="diff-eb2b21684d770dfbf4093806b2f48b6ace47a63cacbc1794b812c96b6f28bfdb-26-26-0" data-selected="false" role="gridcell" style="background-color:var(--bgColor-default);text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative diff-line-number-neutral left-side">26
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ RUN bash ./install_user.sh && rm install_user.sh
2020

2121
# Install katex
2222
ARG KATEX
23-
ADD ./common/install_katex.sh install_katex.sh
24-
RUN bash ./install_katex.sh && rm install_katex.sh
23+
ADD ./common/install_docs_reqs.sh install_docs_reqs.sh
24+
RUN bash ./install_docs_reqs.sh && rm install_docs_reqs.sh
2525

26
# Install conda and other packages (e.g., numpy, pytest)
2727
ENV PATH /opt/conda/bin:$PATH

‎.circleci/docker/ubuntu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ RUN bash ./install_user.sh && rm install_user.sh
3030

3131
# Install katex
3232
ARG KATEX
33-
ADD ./common/install_katex.sh install_katex.sh
34-
RUN bash ./install_katex.sh && rm install_katex.sh
33+
ADD ./common/install_docs_reqs.sh install_docs_reqs.sh
34+
RUN bash ./install_docs_reqs.sh && rm install_docs_reqs.sh
3535

3636
# Install conda and other packages (e.g., numpy, pytest)
3737
ENV PATH /opt/conda/bin:$PATH

‎.circleci/scripts/binary_populate_env.sh

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -23,50 +23,12 @@ tagged_version() {
2323
fi
2424
}
2525

26-
# These are only relevant for CircleCI
27-
# TODO: Remove these later once migrated fully to GHA
28-
if [[ -z ${IS_GHA:-} ]]; then
29-
# We need to write an envfile to persist these variables to following
30-
# steps, but the location of the envfile depends on the circleci executor
31-
if [[ "$(uname)" == Darwin ]]; then
32-
# macos executor (builds and tests)
33-
workdir="/Users/distiller/project"
34-
elif [[ "$OSTYPE" == "msys" ]]; then
35-
# windows executor (builds and tests)
36-
workdir="/c/w"
37-
elif [[ -d "/home/circleci/project" ]]; then
38-
# machine executor (binary tests)
39-
workdir="/home/circleci/project"
40-
else
41-
# docker executor (binary builds)
42-
workdir="/"
43-
fi
44-
envfile="$workdir/env"
45-
touch "$envfile"
46-
chmod +x "$envfile"
47-
48-
# Parse the BUILD_ENVIRONMENT to package type, python, and cuda
49-
configs=($BUILD_ENVIRONMENT)
50-
export PACKAGE_TYPE="${configs[0]}"
51-
export DESIRED_PYTHON="${configs[1]}"
52-
export DESIRED_CUDA="${configs[2]}"
53-
if [[ "${OSTYPE}" == "msys" ]]; then
54-
export DESIRED_DEVTOOLSET=""
55-
export LIBTORCH_CONFIG="${configs[3]:-}"
56-
if [[ "$LIBTORCH_CONFIG" == 'debug' ]]; then
57-
export DEBUG=1
58-
fi
59-
else
60-
export DESIRED_DEVTOOLSET="${configs[3]:-}"
61-
fi
26+
envfile=${BINARY_ENV_FILE:-/tmp/env}
27+
if [[ -n "${PYTORCH_ROOT}" ]]; then
28+
workdir=$(dirname "${PYTORCH_ROOT}")
6229
else
63-
envfile=${BINARY_ENV_FILE:-/tmp/env}
64-
if [[ -n "${PYTORCH_ROOT}" ]]; then
65-
workdir=$(dirname "${PYTORCH_ROOT}")
66-
else
67-
# docker executor (binary builds)
68-
workdir="/"
69-
fi
30+
# docker executor (binary builds)
31+
workdir="/"
7032
fi
7133

7234
if [[ "$PACKAGE_TYPE" == 'libtorch' ]]; then

‎.circleci/scripts/cpp_doc_push_script.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ git clone https://github.com/pytorch/cppdocs
5151

5252
set -ex
5353

54-
sudo apt-get -y install doxygen
55-
5654
# Generate ATen files
5755
pushd "${pt_checkout}"
5856
pip install -r requirements.txt

0 commit comments

Comments
 (0)
0