Merge pull request #7754 from Tech-XCorp/amesos2AddCholmodIntTest

Amesos2: Add test for Cholmod Int

packages/amesos2/test/solvers/CMakeLists.txt

@@ -178,7 +178,7 @@ IF (${PACKAGE_NAME}_ENABLE_Cholmod)
 
   TRIBITS_COPY_FILES_TO_BINARY_DIR(SolverTestCholmodFiles
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    SOURCE_FILES cholmod_test.xml
+    SOURCE_FILES cholmod_test.xml cholmod_int_test.xml
     EXEDEPS Solver_Test
     )
 
@@ -191,6 +191,15 @@ IF (${PACKAGE_NAME}_ENABLE_Cholmod)
     COMM serial mpi
     )
 
+  TRIBITS_ADD_TEST(
+    Solver_Test
+    NAME Cholmod_Int_Solver_Test
+    ARGS "--xml-params=cholmod_int_test.xml --filedir=${CMAKE_CURRENT_BINARY_DIR}/../matrices/ --multiple-solves --refactor"
+    STANDARD_PASS_OUTPUT
+    NUM_MPI_PROCS 1
+    COMM serial mpi
+    )
+
   IF (KokkosKernels_ENABLE_SUPERNODAL_SPTRSV AND KokkosKernels_ENABLE_TPL_CHOLMOD)
 
     TRIBITS_COPY_FILES_TO_BINARY_DIR(SolverTestCholmodTRSVFiles

packages/amesos2/test/solvers/cholmod_int_test.xml

@@ -0,0 +1,64 @@
+<ParameterList name="test_params">
+
+  <ParameterList name="tacho_test.mtx">
+
+    <!-- Optional parameter, used for debugging and for deciding whether to use epetra -->
+    <Parameter name="complex" type="bool" value="false"/>
+    <ParameterList name="Cholmod">
+
+      <!-- Test Epetra objects -->
+      <ParameterList name="epetra">
+        <!-- A non-list entry for epetra denotes a default run, name, type, and value are arbitrary -->
+        <Parameter name="defaultrun" type="bool" value="true"/>
+      </ParameterList>
+
+      <!-- Next test Tpetra objects -->
+      <ParameterList name="tpetra">
+        <!-- these `run*' sublist names are arbitrary -->
+        <!-- The `Node' parameter is not yet supported -->
+        <!-- Cholmod does not support float yet. -->
+
+        <ParameterList name="run_double_int">
+          <Parameter name="Scalar" type="string" value="double"/>
+          <Parameter name="LocalOrdinal" type="string" value="int"/>
+          <Parameter name="GlobalOrdinal" type="string" value="int"/>
+        </ParameterList>
+        <ParameterList name="run_double_long_long">
+          <Parameter name="Scalar" type="string" value="double"/>
+          <Parameter name="LocalOrdinal" type="string" value="int"/>
+          <Parameter name="GlobalOrdinal" type="string" value="long long int"/>
+        </ParameterList>
+      </ParameterList>
+
+        <!-- Next test Kokkos objects -->
+      <ParameterList name="kokkos">
+        <!-- these `run*' sublist names are arbitrary -->
+        <!-- Cholmod does not support float yet. -->
+        <ParameterList name="run_serial_double">
+          <Parameter name="Scalar" type="string" value="double"/>
+          <Parameter name="LocalOrdinal" type="string" value="int"/>
+          <Parameter name="Node" type="string" value="serial"/>
+        </ParameterList>
+        <ParameterList name="run_cuda_double">
+          <Parameter name="Scalar" type="string" value="double"/>
+          <Parameter name="LocalOrdinal" type="string" value="int"/>
+          <Parameter name="Node" type="string" value="cuda"/>
+        </ParameterList>
+        <ParameterList name="run_cudauvmoff_double">
+          <Parameter name="Scalar" type="string" value="double"/>
+          <Parameter name="LocalOrdinal" type="string" value="int"/>
+          <Parameter name="Node" type="string" value="cudauvmoff"/>
+        </ParameterList>
+      </ParameterList>
+
+      <ParameterList name="solver_params">
+        <Parameter name="CholmodInt" type="bool" value="true"/>
+        <!-- Cholmod cannot be GPU for int, though we can still run inputs with GPU as in the above tests,-->
+        <Parameter name="useGPU" type="int" value="0"/>
+      </ParameterList>
+    </ParameterList> <!-- end Cholmod -->
+    <ParameterList name="all_solver_params">
+    </ParameterList>
+  </ParameterList> <!-- end cholmod_test.mtx -->
+
+</ParameterList>