Merge pull request #268 from qq332982511/developing

compile developing

Author: LittleMaer

saber/funcs/impl/cuda/vender_lstm.cpp

@@ -171,7 +171,7 @@ create(const std::vector<DataTensor*>& inputs,
     _y_desc.reset(new cudnn::TensorDescriptors<DataDtype>(
                      offset_after_sort,
     {batch_size, _hidden_size * lstm_param.num_direction, 1},
-    {_hiden_size  * lstm_param.num_direction, 1, 1}));
+    {_hidden_size  * lstm_param.num_direction, 1, 1}));
 
     Shape in_dim = inputs[0]->valid_shape();
     Shape in_stride = inputs[0]->get_stride();

test/saber/cuda/test_saber_func_attension_lstm.cpp

@@ -8,7 +8,9 @@
 #include "saber_types.h"
 #include "saber/funcs/timer.h"
 #include "saber/funcs/impl/cuda/saber_attension_lstm.h"
+#ifdef USE_X86_PLACE
 #include "saber/funcs/impl/x86/saber_attension_lstm.h"
+#endif
 #include "saber/funcs/attension_lstm.h"
 #include "stdio.h"
 
@@ -153,7 +155,7 @@ void test_saber_attension_lstm(int sequence_size = 2, int batch_size = 1, int wo
     //t1.end(ctx_dev);
     //LOG(INFO) << "!!cudnn lstm :" << test_iter << " cudnn test, total time: "
     //         << t1.get_average_ms()/test_iter;
-#ifdef TEST_X86
+#if defined(TEST_X86)&&defined(USE_X86_PLACE)
     LstmParam<TensorHf4> h_lstm_param(&h_weight,
                                     &h_bias,
                                     nullptr,
@@ -222,8 +224,9 @@ TEST(TestSaberFuncNV, test_func_saber_lstm) {
 int main(int argc, const char** argv) {
     // initial logger
     //logger::init(argv[0]);
-//#ifdef TEST_X86
+#if defined(TEST_X86)&&defined(USE_X86_PLACE)
     Env<X86>::env_init();
+#endif
 //#else
     Env<NV>::env_init();
 //#endif

test/saber/cuda/test_saber_func_lstm.cpp

@@ -114,7 +114,7 @@ void test_saber_lstm(int sequence_size = 2, int batch_size = 1, int word_size =
     t1.end(ctx_dev);
     LOG(INFO) << "!!cudnn lstm :" << test_iter << " cudnn test, total time: "
              << t1.get_average_ms();
-#ifdef TEST_X86
+#if defined(TEST_X86) &&defined(USE_X86_PLACE)
     Lstm<X86, AK_FLOAT, AK_FLOAT, AK_FLOAT, NCHW, NCHW, NCHW> x86_lstm;
     LstmParam<TensorHf4> h_lstm_param(&host_weight, 
                                     &host_bias, 
@@ -181,9 +181,9 @@ TEST(TestSaberFuncNV, test_func_saber_lstm) {
 int main(int argc, const char** argv) {
     // initial logger
     //logger::init(argv[0]);
-//#ifdef TEST_X86
+#if defined(TEST_X86) &&defined(USE_X86_PLACE)
     Env<X86>::env_init();
-//#else
+#endif
     Env<NV>::env_init();
 //#endif