Commit 37001518 authored by wangmu0701's avatar wangmu0701

Revert "Revert "little tweaks""

parent 4982a7cc
*.o
*.Po
*.Plo
*.lo
*.Po
*.a
*.exe
*.la
*.lai
*.lo
*.o
*.so
*.a
*.exe
build
.svn
*~
*.bak*
.deps/
.dirstamp
.libs/
.svn/
/ColPack
/INSTALL
/Makefile
/Makefile.in
/aclocal.m4
/ar-lib
/autom4te.cache/
/build
/compile
/config.guess
/config.h
/config.h.in
/config.log
/config.status
/config.sub
/configure
/depcomp
/install-sh
/libtool
/ltmain.sh
/m4/
/missing
/stamp-h1
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
COLPACK_COMMON_FLAGS = $(EXTRA_FLAGS) -O3
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
COLPACK_COMMON_FLAGS = $(EXTRA_FLAGS) -O3
INCLUDES = $(COLPACK_COMMON_FLAGS) \
AM_CPPFLAGS = $(COLPACK_COMMON_FLAGS) \
-I$(top_srcdir)/Main \
-I$(top_srcdir)/Utilities \
-I$(top_srcdir)/BipartiteGraphPartialColoring \
......@@ -17,8 +17,7 @@ endif
LDADD = libColPack.la
AM_DEFAULT_SOURCE_EXT = .cpp
noinst_bin_PROGRAMS = ColPack
noinst_bindir = $(abs_top_builddir)/progs
noinst_PROGRAMS = ColPack
lib_LTLIBRARIES = libColPack.la
pkginclude_HEADERS = \
Utilities/CoutLock.h Utilities/command_line_parameter_processor.h \
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
/Basic/Generate_seed_matrix_for_Hessian
/Basic/Generate_seed_matrix_for_Jacobian
/Basic/color_bipartite_graph_using_BipartiteGraphBicoloringInterface
/Basic/color_bipartite_graph_using_BipartiteGraphPartialColoringInterface
/Basic/color_graph_using_GraphColoringInterface
/Matrix_Compression_and_Recovery/ADIC/01_Column_compression_and_recovery_for_Jacobian_return_ADIC_Format
/Matrix_Compression_and_Recovery/ADOL-C/01_Column_compression_and_recovery_for_Jacobian_return_Row_Compressed_Format
/Matrix_Compression_and_Recovery/ADOL-C/02_Column_compression_and_recovery_for_Jacobian_return_Coordinate_Format
/Matrix_Compression_and_Recovery/ADOL-C/03_Column_compression_and_recovery_for_Jacobian_return_Sparse_Solvers_Format
/Matrix_Compression_and_Recovery/ADOL-C/04_Row_compression_and_recovery_for_Jacobian_return_Row_Compressed_Format
/Matrix_Compression_and_Recovery/ADOL-C/05_Compression_and_direct_recovery_for_Hessian_return_Row_Compressed_Format
/Matrix_Compression_and_Recovery/ADOL-C/06_Compression_and_direct_recovery_for_Hessian_return_Coordinate_Format
/Matrix_Compression_and_Recovery/ADOL-C/07_Compression_and_direct_recovery_for_Hessian_return_Sparse_Solvers_Format
/Matrix_Compression_and_Recovery/ADOL-C/08_Compression_and_indirect_recovery_for_Hessian_return_Row_Compressed_Format
/Matrix_Compression_and_Recovery/ADOL-C/09_Bidirectional_compression_and_recovery_for_Jacobian_return_Row_Compressed_Format
/Matrix_Compression_and_Recovery/ADOL-C/10_Column_compression_and_recovery_for_Jacobian_return_Row_Compressed_Format__unmanaged_usermem
/Matrix_Compression_and_Recovery/ADOL-C/11_Compression_and_direct_recovery_for_Hessian_return_Row_Compressed_Format__unmanaged_usermem
/Matrix_Compression_and_Recovery/ADOL-C/12_Bidirectional_compression_and_recovery_for_Jacobian_return_Row_Compressed_Format__unmanaged_usermem
/Matrix_Compression_and_Recovery/CSR_input/01_Column_compression_and_recovery_for_Jacobian_CSR_input_return_Row_Compressed_Format
/Matrix_Compression_and_Recovery/SMB/sparse_jac_hess
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -67,7 +67,7 @@ int main()
double** J;
//double* s;
//int p_H_dir, p_H_indir;
int tape_stats[11];
size_t tape_stats[11];
int num;
FILE *fp_JP;
......@@ -143,12 +143,12 @@ int main()
//return 1;
tapestats(tag_c,tape_stats); // reading of tape statistics
printf("\n independents %d\n",tape_stats[0]);
printf(" dependents %d\n",tape_stats[1]);
printf(" operations %d\n",tape_stats[5]);
printf(" buffer size %d\n",tape_stats[4]);
printf(" maxlive %d\n",tape_stats[2]);
printf(" valstack size %d\n\n",tape_stats[3]);
printf("\n independents %ld\n",(long)tape_stats[0]);
printf(" dependents %ld\n",(long)tape_stats[1]);
printf(" operations %ld\n",(long)tape_stats[5]);
printf(" buffer size %ld\n",(long)tape_stats[4]);
printf(" maxlive %ld\n",(long)tape_stats[2]);
printf(" valstack size %ld\n\n",(long)tape_stats[3]);
//------------------------------------------------------------------------------------
......@@ -360,7 +360,8 @@ void printmatint(char* kette, int n, int m, int** M)
void printmatint_c(char* kette, int m,unsigned int** M)
{ int i,j;
{ int i;
unsigned int j;
printf("%s \n",kette);
for (i=0;i<m;i++)
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -74,7 +74,11 @@ int mm_read_unsymmetric_sparse(const char *fname, int *M_, int *N_, int *nz_,
for (i=0; i<nz; i++)
{
fscanf(f, "%d %d %lg\n", &I[i], &J[i], &val[i]);
if (fscanf(f, "%d %d %lg\n", &I[i], &J[i], &val[i]) != 3)
{
fprintf(stderr, "error: mm read error\n");
return -1;
}
I[i]--; /* adjust from 1-based to 0-based */
J[i]--;
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File mode changed from 100755 to 100644
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment