Automatic update of fbcode/foxi to 2bcc4064c90e87b9638615c733485f07c47b7558 (#18070)

Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/18070

Previous import was d1f45b1a2b1585d0e9bc65e15e463db344fc3ff6

Included changes:
- **[2bcc406](https://github.com/houseroad/foxi/commit/2bcc406)**: Merge pull request #7 from jackm321/tracing_fixes <Jack Montgomery>
- **[c39033c](https://github.com/houseroad/foxi/commit/c39033c)**: Fixes for tracing events <Jack Montgomery>
- **[50912cf](https://github.com/houseroad/foxi/commit/50912cf)**: Merge pull request #5 from jackm321/add_trace_events <Jack Montgomery>
- **[ba2fdcb](https://github.com/houseroad/foxi/commit/ba2fdcb)**: Merge pull request #5 from jackm321/add_trace_events <Jack Montgomery>
- **[7d42b12](https://github.com/houseroad/foxi/commit/7d42b12)**: address comments <Jack Montgomery>
- **[dcabd8d](https://github.com/houseroad/foxi/commit/dcabd8d)**: Add trace events interface <Jack Montgomery>

Reviewed By: houseroad

Differential Revision: D14483201

fbshipit-source-id: f51ed869c9a89521079df89903abc0ac0a45ac7b

diff --git a/caffe2/operators/onnxifi_op.cc b/caffe2/operators/onnxifi_op.cc
index 03a4289..88e3662 100644 (file)
--- a/caffe2/operators/onnxifi_op.cc
+++ b/caffe2/operators/onnxifi_op.cc
@@ -172,7 +172,8 @@ bool OnnxifiOp<float, CPUContext>::RunOnDevice() {
             input_desc_.data(),
             output_desc_.size(),
             output_desc_.data(),
-            &output_fence),
+            &output_fence,
+            /* traceEvents */ nullptr),
         ONNXIFI_STATUS_SUCCESS);
     CAFFE_ENFORCE_EQ(
         lib_->onnxWaitEvent(output_fence.event), ONNXIFI_STATUS_SUCCESS);

diff --git a/caffe2/operators/onnxifi_op.h b/caffe2/operators/onnxifi_op.h
index e3f2ba5..fc649a1 100644 (file)
--- a/caffe2/operators/onnxifi_op.h
+++ b/caffe2/operators/onnxifi_op.h
@@ -230,7 +230,8 @@ class OnnxifiOp final : public Operator<Context> {
       const onnxTensorDescriptorV1*,
       uint32_t,
       const onnxTensorDescriptorV1*,
-      onnxMemoryFenceV1*);
+      onnxMemoryFenceV1*,
+      onnxTraceEventList*);
 #endif
 
   // We bind the op input/output by position while ONNXIFI binds input/output by

diff --git a/third_party/foxi b/third_party/foxi
index d1f45b1..2bcc406 160000 (submodule)
--- a/third_party/foxi
+++ b/third_party/foxi
@@ -1 +1 @@
-Subproject commit d1f45b1a2b1585d0e9bc65e15e463db344fc3ff6
+Subproject commit 2bcc4064c90e87b9638615c733485f07c47b7558