summaryrefslogtreecommitdiff
path: root/caffe2/image
diff options
context:
space:
mode:
authorJames Reed <jamesreed@fb.com>2019-03-08 15:33:34 -0800
committerFacebook Github Bot <facebook-github-bot@users.noreply.github.com>2019-03-08 15:38:41 -0800
commit1d26a3ae7eb0e1427955e45a821661d558a5b3ff (patch)
treedacfd7a7d818c8f853c7dd5a08a4e08ca38d7e13 /caffe2/image
parent0955592243b8ed122a14ab6c1cd8e02ed49ec6d9 (diff)
downloadpytorch-1d26a3ae7eb0e1427955e45a821661d558a5b3ff.tar.gz
pytorch-1d26a3ae7eb0e1427955e45a821661d558a5b3ff.tar.bz2
pytorch-1d26a3ae7eb0e1427955e45a821661d558a5b3ff.zip
Open registration for c10 thread pool (#17788)
Summary: 1. Move ATen threadpool & open registration mechanism to C10 2. Move the `global_work_queue` to use this open registration mechanism, to allow users to substitute in their own Pull Request resolved: https://github.com/pytorch/pytorch/pull/17788 Reviewed By: zdevito Differential Revision: D14379707 Pulled By: jamesr66a fbshipit-source-id: 949662d0024875abf09907d97db927f160c54d45
Diffstat (limited to 'caffe2/image')
-rw-r--r--caffe2/image/image_input_op.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/caffe2/image/image_input_op.h b/caffe2/image/image_input_op.h
index f3f603cd55..bd3fca17be 100644
--- a/caffe2/image/image_input_op.h
+++ b/caffe2/image/image_input_op.h
@@ -7,14 +7,14 @@
#include <iostream>
#include <algorithm>
+#include "c10/core/thread_pool.h"
#include "caffe2/core/common.h"
#include "caffe2/core/db.h"
+#include "caffe2/image/transform_gpu.h"
+#include "caffe2/operators/prefetch_op.h"
#include "caffe2/proto/caffe2_legacy.pb.h"
#include "caffe2/utils/cast.h"
#include "caffe2/utils/math.h"
-#include "caffe2/utils/thread_pool.h"
-#include "caffe2/operators/prefetch_op.h"
-#include "caffe2/image/transform_gpu.h"
namespace caffe2 {