OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

[4/n] Update vulkan test path (#62519)

Browse Source 
Summary:
Fixes https://github.com/pytorch/pytorch/issues/62380

* update `test_vulkan` function to call wheel install folder {sitepackages}/torch instead of build/ folder
* add `IN_WHEEL_TEST` to limit the change for `pytorch_linux_test` only
* add symbolic link for shared libraries which are called by the tests (this is a bit hacky and should be fixed the rpath before compiling -- similar to https://github.com/pytorch/pytorch/blob/master/.jenkins/pytorch/test.sh#L204-L208).

Pull Request resolved: https://github.com/pytorch/pytorch/pull/62519

Test Plan: check if all ci workflows pass

Reviewed By: walterddr

Differential Revision: D30072859

Pulled By: tktrungna

fbshipit-source-id: bf75faabf6b6070c366571a74834a1f58b2549d3
This commit is contained in:
tktrungna 2021-08-03 10:12:15 -07:00 committed by Facebook GitHub Bot
parent ddd916c210
commit 1630b86dd6
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.circleci/config.yml generated
View File

@ -644,6 +644,7 @@ jobs:
set -ex
export SCRIBE_GRAPHQL_ACCESS_TOKEN="${SCRIBE_GRAPHQL_ACCESS_TOKEN}"
export JOB_BASE_NAME="$CIRCLE_JOB"
export IN_WHEEL_TEST=1
${PARALLEL_FLAGS}
cd workspace
EOL

1
.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml
View File

@ -174,6 +174,7 @@ jobs:
set -ex
export SCRIBE_GRAPHQL_ACCESS_TOKEN="${SCRIBE_GRAPHQL_ACCESS_TOKEN}"
export JOB_BASE_NAME="$CIRCLE_JOB"
export IN_WHEEL_TEST=1
${PARALLEL_FLAGS}
cd workspace
EOL

20
.jenkins/pytorch/test.sh
View File

@ -277,12 +277,30 @@ test_libtorch() {
test_vulkan() {
if [[ "$BUILD_ENVIRONMENT" == *vulkan-linux* ]]; then
if [[ -n "$IN_WHEEL_TEST" ]]; then
echo "Testing vulkan with the install folder"
# Rename the build folder when running test to ensure it
# is not depended on the folder
mv "$BUILD_DIR" "$BUILD_RENAMED_DIR"
TEST_BASE_DIR="$TORCH_TEST_DIR"
ln -sf "$TORCH_LIB_DIR"/libtorch* "$TEST_BASE_DIR"
ln -sf "$TORCH_LIB_DIR"/libc10* "$TEST_BASE_DIR"
else
echo "Testing vulkan with the build folder"
TEST_BASE_DIR="$BUILD_BIN_DIR"
fi
export VK_ICD_FILENAMES=/var/lib/jenkins/swiftshader/build/Linux/vk_swiftshader_icd.json
# NB: the ending test_vulkan must match the current function name for the current
# test reporting process (in print_test_stats.py) to function as expected.
TEST_REPORTS_DIR=test/test-reports/cpp-vulkan/test_vulkan
mkdir -p $TEST_REPORTS_DIR
build/bin/vulkan_test --gtest_output=xml:$TEST_REPORTS_DIR/vulkan_test.xml
"$TEST_BASE_DIR"/vulkan_test --gtest_output=xml:$TEST_REPORTS_DIR/vulkan_test.xml
if [[ -n "$IN_WHEEL_TEST" ]]; then
# Restore the build folder to avoid any impact on other tests
mv "$BUILD_RENAMED_DIR" "$BUILD_DIR"
fi
fi
}