/[escript]/trunk/escriptcore/test/python/test_util_binary_new.py
ViewVC logotype

Diff of /trunk/escriptcore/test/python/test_util_binary_new.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 6482 by jfenwick, Tue Jan 24 07:45:33 2017 UTC revision 6483 by jfenwick, Wed Jan 25 02:56:14 2017 UTC
# Line 126  class Test_util_binary_new(Test_util_val Line 126  class Test_util_binary_new(Test_util_val
126         misccheck=None   # How to work out what the result of type should be         misccheck=None   # How to work out what the result of type should be
127         oraclecheck="numpy.dot(refa,refb)"         oraclecheck="numpy.dot(refa,refb)"
128         opname="matrix_mult"         opname="matrix_mult"
        noshapemismatch=False  
        permitscalarmismatch=True  
        capcombinedrank=False  
129         fix_rank_a=(2,)         fix_rank_a=(2,)
130         fix_rank_b=(2,)  # You would think this should be (1,2)         fix_rank_b=(1,2)  
131         self.generate_binary_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, no_shape_mismatch=noshapemismatch, permit_scalar_mismatch=permitscalarmismatch, cap_combined_rank=capcombinedrank, fix_rank_a=fix_rank_a, fix_rank_b=fix_rank_b)                   self.generate_binary_matrixlike_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, fix_rank_a=fix_rank_a, fix_rank_b=fix_rank_b)
        # We still need to test the MatrixVec case  
        # The current difficulty is that the generator makes rank 1 objects of size 1 not size 2  
132     #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++     #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
133     def test_transpose_matrix_mult_combined(self):     def test_transpose_matrix_mult_combined(self):
134         opstring='transposed_matrix_mult(a,b)'         opstring='transposed_matrix_mult(a,b)'
135         misccheck=None   # How to work out what the result of type should be         misccheck=None   # How to work out what the result of type should be
136         oraclecheck="numpy.dot(numpy.transpose(refa),refb)"         oraclecheck="numpy.dot(numpy.transpose(refa),refb)"
137         opname="transposed_matrix_mult"         opname="transposed_matrix_mult"
        noshapemismatch=False  
        permitscalarmismatch=True  
        capcombinedrank=False  
138         fix_rank_a=(2,)         fix_rank_a=(2,)
139         fix_rank_b=(2,)  # You would think this should be (1,2)         fix_rank_b=(1,2)
140         self.generate_binary_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, no_shape_mismatch=noshapemismatch, permit_scalar_mismatch=permitscalarmismatch, cap_combined_rank=capcombinedrank, fix_rank_a=fix_rank_a, fix_rank_b=fix_rank_b)                   self.generate_binary_matrixlike_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, fix_rank_a=fix_rank_a, fix_rank_b=fix_rank_b)
        # We still need to test the MatrixVec case  
        # The current difficulty is that the generator makes rank 1 objects of size 1 not size 2  

Legend:
Removed from v.6482  
changed lines
  Added in v.6483

  ViewVC Help
Powered by ViewVC 1.1.26