merged precision-independent files from trisolve branch

xiaoyeli · Oct 15, 2018 · 700ef8b · 700ef8b
1 parent c88a53f
commit 700ef8b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,6 +34,7 @@ env:
   - TEST_NUMBER=12"
   - TEST_NUMBER=13"
   - TEST_NUMBER=14"
+  - TEST_NUMBER=15"
 
 git:
   depth: 1
@@ -93,7 +94,7 @@ install:
     cmake .. \
     -DTPL_PARMETIS_INCLUDE_DIRS="$TRAVIS_BUILD_DIR/installDir/parmetis-4.0.3/metis/include;$TRAVIS_BUILD_DIR/installDir/parmetis-4.0.3/install/include" \
     -DTPL_PARMETIS_LIBRARIES="$TRAVIS_BUILD_DIR/installDir/parmetis-4.0.3/install/lib/libparmetis.so" \
-    -DCMAKE_C_FLAGS="-std=c11 -DPRNTlevel=1 -DPROFlevel=1 -DDEBUGlevel=0" \
+    -DCMAKE_C_FLAGS="-std=c11 -DPRNTlevel=1 -DPROFlevel=1 -DDEBUGlevel=1" \
     -DCMAKE_CXX_FLAGS="-Ofast -std=c++11 -DAdd_ -DRELEASE" \
     -DTPL_BLAS_LIBRARIES="$BLAS_LIB" \
     -DTPL_LAPACK_LIBRARIES="$LAPACK_LIB" \

diff --git a/.travis_tests.sh b/.travis_tests.sh
@@ -24,5 +24,6 @@ case "${TEST_NUMBER}" in
 12) mpirun "-n" "4" "$EXAMPLE_FOLDER/pzdrive1" "-r" "2" "-c" "2" "$DATA_FOLDER/cg20.cua" ;;
 13) mpirun "-n" "4" "$EXAMPLE_FOLDER/pzdrive2" "-r" "2" "-c" "2" "$DATA_FOLDER/cg20.cua" ;;
 14) mpirun "-n" "4" "$EXAMPLE_FOLDER/pzdrive3" "-r" "2" "-c" "2" "$DATA_FOLDER/cg20.cua" ;;
+15) mpirun "-n" "4" "$EXAMPLE_FOLDER/pddrive_ABglobal" "-r" "2" "-c" "2" "$DATA_FOLDER/big.rua" ;;
 *) printf "${RED} ###GC: Unknown test\n" ;;
 esac
diff --git a/SRC/pdgssvx.c b/SRC/pdgssvx.c
@@ -1396,12 +1396,13 @@ pdgssvx(superlu_dist_options_t *options, SuperMatrix *A,
             /* Inside this routine, SolveInitialized is set to YES.
 	       For repeated call to pdgssvx(), no need to re-initialilze
 	       the Solve data & communication structures, unless a new
-	       factorization with Fact == DOFACT or SamePattern is asked for. */	
+	       factorization with Fact == DOFACT or SamePattern is asked for. */
 	}
-	
+
 	if ( options->DiagInv==YES && (options->SolveInitialized == NO || (options->SolveInitialized == YES && Fact == SamePattern_SameRowPerm))) {
 	pdCompute_Diag_Inv(n, LUstruct, grid, stat, info);
-	}	 
+	}
+
 
     // #pragma omp parallel  
     // {  	

diff --git a/SRC/pzgssvx.c b/SRC/pzgssvx.c
@@ -1402,11 +1402,13 @@ pzgssvx(superlu_dist_options_t *options, SuperMatrix *A,
 	       For repeated call to pzgssvx(), no need to re-initialilze
 	       the Solve data & communication structures, unless a new
 	       factorization with Fact == DOFACT or SamePattern is asked for. */
-	} 
+	}
+
 	if ( options->DiagInv==YES && (options->SolveInitialized == NO || (options->SolveInitialized == YES && Fact == SamePattern_SameRowPerm))) {
 	pzCompute_Diag_Inv(n, LUstruct, grid, stat, info);
-	}	
-
+	}
+
+
     // #pragma omp parallel  
     // {  	
 	// #pragma omp master