Revert D23236088: [pytorch][PR] [caffe2] adds Cancel to SafeDequeueBlobsOp and SafeEnqueueBlobsOp

Mike Ruberry · facebook-github-bot · commit b6f4bb0a703d · 2020-09-16T23:32:50.000-07:00
Test Plan: revert-hammer Differential Revision: D23236088 (0ccc38b) Original commit changeset: daa90d9ee324 fbshipit-source-id: 933c7deab177250075683a9bea143ac37f16a598
diff --git a/caffe2/python/hypothesis_test.py b/caffe2/python/hypothesis_test.py
@@ -10,7 +10,7 @@
 from hypothesis import assume, given, settings, HealthCheck
 import hypothesis.strategies as st
 import unittest
-import threading
+import os
 
 from caffe2.python import core, workspace, tt_core, dyndep
 import caffe2.python.hypothesis_test_util as hu
@@ -2697,61 +2697,5 @@ def histogram(X):
 
 
 
-    @settings(max_examples=1, deadline=None)
-    @given(
-        queue_capacity=st.integers(2, 2),
-        time_sleep=st.integers(5, 10),
-        num_blobs_to_equeue=st.integers(1, 1),
-        num_blobs_to_dequeue=st.integers(2, 2),
-    )
-    def test_safe_dequeue_blob__raises_exception_when_hang(
-        self,
-        queue_capacity,
-        time_sleep,
-        num_blobs_to_equeue,
-        num_blobs_to_dequeue,
-    ):
-        r"""
-        Tests SafeDequeueBlobsOp being cancellable.
-
-        Create a queue with the number of BlobsQueue less than the number
-        SafeDequeueBlobs to cause the hanging behavior when running the Net.
-
-        Then call cancel from the previous sleeping thread to ensure exception
-        is raised.
-        """
-
-        def _net_instance_cancel(net_instance):
-            time.sleep(time_sleep)
-            net_instance.cancel()
-
-        init_net = core.Net("init_net")
-        init_net.Proto().type = "deferrable_async_scheduling"
-
-        queue = init_net.CreateBlobsQueue(
-            [],
-            "queue_name",
-            capacity=queue_capacity,
-            num_blobs=num_blobs_to_equeue,
-        )
-
-        ws = workspace.Workspace()
-        ws.create_net(init_net).run()
-
-        net = core.Net("net")
-        net.Proto().type = "deferrable_async_scheduling"
-
-        blobs = net.SafeDequeueBlobs([queue], num_blobs_to_dequeue)
-
-        net_instance = ws.create_net(net)
-
-        t = threading.Thread(target=_net_instance_cancel, args=[net_instance])
-        t.start()
-
-        with self.assertRaises(Exception):
-            net_instance.run()
-            t.join()
-
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/caffe2/queue/queue_ops.h b/caffe2/queue/queue_ops.h
@@ -113,12 +113,6 @@ class SafeEnqueueBlobsOp final : public Operator<Context> {
         1, !status, Output(size)->template mutable_data<bool>(), &context_);
     return true;
   }
-
-  void Cancel() override {
-    auto queue = Operator<Context>::Inputs()[0]
-                     ->template Get<std::shared_ptr<BlobsQueue>>();
-    queue->close();
-  }
 };
 
 template <typename Context>
@@ -198,12 +192,6 @@ class SafeDequeueBlobsOp final : public Operator<Context> {
     return true;
   }
 
-  void Cancel() override {
-    auto queue = Operator<Context>::Inputs()[0]
-                     ->template Get<std::shared_ptr<BlobsQueue>>();
-    queue->close();
-  }
-
  private:
   int numRecords_;
   std::vector<Blob> blobs_;
