bringing the repo to 2014

Author: aydinbuluc

Doxyfile

@@ -0,0 +1,10 @@
+PROJECT_NAME = "Compressed Sparse Blocks"
+PROJECT_NUMBER = 1.2
+OUTPUT_DIRECTORY = doc
+OUTPUT_LANGUAGE = English
+EXTRACT_ALL = YES
+FILE_PATTERNS = *.cpp *.h
+RECURSIVE = YES
+PDF_HYPERLINKS = YES
+USE_PDFLATEX   = YES
+SOURCE_BROWSER	= YES

Makefile

@@ -1,12 +1,65 @@
+CILK = /opt/intel/composer_xe_2013.5.198/compiler
+INCADD = -I$(CILK)/include -I$(CILK)/examples/include
+LIBADD = -L$(CILK)/lib/intel64
+
 GCCOPT = -O2 -fno-rtti -fno-exceptions # -ftree-vectorize
 INTELOPT = -O2 -no-ipo -fno-rtti -fno-exceptions -parallel -restrict -std=c++11 -xAVX -no-prec-div #-fno-inline-functions
 DEB = -g -DNOBM -O0 -parallel -restrict -std=c++11 
 
+seqsym: sym_spmv_test.cpp csbsym.cpp csbsym.h utility.h friends.h SSEspmv.o
+	icpc -cilk-serialize $(INCADD) $(INTELOPT) -o seqsym sym_spmv_test.cpp SSEspmv.o
+
+parsym: sym_spmv_test.cpp csbsym.cpp csbsym.h utility.h friends.h SSEspmv.o
+	icpc $(INCADD) $(DEB) -o parsym sym_spmv_test.cpp SSEspmv.o 
+
+symanal: sym_spmv_test.cpp csbsym.cpp csbsym.h utility.h friends.h SSEspmv.o
+	icpc -DSTATS $(INCADD) $(INTELOPT) -o symanal sym_spmv_test.cpp SSEspmv.o -lcilkutil
+
+seqspmv: csb_spmv_test.cpp bicsb.cpp bicsb.h bmcsb.cpp bmcsb.h friends.h utility.h SSEspmv.o
+	icpc -cilk-serialize $(INCADD) $(INTELOPT) -o seqspmv csb_spmv_test.cpp SSEspmv.o
+
+parspmv: csb_spmv_test.cpp bicsb.cpp bicsb.h bmcsb.cpp bmcsb.h friends.h utility.h SSEspmv.o 
+	icpc $(INCADD) $(INTELOPT) -o parspmv csb_spmv_test.cpp SSEspmv.o
+
+parspmv_nobm: csb_spmv_test.cpp bicsb.cpp bicsb.h friends.h utility.h
+	icpc $(INCADD) $(INTELOPT) -DNOBM -o parspmv_nobm csb_spmv_test.cpp
+
+parspmvt: csb_spmvt_test.cpp bicsb.cpp bicsb.h utility.h friends.h
+	icpc $(INCADD) $(INTELOPT) -o parspmvt csb_spmvt_test.cpp
+
+both_d:	both_test.cpp bicsb.cpp bicsb.h utility.h friends.h
+	icpc $(INCADD) $(INTELOPT) -o both_d both_test.cpp
+
+both_s:	both_test.cpp bicsb.cpp bicsb.h utility.h friends.h
+	icpc $(INCADD) $(INTELOPT) -DSINGLEPRECISION -o both_s both_test.cpp
+
+spmm_dall:	spmm_test.cpp bicsb.cpp bicsb.h utility.h friends.h
+	for number in 4 8 12 16 24 32 40 48 56 64; do \
+		echo "icpc $(INCADD) $(INTELOPT) -DRHSDIM=$$number -o spmm_d$$number spmm_test.cpp"; \
+		icpc $(INCADD) $(INTELOPT) -DRHSDIM=$$number -o spmm_d$$number spmm_test.cpp; \
+	done;
+
+spmm_a:	spmm_test.cpp bicsb.cpp bicsb.h utility.h friends.h
+	icpc $(INCADD) $(INTELOPT) -DSINGLEPRECISION -S -fcode-asm -vec_report6 spmm_test.cpp
 
-seqspmv: csb_spmv_test.cpp bicsb.cpp bicsb.h friends.h utility.h 
-	g++ $(INCADD) $(GCCOPT) -o seqspmv csb_spmv_test.cpp 
+spmm_sall:	spmm_test.cpp bicsb.cpp bicsb.h utility.h friends.h
+	for number in 4 8 12 16 24 32 40 48 56 64; do \
+		echo "icpc $(INCADD) $(INTELOPT) -DSINGLEPRECISION -DRHSDIM=$$number -o spmm_s$$number spmm_test.cpp"; \
+		icpc $(INCADD) $(INTELOPT) -DSINGLEPRECISION -DRHSDIM=$$number -o spmm_s$$number spmm_test.cpp; \
+	done;
 
+SSEspmv.o: SSEspmv.cpp
+	g++ -DAMD $(GCCOPT) -march=amdfam10 -c SSEspmv.cpp	
 
 clean:	
 	rm -f seqspmv
+	rm -f seqsym
+	rm -f parspmv
+	rm -f parsym 
+	rm -f parspmvt
+	rm -f parspmv_nobm
+	for number in 8 16 24 32 40 48 56 64; do \
+		rm -f spmm_s$$number;\
+		rm -f spmm_d$$number;\
+	done;
 	rm -f *.o

README

@@ -5,9 +5,6 @@
 Author: Aydin Buluc, LBNL, [email protected]
 Date: 2/28/2014
 
-- The official release with better instructions for compilation/running is here: https://people.eecs.berkeley.edu/~aydin/csb/html/index.html
-- This github is to allow new development (i.e. OpenMP and OpenCilk porting, bringing the SpMM case vectorization to AVX2-AVX512)
-
 Classes
 -------