Commit 1577f8f9 authored by Alvarez, Gonzalo's avatar Alvarez, Gonzalo
Browse files

working on faster compilation

parent 67608c8e

lib/configure.pl

+29 −13
Original line number Diff line number Diff line
@@ -39,23 +39,28 @@ sub createMakefile 
	open($fh,">Makefile") or die "Cannot open Makefile for writing: $!\n";



	local *FH = $fh;

	my @units = ("MersenneTwister","Matrix","Mpi","ApplicationInfo","Concurrency",

	"ProgressIndicator","Tokenizer");

	my $combinedUnits = combine("",\@units,".o ");

	my $combinedUnits2 = combine("../src/",\@units,".cpp ");



	print FH<<EOF;

include Config.make

all: libpsimaglite.a

libpsimaglite.a: Makefile MersenneTwister.o Matrix.o Mpi.o

\tar rcs libpsimaglite.a MersenneTwister.o Matrix.o Mpi.o



MersenneTwister.o: ../src/MersenneTwister.cpp ../src/MersenneTwister.h Makefile

\t\$(CXX) \$(CPPFLAGS) -c ../src/MersenneTwister.cpp



Matrix.o: ../src/Matrix.cpp ../src/Matrix.h Makefile

\t\$(CXX) \$(CPPFLAGS) -c ../src/Matrix.cpp

libpsimaglite.a: Makefile $combinedUnits

\tar rcs libpsimaglite.a $combinedUnits

EOF



Mpi.o: ../src/Mpi.cpp ../src/Mpi.h Makefile

\t\$(CXX) \$(CPPFLAGS) -c ../src/Mpi.cpp

	foreach my $unit (@units) {

		print FH<<EOF;

$unit.o: ../src/$unit.cpp ../src/$unit.h Makefile

\t\$(CXX) \$(CPPFLAGS) -c ../src/$unit.cpp

EOF

	}



Makefile.dep: ../src/MersenneTwister.cpp

\t\$(CXX) \$(CPPFLAGS) -MM  ../src/MersenneTwister.cpp  > Makefile.dep

print FH<<EOF;

Makefile.dep: $combinedUnits2

\t\$(CXX) \$(CPPFLAGS) -MM  $combinedUnits2  > Makefile.dep



clean: Makefile.dep

\trm -f core* *.o *.dep *.a
@@ -68,4 +73,15 @@ EOF 
	print STDERR "File Makefile has been written\n";

}



sub combine

{

	my ($pre,$a,$post) = @_;

	my $n = scalar(@$a);

	my $buffer = "";

	for (my $i = 0; $i < $n; ++$i) {

		$buffer .= $pre.$a->[$i].$post;

	}



	return $buffer;

}

scripts/Make.pm

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ EOF 
	if (!$aux) {

		print FH<<EOF;

$what: $dotos

	\$(CXX) -o  $what $what.o \$(LDFLAGS)

	\$(CXX) -o  $what $dotos \$(LDFLAGS)

	\$(STRIP_COMMAND) $what



EOF

src/ApplicationInfo.h

+1 −12
Original line number Diff line number Diff line
@@ -118,18 +118,7 @@ private: 
	PsimagLite::String name_;

}; // class ApplicationInfo



std::ostream& operator<<(std::ostream& os,const ApplicationInfo& ai)

{

	os<<ai.getTimeDate();

	if (!ai.firstCall_) return os;

	os<<ai.name_<<" sizeof(SizeType)="<<sizeof(SizeType)<<"\n";

#ifdef USE_FLOAT

	os<<ai.name_<<" using float\n";

#else

	os<<ai.name_<<" using double\n";

#endif

	return os;

}

std::ostream& operator<<(std::ostream& os,const ApplicationInfo& ai);



} // namespace PsimagLite

src/Concurrency.h

+0 −4
Original line number Diff line number Diff line
@@ -220,10 +220,6 @@ private: 
	static MpiDisabledType mpiDisabled_;

};



SizeType Concurrency::mode = 0;

SizeType Concurrency::npthreads = 1;

MpiDisabled Concurrency::mpiDisabled_;



} // namespace PsimagLite



/*@}*/

src/ProgressIndicator.h

+0 −3
Original line number Diff line number Diff line
@@ -198,9 +198,6 @@ private: 
	SizeType rank_;

}; // ProgressIndicator



MemoryUsage ProgressIndicator::musage_;

OstringStream ProgressIndicator::buffer_;

bool ProgressIndicator::bufferActive_ = false;

} // namespace PsimagLite



/*@}*/