Changeset 1741 for proto


Ignore:
Timestamp:
Nov 28, 2011, 7:56:43 PM (8 years ago)
Author:
vla24
Message:

SymbolTable?: Fixed custom hashing function for parallel bitstream based grouping

Location:
proto/SymbolTable
Files:
6 added
9 edited

Legend:

Unmodified
Added
Removed
  • proto/SymbolTable/Makefile

    r1721 r1741  
    4040PABLO_FLAGS=#-a
    4141
    42 wcd_stl:        $(PABLO_WCD)
     42
     43wcd_stl:$(PABLO_WCD)
    4344        python $(PABLO_COMPILER) $(PABLO_WCD) -t $(PARSER_COMMON_FUNCTIONS) -o $(PARSER_COMMON_FUNCTIONS_OUTFILE)
    4445        python $(PABLO_COMPILER) $(PABLO_WCD) -t $(WCD_STL_TEMPLATE) -o $(WCD_OUTFILE)
     
    107108        python  $(PABLO_COMPILER) -h
    108109
    109 symtab_clean:
     110clean:
    110111        rm -f $(XMLWF_OUTFILE)
    111 
    112 wcd_clean:
    113112        rm -f $(WCD_OUTFILE)
     113        rm -f $(PARSER_COMMON_FUNCTIONS_OUTFILE)
  • proto/SymbolTable/build_wcd.sh

    r1721 r1741  
    1 make wcd_pbgs_log && cd src && make wcd && cd .. && ./src/wcd test/test_files/test_dictionary.txt test/test_files/test_text.txt
     1cd src && make wcd && python run_wcd.py ../test/test_files/test_dictionary.txt ../test/test_files/wcd_a_sailor_of_king_george_half.txt && cd ..
  • proto/SymbolTable/build_xmlwf.sh

    r1721 r1741  
    1 make symtab_ls
     1make symtab_div
    22cd src
    33make all
  • proto/SymbolTable/common_definitions.h

    r1722 r1741  
    55
    66//typedef long ScanBlock;
     7
     8
    79#define SIMD_type BitBlock
    810#define DEBUG 0
    9 #define PRINT_SYMBOL_DISTRIBUTION 0
    10 #define PRINT_DICTIONARY_INFO 0
     11#define PRINT_SYMBOL_DISTRIBUTION 1
     12#define PRINT_DICTIONARY_INFO 1
    1113#define SEGMENT_BLOCKS 12
    1214#define BUFFER_SIZE (BLOCK_SIZE * SEGMENT_BLOCKS)
     
    3739#include <XMLTestSuiteError.h>
    3840
     41// Defines for symbol table library
     42#define XOR_HASHVALUE
     43
    3944#endif // SYMTAB_GLOBAL_H
  • proto/SymbolTable/symtab_stl_template.cpp

    r1721 r1741  
    5858
    5959#if PRINT_SYMBOL_DISTRIBUTION
    60     print_GIDS(gids);
     60    //print_GIDS(gids);
    6161#endif
    6262
  • proto/SymbolTable/wcd_hash_template.cpp

    r1721 r1741  
    6666
    6767#if PRINT_SYMBOL_DISTRIBUTION
    68     print_GIDS();
     68    print_GIDS(gids);
    6969#endif
    7070
  • proto/SymbolTable/wcd_pbgs_div_template.cpp

    r1721 r1741  
    6868    printWordCountInDictionary(totalUnknownWordsInDictionary, totalKnownWordsInDictionary);
    6969
     70#if PRINT_SYMBOL_DISTRIBUTION
     71//    print_GIDS();
     72    pbgs_symbol_table.Print_Symbol_Table_Distribution();
     73#endif
     74
    7075    fclose(dictionaryfile);
    7176    fclose(infile);
    7277    fclose(outfile);
    7378
    74 #if PRINT_SYMBOL_DISTRIBUTION
    75 //    print_GIDS();
    76     pbgs_symbol_table.Print_Symbol_Table_Distribution();
    77 #endif
    78 
    79         return(0);
     79    return(0);
    8080}
    8181
  • proto/SymbolTable/wcd_pbgs_identity_template.cpp

    r1721 r1741  
    6565    printWordCountInDictionary(totalUnknownWordsInDictionary, totalKnownWordsInDictionary);
    6666
    67     fclose(dictionaryfile);
    68     fclose(infile);
    69     fclose(outfile);
    70 
    7167#if PRINT_SYMBOL_DISTRIBUTION
    7268//    print_GIDS();
    7369    pbgs_symbol_table.Print_Symbol_Table_Distribution();
    7470#endif
     71
     72    fclose(dictionaryfile);
     73    fclose(infile);
     74    fclose(outfile);
    7575
    7676    return(0);
  • proto/SymbolTable/wcd_stl_template.cpp

    r1721 r1741  
    6060    printWordCountInDictionary(totalUnknownWordsInDictionary, totalKnownWordsInDictionary);
    6161
     62#if PRINT_SYMBOL_DISTRIBUTION
     63    print_GIDS(gids);
     64#endif
     65
    6266    fclose(dictionaryfile);
    6367    fclose(infile);
    6468    fclose(outfile);
    65 
    66 #if PRINT_SYMBOL_DISTRIBUTION
    67     print_GIDS();
    68 #endif
    6969
    7070    return(0);
Note: See TracChangeset for help on using the changeset viewer.