Merge pull request #14062 from tensor-tang/fix/jit/avx

panyx0718 · web-flow · commit 3cab25a563b2 · 2018-10-25T15:45:04.000+08:00
fix avx error
diff --git a/paddle/fluid/operators/math/jit_kernel_rnn.cc b/paddle/fluid/operators/math/jit_kernel_rnn.cc
@@ -136,6 +136,7 @@ static std::shared_ptr<const VActKernel<T>> GetActKernel(
   return nullptr;
 }
 
+#ifdef __AVX__
 template <jit::cpu_isa_t isa>
 static std::unique_ptr<AVXAct> GetAVXAct(const std::string& type) {
   if (type == "sigmoid") {
@@ -150,6 +151,7 @@ static std::unique_ptr<AVXAct> GetAVXAct(const std::string& type) {
   PADDLE_THROW("Not support type: %s", type);
   return nullptr;
 }
+#endif
 
 /* LSTM JitKernel */
 template <typename T, jit::cpu_isa_t isa, jit_block>

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ static std::shared_ptr<const VActKernel<T>> GetActKernel(`
`136`	`136`	`return nullptr;`
`137`	`137`	`}`
`138`	`138`
	`139`	`+#ifdef __AVX__`
`139`	`140`	`template <jit::cpu_isa_t isa>`
`140`	`141`	`static std::unique_ptr<AVXAct> GetAVXAct(const std::string& type) {`
`141`	`142`	`if (type == "sigmoid") {`
`@@ -150,6 +151,7 @@ static std::unique_ptr<AVXAct> GetAVXAct(const std::string& type) {`
`150`	`151`	`PADDLE_THROW("Not support type: %s", type);`
`151`	`152`	`return nullptr;`
`152`	`153`	`}`
	`154`	`+#endif`
`153`	`155`
`154`	`156`	`/* LSTM JitKernel */`
`155`	`157`	`template <typename T, jit::cpu_isa_t isa, jit_block>`