Move ideep singleton registration to ATen from C2. (#18335)

Summary:
Since we are going to add ideep to ATen, and ATen is always compiled, it makes sense to have the registration in ATen rather than C2.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/18335

Reviewed By: bddppq

Differential Revision: D14578652

Pulled By: gchanan

fbshipit-source-id: 4d77fcfc21a362b21d5291a127498aa722548873

diff --git a/aten/src/ATen/native/mkldnn/IDeepRegistration.cpp b/aten/src/ATen/native/mkldnn/IDeepRegistration.cpp
new file mode 100644 (file)
index 0000000..ffbcdf7
--- /dev/null
+++ b/aten/src/ATen/native/mkldnn/IDeepRegistration.cpp
@@ -0,0 +1,8 @@
+#include <ATen/Config.h>
+
+#if AT_MKLDNN_ENABLED()
+
+// needs to be included only once in library.
+#include <ideep_pin_singletons.hpp>
+
+#endif // AT_MKLDNN_ENALBED()

diff --git a/caffe2/ideep/utils/ideep_register.cc b/caffe2/ideep/utils/ideep_register.cc
index a352238..1932adc 100644 (file)
--- a/caffe2/ideep/utils/ideep_register.cc
+++ b/caffe2/ideep/utils/ideep_register.cc
@@ -1,7 +1,7 @@
 #include <caffe2/core/event_cpu.h>
 #include <caffe2/core/operator.h>
 #include <caffe2/proto/caffe2_pb.h>
-#include <ideep_pin_singletons.hpp>
+#include <ideep/tensor.hpp>
 #include "ideep_context.h"
 
 namespace at {