Skip to content

Preserve .ninja_log in build artifacts #44390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Preserve .ninja_log in build artifacts #44390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edf3fdf
Preserve .ninja_log in build artifacts
malfet Sep 9, 2020
5a0732f
In build.sh always install generated wheels using pip
malfet Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,9 @@ jobs:

echo ${COMMAND} > ./command.sh && unbuffer bash ./command.sh | ts

# Copy dist folder back
docker cp $id:/var/lib/jenkins/workspace/dist /home/circleci/project/. || echo "Dist folder not found"

# Push intermediate Docker image for next phase to use
if [ -z "${BUILD_ONLY}" ]; then
# Note [Special build images]
Expand Down Expand Up @@ -539,6 +542,8 @@ jobs:
docker commit "$id" ${COMMIT_DOCKER_IMAGE}
time docker push ${COMMIT_DOCKER_IMAGE}
fi
- store_artifacts:
path: /home/circleci/project/dist

pytorch_linux_test:
<<: *pytorch_params
Expand Down Expand Up @@ -1022,6 +1027,10 @@ jobs:
no_output_timeout: "1h"
command: |
source "/pytorch/.circleci/scripts/binary_linux_build.sh"
# Preserve build log
if [ -f /pytorch/build/.ninja_log ]; then
cp /pytorch/build/.ninja_log /final_pkgs
fi
- run:
name: Output binary sizes
no_output_timeout: "1m"
Expand Down
4 changes: 4 additions & 0 deletions .circleci/verbatim-sources/job-specs/binary-job-specs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
no_output_timeout: "1h"
command: |
source "/pytorch/.circleci/scripts/binary_linux_build.sh"
# Preserve build log
if [ -f /pytorch/build/.ninja_log ]; then
cp /pytorch/build/.ninja_log /final_pkgs
fi
- run:
name: Output binary sizes
no_output_timeout: "1m"
Expand Down
5 changes: 5 additions & 0 deletions .circleci/verbatim-sources/job-specs/pytorch-job-specs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ jobs:

echo ${COMMAND} > ./command.sh && unbuffer bash ./command.sh | ts

# Copy dist folder back
docker cp $id:/var/lib/jenkins/workspace/dist /home/circleci/project/. || echo "Dist folder not found"

# Push intermediate Docker image for next phase to use
if [ -z "${BUILD_ONLY}" ]; then
# Note [Special build images]
Expand Down Expand Up @@ -78,6 +81,8 @@ jobs:
docker commit "$id" ${COMMIT_DOCKER_IMAGE}
time docker push ${COMMIT_DOCKER_IMAGE}
fi
- store_artifacts:
path: /home/circleci/project/dist

pytorch_linux_test:
<<: *pytorch_params
Expand Down
11 changes: 9 additions & 2 deletions .jenkins/pytorch/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,11 @@ else
# set only when building other architectures
# only use for "python setup.py install" line
if [[ "$BUILD_ENVIRONMENT" != *ppc64le* && "$BUILD_ENVIRONMENT" != *clang* ]]; then
WERROR=1 python setup.py install
WERROR=1 python setup.py bdist_wheel
python -mpip install dist/*.whl
else
python setup.py install
python setup.py bdist_wheel
python -mpip install dist/*.whl
fi

# TODO: I'm not sure why, but somehow we lose verbose commands
Expand All @@ -232,6 +234,11 @@ else
fi

assert_git_not_dirty
# Copy ninja build logs to dist folder
mkdir -p dist
if [ -f build/.ninja_log ]; then
cp build/.ninja_log dist
fi

# Build custom operator tests.
CUSTOM_OP_BUILD="$PWD/../custom-op-build"
Expand Down