restore old singular_values program in addition to mpi one
This commit is contained in:
		
							
								
								
									
										14
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								Makefile
									
									
									
									
									
								
							@@ -8,7 +8,7 @@ SPECIAL_OPTIONS=-O3 -pg -funroll-loops -fno-inline
 | 
			
		||||
 | 
			
		||||
OPTIONS=-I../mps/include -L../mps/lib -pthread -m64 -std=gnu99 -D_GNU_SOURCE $(SPECIAL_OPTIONS)
 | 
			
		||||
 | 
			
		||||
all: singular_values special_element convert billiard_words
 | 
			
		||||
all: singular_values special_element singular_values_mpi convert billiard_words
 | 
			
		||||
 | 
			
		||||
convert: convert.hs
 | 
			
		||||
	ghc --make -dynamic convert.hs
 | 
			
		||||
@@ -17,13 +17,19 @@ billiard_words: billiard_words.hs
 | 
			
		||||
	ghc --make -dynamic billiard_words.hs
 | 
			
		||||
 | 
			
		||||
singular_values: singular_values.o coxeter.o mat.o
 | 
			
		||||
	mpicc $(OPTIONS) -o singular_values coxeter.o singular_values.o mat.o -lm -lgmp -lmps
 | 
			
		||||
	gcc $(OPTIONS) -o singular_values coxeter.o singular_values.o mat.o -lm -lgmp -lmps
 | 
			
		||||
 | 
			
		||||
singular_values_mpi: singular_values_mpi.o coxeter.o mat.o
 | 
			
		||||
	mpicc $(OPTIONS) -o singular_values_mpi coxeter.o singular_values_mpi.o mat.o -lm -lgmp -lmps
 | 
			
		||||
 | 
			
		||||
special_element: special_element.o coxeter.o linalg.o mat.o
 | 
			
		||||
	gcc $(OPTIONS) -o special_element coxeter.o linalg.o special_element.o mat.o -lm -lgmp -lmps -lgsl -lcblas
 | 
			
		||||
 | 
			
		||||
singular_values.o: singular_values.c $(HEADERS)
 | 
			
		||||
	mpicc $(OPTIONS) -c singular_values.c
 | 
			
		||||
	gcc $(OPTIONS) -c singular_values.c
 | 
			
		||||
 | 
			
		||||
singular_values_mpi.o: singular_values_mpi.c $(HEADERS)
 | 
			
		||||
	mpicc $(OPTIONS) -c singular_values_mpi.c
 | 
			
		||||
 | 
			
		||||
special_element.o: special_element.c $(HEADERS)
 | 
			
		||||
	gcc $(OPTIONS) -c special_element.c
 | 
			
		||||
@@ -38,4 +44,4 @@ mat.o: mat.c $(HEADERS)
 | 
			
		||||
	gcc $(OPTIONS) -c mat.c
 | 
			
		||||
 | 
			
		||||
clean:
 | 
			
		||||
	rm -f singular_values special_element coxeter.o linalg.o singular_values.o mat.o special_element.o convert.hi convert.o convert billiard_words.hi billiard_words.o billiard_words
 | 
			
		||||
	rm -f singular_values special_element singular_values_mpi coxeter.o linalg.o singular_values.o singular_values_mpi.o mat.o special_element.o convert.hi convert.o convert billiard_words.hi billiard_words.o billiard_words
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user