diff options
| author | Luca Antiga <luca.antiga@orobix.com> | 2018-03-19 21:09:43 +0100 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@mit.edu> | 2018-03-19 16:09:43 -0400 |
| commit | 6f80023c29e0fb55f46a32c4931bc5d4ba749846 (patch) | |
| tree | 09b97c52201c1dc947e54091d1af98b7810e3f26 /.jenkins | |
| parent | cf2e1760490d369e93017b9425279b235c10772d (diff) | |
| download | pytorch-6f80023c29e0fb55f46a32c4931bc5d4ba749846.tar.gz pytorch-6f80023c29e0fb55f46a32c4931bc5d4ba749846.tar.bz2 pytorch-6f80023c29e0fb55f46a32c4931bc5d4ba749846.zip | |
Port ATen and JIT C++ tests to Catch2 (#5788)
This PR addresses #5648. In particular, following the discussion at #5648:
- it adds Catch as a submodule (https://github.com/catchorg/Catch2) in torch/aten/utils
- it ports all ATen tests to Catch
- it ports torch/csrc/jit/test_jit.cpp to Catch (libtorch only, Python build is unaffected)
Diffstat (limited to '.jenkins')
| -rwxr-xr-x | .jenkins/build.sh | 7 | ||||
| -rwxr-xr-x | .jenkins/test.sh | 14 |
2 files changed, 18 insertions, 3 deletions
diff --git a/.jenkins/build.sh b/.jenkins/build.sh index 4dda8e237c..cb09d0cff8 100755 --- a/.jenkins/build.sh +++ b/.jenkins/build.sh @@ -74,7 +74,7 @@ fi if [[ "$BUILD_ENVIRONMENT" != *cuda* ]]; then echo "Testing ATen" - time tools/run_aten_tests.sh + ( unset LD_PRELOAD; time tools/run_aten_tests.sh ) fi # Test C FFI plugins @@ -99,7 +99,8 @@ fi if [[ "$BUILD_ENVIRONMENT" == *pytorch-linux-xenial-cuda9-cudnn7-py3 ]] || \ [[ "$BUILD_ENVIRONMENT" == *pytorch-linux-trusty-py3.6-gcc7.2 ]]; then echo "Building libtorch with NO_PYTHON" - pushd tools/cpp_build || exit 1 - bash build_all.sh + LIBTORCH_INSTALL_PREFIX=`pwd`/../libtorch + pushd tools/cpp_build + bash build_all.sh "$LIBTORCH_INSTALL_PREFIX" || exit 1 popd fi diff --git a/.jenkins/test.sh b/.jenkins/test.sh index 7b6284dbac..9d293a06cf 100755 --- a/.jenkins/test.sh +++ b/.jenkins/test.sh @@ -65,3 +65,17 @@ rm -rf ninja pushd vision time python setup.py install popd + +if [[ "$BUILD_ENVIRONMENT" == *pytorch-linux-xenial-cuda9-cudnn7-py3 ]] || \ + [[ "$BUILD_ENVIRONMENT" == *pytorch-linux-trusty-py3.6-gcc7.2 ]]; then + echo "Testing libtorch with NO_PYTHON" + LIBTORCH_INSTALL_PREFIX=`pwd`/../libtorch + pushd tools/cpp_build + + if [[ "$BUILD_ENVIRONMENT" == *cuda* ]]; then + "$LIBTORCH_INSTALL_PREFIX"/bin/test_jit + else + "$LIBTORCH_INSTALL_PREFIX"/bin/test_jit "[cpu]" + fi + popd +fi |