Commits

Hong Zhang committed 61e7b37

syn src/mat/examples/tests/makefile with master, otherwise, get conflict when merging to master

  • Participants
  • Parent commits 8949adf

Comments (0)

Files changed (1)

File src/mat/examples/tests/makefile

 	   if (${DIFF} output/ex94_1.out ex94_1.tmp) then true; \
 	   else echo ${PWD} ; echo "Possible problem with ex94_scalable1, diffs above \n========================================="; fi; \
 	   ${RM} -f ex94_1.tmp
-runex94_2:
-	-@${MPIEXEC} -n 3 ./ex94 -f0 ${DATAFILESPATH}/matrices/medium -f1 ${DATAFILESPATH}/matrices/medium -matptap_sparseaxpy 0> ex94_2.tmp 2>&1; \
-	   if (${DIFF} output/ex94_1.out ex94_2.tmp) then true; \
-	   else echo ${PWD} ; echo "Possible problem with ex94_2, diffs above \n========================================="; fi; \
-	   ${RM} -f ex94_2.tmp
-runex94_2_spaxpy1:
-	-@${MPIEXEC} -n 3 ./ex94 -f0 ${DATAFILESPATH}/matrices/medium -f1 ${DATAFILESPATH}/matrices/medium -matptap_sparseaxpy 1> ex94_2.tmp 2>&1; \
-	   if (${DIFF} output/ex94_1.out ex94_2.tmp) then true; \
-	   else echo ${PWD} ; echo "Possible problem with ex94_2, diffs above \n========================================="; fi; \
-	   ${RM} -f ex94_2.tmp
-runex94_2_spaxpy2:
-	-@${MPIEXEC} -n 3 ./ex94 -f0 ${DATAFILESPATH}/matrices/medium -f1 ${DATAFILESPATH}/matrices/medium -matptap_sparseaxpy 2> ex94_2.tmp 2>&1; \
-	   if (${DIFF} output/ex94_1.out ex94_2.tmp) then true; \
-	   else echo ${PWD} ; echo "Possible problem with ex94_2, diffs above \n========================================="; fi; \
-	   ${RM} -f ex94_2.tmp
 runex94_2_matmatmult:
-	-@${MPIEXEC} -n 3 ./ex94 -f0 ${DATAFILESPATH}/matrices/medium -f1 ${DATAFILESPATH}/matrices/medium -matptap_sparseaxpy 0 -matmatmult_scalable> ex94_2.tmp 2>&1; \
+	-@${MPIEXEC} -n 3 ./ex94 -f0 ${DATAFILESPATH}/matrices/medium -f1 ${DATAFILESPATH}/matrices/medium -matptap_scalable 0 -matmatmult_scalable> ex94_2.tmp 2>&1; \
 	   if (${DIFF} output/ex94_1.out ex94_2.tmp) then true; \
 	   else echo ${PWD} ; echo "Possible problem with ex94_2_matmatmult, diffs above \n========================================="; fi; \
 	   ${RM} -f ex94_2.tmp
 	   ${DIFF} output/ex161.out ex161.tmp || echo ${PWD} "\nPossible problem with ex161, diffs above \n========================================="; \
 	   ${RM} -f ex161.tmp
 runex161_2:
-	-@${MPIEXEC} -n 1 ./ex161 -matmattransmult_color > ex161.tmp 2>&1; \
+	-@${MPIEXEC} -n 1 ./ex161 -matmattransmult_color -mat_no_inode > ex161.tmp 2>&1; \
 	   ${DIFF} output/ex161.out ex161.tmp || echo ${PWD} "\nPossible problem with ex161_2, diffs above \n========================================="; \
 	   ${RM} -f ex161.tmp
+runex161_3:
+	-@${MPIEXEC} -n 1 ./ex161 -matmattransmult_color -mat_no_inode -matden2sp_brows 3 > ex161.tmp 2>&1; \
+	   ${DIFF} output/ex161.out ex161.tmp || echo ${PWD} "\nPossible problem with ex161_3, diffs above \n========================================="; \
+	   ${RM} -f ex161.tmp
+runex161_4:
+	-@${MPIEXEC} -n 1 ./ex161 -matmattransmult_color -mat_no_inode -A_matrart_via matmattransposemult > ex161.tmp 2>&1; \
+	   ${DIFF} output/ex161.out ex161.tmp || echo ${PWD} "\nPossible problem with ex161_4, diffs above \n========================================="; \
+	   ${RM} -f ex161.tmp
+runex161_5:
+	-@${MPIEXEC} -n 1 ./ex161 -matmattransmult_color -mat_no_inode -A_matrart_via coloring_rart > ex161.tmp 2>&1; \
+	   ${DIFF} output/ex161.out ex161.tmp || echo ${PWD} "\nPossible problem with ex161_5, diffs above \n========================================="; \
+	   ${RM} -f ex161.tmp
 
 runex163:
 	-@${MPIEXEC} -n 1 ./ex163 -f ${DATAFILESPATH}/matrices/small > ex163.tmp 2>&1; \
 	   ${DIFF} output/ex163.out ex163.tmp || echo ${PWD} "\nPossible problem with ex163, diffs above \n========================================="; \
-	   ${RM} -f ex161.tmp
+	   ${RM} -f ex163.tmp
 runex163_2:
 	-@${MPIEXEC} -n 3 ./ex163 -f ${DATAFILESPATH}/matrices/small > ex163.tmp 2>&1; \
 	   ${DIFF} output/ex163.out ex163.tmp || echo ${PWD} "\nPossible problem with ex163_2, diffs above \n========================================="; \
-	   ${RM} -f ex161.tmp
+	   ${RM} -f ex163.tmp
 
 runex164:
 	-@${MPIEXEC} -n 1 ./ex164  > ex164.tmp 2>&1; \
                                  ex138.PETSc ex138.rm ex139.PETSc runex139 ex139.rm ex141.PETSc runex141 ex141.rm \
                                  ex151.PETSc runex151 ex151.rm \
                                  ex159.PETSc runex159 runex159_nest ex159.rm \
-                                 ex160.PETSc runex160 ex160.rm  ex161.PETSc runex161 runex161_2 ex161.rm  \
+                                 ex160.PETSc runex160 ex160.rm  ex161.PETSc runex161 runex161_2 runex161_3 runex161_4 runex161_5 ex161.rm \
                                  ex163.PETSc runex163 runex163_2 ex163.rm ex164.PETSc runex164 ex164.rm
 TESTEXAMPLES_C_X	       = ex2.PETSc runex2 ex2.rm ex7.PETSc runex7 ex7.rm \
                                  ex12.PETSc runex12 runex12_2 runex12_3 runex12_4 ex12.rm ex13.PETSc runex13 ex13.rm \
 TESTEXAMPLES_DATAFILESPATH     = ex40.PETSc runex40 ex40.rm ex42.PETSc runex42 \
                                  ex42.rm  ex41.PETSc ex41.rm ex47.PETSc ex47.rm ex53.PETSc runex53 ex53.rm \
                                  ex94.PETSc runex94_matmatmult runex94_matmatmult_2 runex94_scalable0 runex94_scalable1 \
-                                 runex94_2 runex94_2_spaxpy1 runex94_2_spaxpy2 runex94_2_matmatmult runex94_2_mattransposematmult ex94.rm \
+                                 runex94_2_matmatmult runex94_2_mattransposematmult ex94.rm \
                                  ex136.PETSc runex136 runex136_2 runex136_3 \
                                  runex136_4 runex136_5 runex136_6 ex136.rm  ex140.PETSc runex140 runex140_2 runex140_3 runex140_4 ex140.rm \
                                  ex100.PETSc runex100 ex100.rm ex125.PETSc runex125 ex125.rm