Menu
▾
▴
[csipc2-commits] SF.net SVN: csipc2: [1517] trunk
|
From: <csi...@li...> - 2008-05-28 12:38:39
|
Revision: 1517
http://csipc2.svn.sourceforge.net/csipc2/?rev=1517&view=rev
Author: warcamel
Date: 2008-05-28 05:38:35 -0700 (Wed, 28 May 2008)
Log Message:
-----------
- changed little in sourcecode to little to mention here
- added Makefile.in to ignore-list
- removed anjuta project files
- removed custom run.sh scripts
- removed custom Makefile's
Modified Paths:
--------------
trunk/src/cluster/ccd/ccd.c
trunk/src/cluster/ccd/ccd_config.c
trunk/src/cluster/ccd/ccd_networking.c
trunk/src/cluster/ccd/ccd_worker.c
Removed Paths:
-------------
trunk/doc/frontend.Doxyfile.in
trunk/src/cluster/csi_dbtool/Makefile
trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta
trunk/src/cluster/csi_dbtool/run.sh
trunk/src/cluster/database/Makefile
trunk/src/cluster/database/main.anjuta
trunk/src/cluster/feature_extraction/experimental/Makefile
trunk/src/cluster/feature_extraction/experimental/main.anjuta
trunk/src/cluster/feature_extraction/experimental/run.sh
Property Changed:
----------------
trunk/
trunk/doc/
trunk/src/
trunk/src/cluster/
trunk/src/cluster/ccd/
trunk/src/cluster/ccd/man1/
trunk/src/cluster/csi_dbtool/
trunk/src/cluster/database/
trunk/src/cluster/database/man1/
trunk/src/cluster/feature_extraction/
trunk/src/cluster/feature_extraction/experimental/
trunk/src/cluster/feature_extraction/fingerprint/
trunk/src/cluster/feature_extraction/fingerprint/man1/
trunk/src/cluster/feature_extraction/fingerprint/mindtct/
trunk/src/cluster/template_matching/
trunk/src/cluster/template_matching/bozorth3/
trunk/src/shared/
trunk/src/tests/
trunk/src/tests/ccd_connection/
trunk/src/tests/ccd_connection/man1/
trunk/src/tests/performance/
trunk/src/tests/performance/speed_iris/
trunk/src/tests/unit/
trunk/src/tests/unit/cluster/
trunk/src/tests/unit/cluster/template_matching/
trunk/src/tests/unit/shared/
trunk/src/tools/
trunk/src/tools/fingerprint_ga/
trunk/src/tools/fingerprint_testbed/
trunk/src/tools/fingerprint_testbed/man1/
trunk/src/tools/management_gui/
trunk/src/tools/misc_dev/
trunk/src/tools/misc_dev/man1/
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- autom4te.cache
aclocal.m4
configure
depcomp
install-sh
missing
config.status
.project
.cproject
.settings
bin
build
+ autom4te.cache
aclocal.m4
configure
depcomp
install-sh
missing
config.status
.project
.cproject
.settings
bin
build
Makefile.in
config.h.in
Property changes on: trunk/doc
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/doc/frontend.Doxyfile.in
===================================================================
--- trunk/doc/frontend.Doxyfile.in 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/doc/frontend.Doxyfile.in 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,251 +0,0 @@
-#
-# (C)Copyright 2008 CSI PC2 Project
-#
-# This file is part of the CSI PC2 software.
-#
-# The CSI PC2 software is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 2 of the
-# License, or (at your option) any later version.
-#
-# The CSI PC2 software is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the CSI PC2 software. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-
-# Doxyfile 1.5.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = "CSI:PC2 --- Frontend"
-PROJECT_NUMBER = 0.3
-OUTPUT_DIRECTORY = csi-frontend/
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class" "The $name widget" "The $name file" is provides specifies contains represents a an the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-QT_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-BUILTIN_STL_SUPPORT = NO
-CPP_CLI_SUPPORT = NO
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = YES
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = YES
-HIDE_UNDOC_CLASSES = YES
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = YES
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST = YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = $(top_srcdir)/src/frontend $(top_srcdir)/src/shared
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.c *.cpp *.h *.hpp *.C *.C++ *.H *.H++
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS = *cltifa_apix1.* *irisCapture.* *irisCaptureDlg.* *resource.h *stdafx.* *Resource.h *gui.h *gui.cpp *RandomIrisCode* */localhost.h */WebService.h
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-HTML_DYNAMIC_SECTIONS = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = YES
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = YES
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = YES
-PAPER_TYPE = a4
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = YES
-USE_PDFLATEX = YES
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = YES
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = NO
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = YES
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = YES
-CALLER_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-MAX_DOT_GRAPH_DEPTH = 1000
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = YES
Property changes on: trunk/src
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster
___________________________________________________________________
Name: svn:ignore
- aclocal.m4
configure.in
autom4te.cache
+ aclocal.m4
configure.in
autom4te.cache
Makefile.in
Property changes on: trunk/src/cluster/ccd
___________________________________________________________________
Name: svn:ignore
- ccd
bin
include
lib
+ ccd
bin
include
lib
Makefile.in
Modified: trunk/src/cluster/ccd/ccd.c
===================================================================
--- trunk/src/cluster/ccd/ccd.c 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/ccd/ccd.c 2008-05-28 12:38:35 UTC (rev 1517)
@@ -53,7 +53,7 @@
* EXIT_FAILURE on fail
*/
int main(int argc, char **argv) {
- pid_t pid;
+// pid_t pid;
int res, tmp_size;
config_t *config = new_config();
Modified: trunk/src/cluster/ccd/ccd_config.c
===================================================================
--- trunk/src/cluster/ccd/ccd_config.c 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/ccd/ccd_config.c 2008-05-28 12:38:35 UTC (rev 1517)
@@ -155,7 +155,7 @@
* EXIT_FAILURE on fail
*/
int load_mpi(config_t *config){
- int32_t i, max_tries = MPI_MAX_TRIES;
+ int32_t max_tries = MPI_MAX_TRIES;
int last_size;
/* Get ID and Size in MPI_COMM_WORLD . */
Modified: trunk/src/cluster/ccd/ccd_networking.c
===================================================================
--- trunk/src/cluster/ccd/ccd_networking.c 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/ccd/ccd_networking.c 2008-05-28 12:38:35 UTC (rev 1517)
@@ -253,7 +253,6 @@
char *buffer;
frontend_data_t frontend_data, *messagebuffer;
network_message_t network_message;
- int tmp_client_socket;
messagebuffer = network_message.message + sizeof(long);
@@ -347,6 +346,11 @@
if (frontend_data.finger.extractmode != EXTRACT_FALSE) {
switch(frontend_data.finger.job){
+ case JOB_NULL:
+ case JOB_SHUTDOWN:
+ case JOB_EXTRACT_ALL:
+ case JOB_STATUS:
+ break;
case JOB_MATCH_FINGER:
case JOB_MATCH_FINGER_CLUSTER:
case JOB_MATCH_FINGER_FILTERBANK:
Modified: trunk/src/cluster/ccd/ccd_worker.c
===================================================================
--- trunk/src/cluster/ccd/ccd_worker.c 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/ccd/ccd_worker.c 2008-05-28 12:38:35 UTC (rev 1517)
@@ -128,7 +128,7 @@
int run_worker(config_t *rem_config) {
frontend_data_t frontend_data, *messagebuffer;
network_message_t network_message;
- int client_id, job_id, res;
+ int client_id, res;
char result[MAX_LINE];
csi_timer_t *timer;
char *time_str;
@@ -207,7 +207,7 @@
plog(MSG_ERR, "IPC message queue already exists.\n");
} else if(res < 0) {
plog(MSG_ERR, "could not attach IPC message queue.\n");
- config->running == false;
+ config->running = false;
} else {
config->network_message_queue = res;
plog(MSG_DBG, "IPC message queue %d attached.\n", config->network_message_queue);
Property changes on: trunk/src/cluster/ccd/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/csi_dbtool
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/src/cluster/csi_dbtool/Makefile
===================================================================
--- trunk/src/cluster/csi_dbtool/Makefile 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/csi_dbtool/Makefile 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,78 +0,0 @@
-#
-# Module : csi dbtool
-# Maintainer : Dominic Eschweiler, Dom...@cs...
-#
-
-#BIN_TARGET = /mnt/a/globalcluster/bin/
-BIN_TARGET = ./
-#CC = gcc
-CC = mpicc
-CFLAGS = -g -O3 -fomit-frame-pointer -pipe -W -I$(HOME)/IM/include/ -I../../shared/ -I../feature_extraction/fingerprint/
-INCFLAGS =
-#LDFLAGS = -Wl,-rpath,/usr/local/lib -lm
-LDFLAGS = -L$(HOME)/IM/lib/ -lMagick -lWand -lm -lz -lfreetype -lfontconfig
-
-OBJECTS = database.o database_ext.o db_helpers.o csi_dbtool.o
-OBJECTS2 = service.o normalize.o direction.o thining.o corepoint_detection.o minutia_extraction.o cluster_template.o filterbank_wrapper.o feat_ext_fingerprint.o average_dist.o
-
-all: csi_dbtool
-
-csi_dbtool: $(OBJECTS) $(OBJECTS2)
- $(CC) -o $(BIN_TARGET)csi_dbtool $(OBJECTS) $(OBJECTS2) filterbank.o $(LDFLAGS) $(LIBS)
-
-
-##---DB-Stuff-------------------------------------------------------
-csi_dbtool.o: csi_dbtool.c
- $(CC) $(CFLAGS) -c csi_dbtool.c -o csi_dbtool.o
-
-database.o: ../database/database.c ../database/database.h
- $(CC) $(CFLAGS) -c ../database/database.c -o database.o
-
-database_ext.o: ../database/database_ext.c ../database/database_ext.h
- $(CC) $(CFLAGS) -c ../database/database_ext.c -o database_ext.o
-
-db_helpers.o: ../database/db_helpers.c ../database/db_helpers.h
- $(CC) $(CFLAGS) -c ../database/db_helpers.c -o db_helpers.o
-
-
-##---Extraction-Stuff-----------------------------------------------
-
-ext_lib: $(OBJECTS2)
-
-feat_ext_fingerprint.o: ../feature_extraction/experimental/feat_ext_fingerprint.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/feat_ext_fingerprint.c -o feat_ext_fingerprint.o
-
-normalize.o: ../feature_extraction/experimental/01_normalize/normalize.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/01_normalize/normalize.c -o normalize.o
-
-direction.o: ../feature_extraction/experimental/02_direction/direction.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/02_direction/direction.c -o direction.o
-
-corepoint_detection.o: ../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c -o corepoint_detection.o
-
-thining.o: ../feature_extraction/experimental/04_thining/thining.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/04_thining/thining.c -o thining.o
-
-minutia_extraction.o: ../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c -o minutia_extraction.o
-
-cluster_template.o: ../feature_extraction/experimental/06_cluster_template/cluster_template.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/06_cluster_template/cluster_template.c -o cluster_template.o
-
-filterbank_wrapper.o: ../feature_extraction/experimental/07_filterbank/filterbank_wrapper.c
- $(CC) $(CFLAGS) -c ../feature_extraction/fingerprint/filterbank.c -o filterbank.o
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/07_filterbank/filterbank_wrapper.c -o filterbank_wrapper.o
-
-average_dist.o: ../feature_extraction/experimental/08_average_dist/average_dist.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/08_average_dist/average_dist.c -o average_dist.o
-
-service.o: ../feature_extraction/experimental/service.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/service.c -o service.o
-
-##------------------------------------------------------------------
-count:
- wc *.c *.h
-
-clean:
- rm -f *.o *.jpg main csi_dbtool *.c~ *.h~
Deleted: trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta
===================================================================
--- trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<anjuta>
- <plugin name="GBF Project Manager"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaProjectManager"/>
- <require group="Project"
- attribute="Supported-Project-Types"
- value="make"/>
- </plugin>
- <plugin name="Symbol Browser"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Location"
- value="anjuta-symbol-browser:SymbolBrowserPlugin"/>
- </plugin>
- <plugin name="Make Build System"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaBuildable"/>
- <require group="Build"
- attribute="Supported-Build-Types"
- value="make"/>
- </plugin>
-</anjuta>
Deleted: trunk/src/cluster/csi_dbtool/run.sh
===================================================================
--- trunk/src/cluster/csi_dbtool/run.sh 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/csi_dbtool/run.sh 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# (C)Copyright 2008 CSI PC2 Project
-#
-# This file is part of the CSI PC2 software.
-#
-# The CSI PC2 software is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 2 of the
-# License, or (at your option) any later version.
-#
-# The CSI PC2 software is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the CSI PC2 software. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-
-
-#DIRECTORY="/mnt/a/globalcluster/DB1_B"
-DIRECTORY="/home/data/uni/test"
-
-
-mpi()
-{
-mpdboot -n 1 -f mpd.hosts
-mpiexec -n $1 $2/csi_dbtool -c EXT_FINGER -i $DIRECTORY -o $DIRECTORY/db
-mpdallexit
-}
-
-dir=`pwd`
-
-echo -n "This is the base : "
-echo $dir
-case "$1" in
- "1" ) $dir/csi_dbtool -c EXT_FINGER -i $DIRECTORY -o $DIRECTORY/db -n 5;;
- [2-9] ) mpi $1 $dir ;;
- * ) echo "PLease give me the number of ranks" ;;
-esac
Property changes on: trunk/src/cluster/database
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/src/cluster/database/Makefile
===================================================================
--- trunk/src/cluster/database/Makefile 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/database/Makefile 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,34 +0,0 @@
-#
-# Module : database
-# Maintainer : Dominic Eschweiler, Dom...@cs...
-#
-
-#CC = gcc
-CC = mpicc
-CFLAGS = -g -O3
-OBJECTS = main.o database.o database_ext.o db_helpers.o
-OBJECTS2 = database.o database_ext.o db_helpers.o
-
-INCFLAGS =
-LDFLAGS = -Wl,-rpath,/usr/local/lib -lm
-LIBS =
-
-all: clean main database_ext.o
-
-main: $(OBJECTS)
- $(CC) $(CFLAGS) -o main $(OBJECTS) $(LDFLAGS) $(LIBS)
-
-database.o: database.c database.h
- $(CC) $(CFLAGS) -c database.c -o database.o
-
-database_ext.o: database_ext.c database_ext.h
- $(CC) $(CFLAGS) -c database_ext.c -o database_ext.o
-
-db_helpers.o: db_helpers.c db_helpers.h
- $(CC) $(CFLAGS) -c db_helpers.c -o db_helpers.o
-
-count:
- wc *.c *.h
-
-clean:
- rm -f *.o *.jpg main csi_dbtool
Deleted: trunk/src/cluster/database/main.anjuta
===================================================================
--- trunk/src/cluster/database/main.anjuta 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/database/main.anjuta 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<anjuta>
- <plugin name="GBF Project Manager"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaProjectManager"/>
- <require group="Project"
- attribute="Supported-Project-Types"
- value="make"/>
- </plugin>
- <plugin name="Symbol Browser"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Location"
- value="anjuta-symbol-browser:SymbolBrowserPlugin"/>
- </plugin>
- <plugin name="Make Build System"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaBuildable"/>
- <require group="Build"
- attribute="Supported-Build-Types"
- value="make"/>
- </plugin>
-</anjuta>
Property changes on: trunk/src/cluster/database/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/feature_extraction
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/feature_extraction/experimental
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/src/cluster/feature_extraction/experimental/Makefile
===================================================================
--- trunk/src/cluster/feature_extraction/experimental/Makefile 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/feature_extraction/experimental/Makefile 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,98 +0,0 @@
-# normaly you need to use the Wand-config and all compiles fine.
-# in our case, the installed ImageMagick is to old, and you should use
-# the second of CFLAGS and LDFLAGS...
-
-CC = gcc
-
-CSI_DEF_PATH = ../../../shared/
-NBIS_FEAT_PATH = ../../feature_extraction/fingerprint/
-
-CFLAGS = -g -O3 -fomit-frame-pointer -pipe -Wall -W -I$(HOME)/IM/include/ -I$(CSI_DEF_PATH) -I$(NBIS_FEAT_PATH)
-LDFLAGS = -L$(HOME)/IM/lib/ -lMagick -lWand -lm -lz -lfreetype -ljpeg -lfontconfig -lXext -lexpat -lSM -lICE -lX11 -lXt -lpthread
-
-# flags for comiling on arminius
-#CFLAGS = -g -O3 -fomit-frame-pointer -pipe -Wall -W -I/pc2fs/work/group/pg-csi/magick6.3.3-bin/include/ -I$(CSI_DEF_PATH) -I$(NBIS_FEAT_PATH)
-#LDFLAGS = -L/pc2fs/work/group/pg-csi/magick6.3.3-bin/lib/ -lMagick -lWand -lm -lz -lfreetype -lfontconfig
-
-OBJECTS = service.o normalize.o direction.o thining.o corepoint_detection.o minutia_extraction.o cluster_template.o filterbank_wrapper.o average_dist.o
-
-SPLINT_FLAGS = -I$(CSI_DEF_PATH) -I$(NBIS_FEAT_PATH) -preproc +weak +boundswrite -nestcomment +ignorequals
-
-all: clean main
-#all: main
-
-main: $(OBJECTS) feat_ext_fingerprint.o main.o
- $(CC) -o main $(OBJECTS) feat_ext_fingerprint.o main.o filterbank.o $(LDFLAGS)
-
-feat_ext_fingerprint.o: $(OBJECTS)
- $(CC) $(CFLAGS) -c feat_ext_fingerprint.c -o feat_ext_fingerprint.o
-
-main.o: $(OBJECTS)
- $(CC) $(CFLAGS) -c main.c -o main.o
-
-normalize.o: 01_normalize/normalize.c 01_normalize/normalize.h
- $(CC) $(CFLAGS) -c 01_normalize/normalize.c -o normalize.o
-
-direction.o: 02_direction/direction.c 02_direction/direction.h
- $(CC) $(CFLAGS) -c 02_direction/direction.c -o direction.o
-
-corepoint_detection.o: 03_corepoint_detection/corepoint_detection.c 03_corepoint_detection/corepoint_detection.h
- $(CC) $(CFLAGS) -c 03_corepoint_detection/corepoint_detection.c -o corepoint_detection.o
-
-thining.o: 04_thining/thining.c 04_thining/thining.h
- $(CC) $(CFLAGS) -c 04_thining/thining.c -o thining.o
-
-minutia_extraction.o: 05_minutia_extraction/minutia_extraction.c 05_minutia_extraction/minutia_extraction.h
- $(CC) $(CFLAGS) -c 05_minutia_extraction/minutia_extraction.c -o minutia_extraction.o
-
-cluster_template.o: 06_cluster_template/cluster_template.c 06_cluster_template/cluster_template.h
- $(CC) $(CFLAGS) -c 06_cluster_template/cluster_template.c -o cluster_template.o
-
-filterbank_wrapper.o: 07_filterbank/filterbank_wrapper.c 07_filterbank/filterbank_wrapper.h
- $(CC) $(CFLAGS) -c ../fingerprint/filterbank.c -o filterbank.o
- $(CC) $(CFLAGS) -c 07_filterbank/filterbank_wrapper.c -o filterbank_wrapper.o
-
-average_dist.o: 08_average_dist/average_dist.c 08_average_dist/average_dist.h
- $(CC) $(CFLAGS) -c 08_average_dist/average_dist.c -o average_dist.o
-
-service.o: service.c service.h
- $(CC) $(CFLAGS) -c service.c -o service.o
-
-#------------------------------------------------------------------------------------------
-
-splint:
-# splint $(SPLINT_FLAGS) feat_ext_fingerprint.c
-# splint $(SPLINT_FLAGS) 01_normalize/normalize.c
-# splint $(SPLINT_FLAGS) 02_direction/direction.c
-# splint $(SPLINT_FLAGS) 03_corepoint_detection/corepoint_detection.c
-# splint $(SPLINT_FLAGS) 04_thining/thining.c
-# splint $(SPLINT_FLAGS) 05_minutia_extraction/minutia_extraction.c
- splint $(SPLINT_FLAGS) 06_cluster_template/cluster_template.c
-# splint $(SPLINT_FLAGS) 08_average_dist/average_dist.c
-
-memory_check: clean main
- valgrind --tool=memcheck --leak-check=full ./main
-
-#------------------------------------------------------------------------------------------
-
-clean:
- rm -f *.o main *.jpg *.c~ *.h~
- rm -f 01_normalize/*.o 01_normalize/*.c~ 01_normalize/*.h~
- rm -f 02_direction/*.o 02_direction/*.c~ 02_direction/*.h~
- rm -f 03_corepoint_detection/*.o 03_corepoint_detection/*.c~ 03_corepoint_detection/*.h~
- rm -f 04_thining/*.o 04_thining/*.c~ 04_thining/*.h~
- rm -f 05_minutia_extraction/*.o 05_minutia_extraction/*.c~ 05_minutia_extraction/*.h~
- rm -f 06_cluster_template/*.o 06_cluster_template/*.c~ 06_cluster_template/*.h~
- rm -f 07_filterbank/*.o 07_filterbank/*.c~ 07_filterbank/*.h~
- rm -f 08_average_dist/*.o 08_average_dist/*.c~ 08_average_dist/*.h~
-
-#------------------------------------------------------------------------------------------
-
-help:
- echo -e "\n\nThis Makefile knows following parameters :\n make : generates the benchmark testapp\n make ext_lib : generates the library\n make clean : cleanup sourcecode from objectfile garbage\n make count : counts lines of code (loc)\n"
-
-count: clean
- wc -l *.c *.h 01_normalize/* 02_direction/* 03_corepoint_detection/* 04_thining/* 05_minutia_extraction/* 06_cluster_template/* 07_filterbank/*
-
-#------------------------------------------------------------------------------------------
-
Deleted: trunk/src/cluster/feature_extraction/experimental/main.anjuta
===================================================================
--- trunk/src/cluster/feature_extraction/experimental/main.anjuta 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/feature_extraction/experimental/main.anjuta 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<anjuta>
- <plugin name="GBF Project Manager"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaProjectManager"/>
- <require group="Project"
- attribute="Supported-Project-Types"
- value="make"/>
- </plugin>
- <plugin name="Symbol Browser"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Location"
- value="anjuta-symbol-browser:SymbolBrowserPlugin"/>
- </plugin>
- <plugin name="Make Build System"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaBuildable"/>
- <require group="Build"
- attribute="Supported-Build-Types"
- value="make"/>
- </plugin>
-</anjuta>
Deleted: trunk/src/cluster/feature_extraction/experimental/run.sh
===================================================================
--- trunk/src/cluster/feature_extraction/experimental/run.sh 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/feature_extraction/experimental/run.sh 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# (C)Copyright 2008 CSI PC2 Project
-#
-# This file is part of the CSI PC2 software.
-#
-# The CSI PC2 software is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 2 of the
-# License, or (at your option) any later version.
-#
-# The CSI PC2 software is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the CSI PC2 software. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-
-export LD_LIBRARY_PATH=~/IM/lib/
-setenv LD_LIBRARY_PATH ~/IM/lib/
-
-./main
Property changes on: trunk/src/cluster/feature_extraction/fingerprint
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/feature_extraction/fingerprint/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/feature_extraction/fingerprint/mindtct
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/template_matching
___________________________________________________________________
Name: svn:ignore
- pc2-src.exe
+ pc2-src.exe
Makefile.in
Property changes on: trunk/src/cluster/template_matching/bozorth3
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/shared
___________________________________________________________________
Name: svn:ignore
- *.a
.deps
+ *.a
.deps
Makefile.in
Property changes on: trunk/src/tests
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/ccd_connection
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/ccd_connection/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/performance
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/performance/speed_iris
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/unit
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/unit/cluster
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/unit/cluster/template_matching
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/unit/shared
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/fingerprint_ga
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/fingerprint_testbed
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/fingerprint_testbed/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/management_gui
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/misc_dev
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/misc_dev/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
