[Matrix]: rename format conversion tools.

flashxio · Jan 16, 2016 · c15499a · c15499a
1 parent 4dbf356
commit c15499a
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 27 deletions.
diff --git a/matrix/CMakeLists.txt b/matrix/CMakeLists.txt
@@ -44,4 +44,4 @@ add_library(FMatrix STATIC
 if(ENABLE_TRILINOS)
 	subdirs(eigensolver)
 endif()
-subdirs(test)
+subdirs(utils)
diff --git a/matrix/Makefile b/matrix/Makefile
@@ -21,7 +21,7 @@ OMP_FLAG = -fopenmp
 CXXFLAGS += -DUSE_GZIP -I../include -I../libcommon -I../flash-graph $(OMP_FLAG)
 LDFLAGS += $(OMP_FLAG)
 
-all: libmatrix eigensolver test unit-test libmatrix-algs
+all: libmatrix eigensolver test unit-test libmatrix-algs utils
 
 libmatrix: $(OBJS)
 	rm -f libFMatrix.a
@@ -39,6 +39,9 @@ unit-test: libmatrix eigensolver
 eigensolver: libmatrix
 	$(MAKE) -C eigensolver
 
+utils: libmatrix
+	$(MAKE) -C utils
+
 clean:
 	rm -f *.d
 	rm -f *.o
@@ -48,5 +51,6 @@ clean:
 	$(MAKE) -C test clean
 	$(MAKE) -C unit-test clean
 	$(MAKE) -C eigensolver clean
+	$(MAKE) -C utils clean
 
 -include $(DEPS) 
diff --git a/matrix/test/CMakeLists.txt b/matrix/test/CMakeLists.txt
diff --git a/matrix/test/Makefile b/matrix/test/Makefile
@@ -23,7 +23,7 @@ LDFLAGS := $(OMP_FLAG) ../libmatrix-algs/libFMatrix-algs.a -L.. -lFMatrix -L../.
 LDFLAGS += -lz -lnuma -laio -lcblas #-lprofiler
 
 all: test-2d_multiply test-dense_matrix test-block_mv test-mem_vector	\
-	el2al al22d al2crs test-sort test-eigen test-dgemm rand_mat_gen test-algs
+	test-sort test-eigen test-dgemm rand_mat_gen test-algs
 
 trilinos: test-anasazi_eigen test-tpetra_multiply test-tpetra_MV_multiply
 
@@ -47,15 +47,6 @@ test-block_mv: test-block_mv.o ../libFMatrix.a ../eigensolver/libeigen.a
 test-dense_matrix: test-dense_matrix.o ../libFMatrix.a
 	$(CXX) -o test-dense_matrix test-dense_matrix.o $(LDFLAGS)
 
-el2al: el2al.o ../libFMatrix.a
-	$(CXX) -o el2al el2al.o $(LDFLAGS)
-
-al22d: al22d.o fg_utils.o ../libFMatrix.a
-	$(CXX) -o al22d al22d.o fg_utils.o $(LDFLAGS)
-
-al2crs: al2crs.o fg_utils.o ../libFMatrix.a
-	$(CXX) -o al2crs al2crs.o fg_utils.o $(LDFLAGS)
-
 test-sort: test-sort.o ../libFMatrix.a
 	$(CXX) -o test-sort test-sort.o $(LDFLAGS)
 

diff --git a/matrix/utils/CMakeLists.txt b/matrix/utils/CMakeLists.txt
@@ -0,0 +1,15 @@
+project (FlashGraph)
+
+include_directories("${PROJECT_SOURCE_DIR}")
+
+add_executable(el2fg el2fg.cpp)
+target_link_libraries(el2fg FMatrix graph safs common pthread numa aio cblas)
+
+add_executable(fg2fm fg2fm.cpp fg_utils.cpp)
+target_link_libraries(fg2fm FMatrix graph safs common pthread numa aio cblas)
+
+find_package(hwloc)
+if (hwloc_FOUND)
+	target_link_libraries(el2fg hwloc)
+	target_link_libraries(fg2fm hwloc)
+endif()
diff --git a/matrix/utils/Makefile b/matrix/utils/Makefile
@@ -0,0 +1,34 @@
+# Copyright 2016 Open Connectome Project (http://openconnecto.me)
+# Written by Da Zheng ([email protected])
+#
+# This file is part of FlashMatrix.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include ../../Makefile.common
+
+OMP_FLAG = -fopenmp
+CXXFLAGS += -I../../include -I../../libcommon -I../../flash-graph -I.. -I../eigensolver -I../libmatrix-algs $(OMP_FLAG)
+LDFLAGS := $(OMP_FLAG) ../libmatrix-algs/libFMatrix-algs.a -L.. -lFMatrix -L../../flash-graph -lgraph -L../../libsafs -lsafs -L../../libcommon -lcommon $(LDFLAGS)
+LDFLAGS += -lz -lnuma -laio -lcblas #-lprofiler
+
+all: el2fg fg2fm fg2crs
+
+el2fg: el2fg.o ../libFMatrix.a
+	$(CXX) -o el2fg el2fg.o $(LDFLAGS)
+
+fg2fm: fg2fm.o fg_utils.o ../libFMatrix.a
+	$(CXX) -o fg2fm fg2fm.o fg_utils.o $(LDFLAGS)
+
+fg2crs: fg2crs.o fg_utils.o ../libFMatrix.a
+	$(CXX) -o fg2crs fg2crs.o fg_utils.o $(LDFLAGS)
diff --git a/matrix/test/crs_header.h → matrix/utils/crs_header.h b/matrix/test/crs_header.h → matrix/utils/crs_header.h
diff --git a/matrix/test/el2al.cpp → matrix/utils/el2fg.cpp b/matrix/test/el2al.cpp → matrix/utils/el2fg.cpp
diff --git a/matrix/test/al2crs.cpp → matrix/utils/fg2crs.cpp b/matrix/test/al2crs.cpp → matrix/utils/fg2crs.cpp
diff --git a/matrix/test/al22d.cpp → matrix/utils/fg2fm.cpp b/matrix/test/al22d.cpp → matrix/utils/fg2fm.cpp
diff --git a/matrix/test/fg_utils.cpp → matrix/utils/fg_utils.cpp b/matrix/test/fg_utils.cpp → matrix/utils/fg_utils.cpp
diff --git a/matrix/test/fg_utils.h → matrix/utils/fg_utils.h b/matrix/test/fg_utils.h → matrix/utils/fg_utils.h