Merge pull request #95 from TimmyLiu/develop

some typo fixes

Author: Timmy

src/client/clfunc_xtrsm.hpp

@@ -151,7 +151,7 @@ class xTrsm : public clblasFunc
 
         if (order_option == 0)
         {
-            order_ = clblasRowMajor;
+			buffer_.order_ = clblasRowMajor;
             buffer_.b_num_vectors_ = M;
             if (ldb == 0)
             {
@@ -548,7 +548,7 @@ class xTrsm : public clblasFunc
 
         if (order_option == 0)
         {
-            order_ = clblasRowMajor;
+			buffer_.order_ = clblasRowMajor;
             buffer_.b_num_vectors_ = M;
             if (ldb == 0)
             {
@@ -654,7 +654,7 @@ void
 xTrsm<cl_float>::
 xTrsm_Function(bool flush)
 {
-    clblasStrsm(order_, buffer_.side_, buffer_.uplo_,
+    clblasStrsm(buffer_.order_, buffer_.side_, buffer_.uplo_,
                      buffer_.trans_a_, buffer_.diag_,
                      buffer_.m_, buffer_.n_, buffer_.alpha_,
                      buffer_.buf_a_, buffer_.offA_, buffer_.lda_,
@@ -671,7 +671,7 @@ void
 xTrsm<cl_double>::
 xTrsm_Function(bool flush)
 {
-    clblasDtrsm(order_, buffer_.side_, buffer_.uplo_,
+	clblasDtrsm(buffer_.order_, buffer_.side_, buffer_.uplo_,
                      buffer_.trans_a_, buffer_.diag_,
                      buffer_.m_, buffer_.n_, buffer_.alpha_,
                      buffer_.buf_a_, buffer_.offA_, buffer_.lda_,
@@ -688,7 +688,7 @@ void
 xTrsm<cl_float2>::
 xTrsm_Function(bool flush)
 {
-    clblasCtrsm(order_, buffer_.side_, buffer_.uplo_,
+	clblasCtrsm(buffer_.order_, buffer_.side_, buffer_.uplo_,
                      buffer_.trans_a_, buffer_.diag_,
                      buffer_.m_, buffer_.n_, buffer_.alpha_,
                      buffer_.buf_a_, buffer_.offA_, buffer_.lda_,
@@ -705,7 +705,7 @@ void
 xTrsm<cl_double2>::
 xTrsm_Function(bool flush)
 {
-    clblasZtrsm(order_, buffer_.side_, buffer_.uplo_,
+	clblasZtrsm(buffer_.order_, buffer_.side_, buffer_.uplo_,
                      buffer_.trans_a_, buffer_.diag_,
                      buffer_.m_, buffer_.n_, buffer_.alpha_,
                      buffer_.buf_a_, buffer_.offA_, buffer_.lda_,

src/library/blas/functor/hawaii.cc

@@ -101,7 +101,7 @@ clblasSgemmFunctor * FunctorSelectorHawaii::select_sgemm_specific(clblasSgemmFun
   //TODO: the logic below is complicated; Needs cleanup;
   clblasSgemmFunctor * functor;
   bool Not_TT = ((args.transA==clblasNoTrans && args.transB==clblasTrans ) || ( args.transA==clblasNoTrans && args.transB==clblasNoTrans ) || ( args.transA==clblasTrans && args.transB==clblasNoTrans ));
-  bool SmallMatrices = args.M/6*args.N/6<100*100  || (args.M/6*args.N/6<180*180 && (args.M%32!=0||args.N%32!=0) || ((args.M%64!=0 && args.N%64!=0 && args.M<1900 &&args.N<1900 ) && (args.M%96!=0 && args.N%96!=0 && args.M<1900 &&args.N<1900 ));
+  bool SmallMatrices = (args.M / 6 * args.N / 6 < 100 * 100) || (args.M / 6 * args.N / 6 < 180 * 180 && (args.M % 32 != 0 || args.N % 32 != 0)) || ((args.M % 64 != 0 && args.N % 64 != 0 && args.M < 1900 && args.N < 1900) && (args.M % 96 != 0 && args.N % 96 != 0 && args.M < 1900 && args.N < 1900));
   bool SmallMatricesMod32= (SmallMatrices && (args.M%32==0&&args.N%32==0)) ;
   SmallMatricesMod32 = SmallMatricesMod32&&Not_TT&&args.K % 16 == 0;
   //SmallMatrices= false;