From db761fa0d0ef581eb3de1fc9df4b6ed26f1e69ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20=C5=9Euhan?= Date: Thu, 28 Feb 2019 15:05:29 -0800 Subject: [PATCH 1/2] Pin torchvision to the last working version --- .circleci/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/build.sh b/.circleci/build.sh index 04a093109d73..a74f619a3aaa 100755 --- a/.circleci/build.sh +++ b/.circleci/build.sh @@ -73,6 +73,7 @@ rm -rf vision # PyTorch CI git clone https://github.com/pytorch/vision --quiet pushd vision +git reset --hard c7191d56ff639f3abd17339f9f0b47ded7a28417 # python setup.py install with a tqdm dependency is broken in the # Travis Python nightly (but not in latest Python nightlies, so # this should be a transient requirement...) From d388f515957533f4a3a037f997272652fbe83722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20=C5=9Euhan?= Date: Thu, 28 Feb 2019 14:19:48 -0800 Subject: [PATCH 2/2] Remove patch which landed --- torch_patches/17361.diff | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 torch_patches/17361.diff diff --git a/torch_patches/17361.diff b/torch_patches/17361.diff deleted file mode 100644 index f525d6a22f9c..000000000000 --- a/torch_patches/17361.diff +++ /dev/null @@ -1,20 +0,0 @@ -commit e3c6267429670a6935d50050289b5819b536b488 -Author: Alex Şuhan -Date: Wed Feb 20 19:13:45 2019 -0800 - - Fix Python device type property for XLA and MSNPU - -diff --git a/torch/csrc/tensor/python_tensor.cpp b/torch/csrc/tensor/python_tensor.cpp -index 54bda656d..b833d4bbe 100644 ---- a/torch/csrc/tensor/python_tensor.cpp -+++ b/torch/csrc/tensor/python_tensor.cpp -@@ -392,6 +392,9 @@ Device getDevice(const at::Tensor& tensor) { - if (tensor.is_cuda()) { - return at::Device(at::DeviceType::CUDA, tensor.get_device()); - } -+ if (tensor.type_id() == XLATensorId() || tensor.type_id() == MSNPUTensorId()) { -+ return at::Device(computeDeviceType(tensor.type_id()), tensor.get_device()); -+ } - return at::Device(at::DeviceType::CPU); - } - }} // namespace torch::tensors