/[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 6483 by jfenwick, Wed Jan 25 02:56:14 2017 UTC revision 6485 by jfenwick, Wed Jan 25 04:45:38 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"
129         fix_rank_a=(2,)         aranks=(2,)
130         fix_rank_b=(1,2)           self.generate_binary_matrixlike_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, aranks=aranks)
        self.generate_binary_matrixlike_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, fix_rank_a=fix_rank_a, fix_rank_b=fix_rank_b)  
131     #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++     #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
132     def test_transpose_matrix_mult_combined(self):     def test_transpose_matrix_mult_combined(self):
133         opstring='transposed_matrix_mult(a,b)'         opstring='transposed_matrix_mult(a,b)'
134         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
135         oraclecheck="numpy.dot(numpy.transpose(refa),refb)"         oraclecheck="numpy.dot(numpy.transpose(refa),refb)"
136         opname="transposed_matrix_mult"         opname="transposed_matrix_mult"
137         fix_rank_a=(2,)         aranks=(2,)
138         fix_rank_b=(1,2)         self.generate_binary_matrixlike_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, aranks=aranks)
139         self.generate_binary_matrixlike_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, fix_rank_a=fix_rank_a, fix_rank_b=fix_rank_b)     #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
140       def test_matrix_transposed_mult_combined(self):
141           opstring='matrix_transposed_mult(a,b)'
142           misccheck=None   # How to work out what the result of type should be
143           oraclecheck="numpy.dot(refa,numpy.transpose(refb))"
144           opname="matrix_transposed_mult"
145           aranks=(2,)
146           self.generate_binary_matrixlike_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, aranks=aranks)      
147       #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
148       def test_tensor_mult_combined(self):
149           opstring='tensor_mult(a,b)'
150           misccheck=None   # How to work out what the result of type should be
151           oraclecheck="numpy.dot(refa,refb) if getRank(refa)==2 else numpy.tensordot(refa,refb)"
152           opname="tensor_mult"
153           aranks=(2,4)
154           self.generate_binary_matrixlike_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, aranks=aranks)
155        #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
156       def test_transposed_tensor_mult_combined(self):
157           opstring='transposed_tensor_mult(a,b)'
158           misccheck=None   # How to work out what the result of type should be
159           oraclecheck="numpy.dot(transpose(refa),refb) if getRank(refa)==2 else numpy.tensordot(transpose(refa),refb)"
160           opname="transposed_tensor_mult"
161           aranks=(2,4)
162           self.generate_binary_matrixlike_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, aranks=aranks)
163        #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
164       #def test_tensor_transposed_mult_combined(self):
165           #opstring='tensor_transposed_mult(a,b)'
166           #misccheck=None   # How to work out what the result of type should be
167           #oraclecheck="numpy.dot(refa,transpose(refb)) if getRank(refa)==2 else numpy.tensordot(refa,transpose(refb))"
168           #opname="tensor_tranposed_mult"
169           #aranks=(2,4)
170           #self.generate_binary_matrixlike_operation_test_batch_large(opstring, misccheck, oraclecheck, opname, aranks=aranks)        

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

  ViewVC Help
Powered by ViewVC 1.1.26