Changeset 2274 for trunk


Ignore:
Timestamp:
Aug 7, 2012, 6:49:05 PM (7 years ago)
Author:
ksherdy
Message:

Updated svn:externals.

Location:
trunk
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/pablo_out/Makefile

    r2181 r2274  
    2121###########################################################################
    2222id: main.cpp
    23         $(CC) -o id main.cpp $(AFLAGS) -DID_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG #-DHASH_TABLE_HPP_DEBUG
     23        $(CC) -o id main.cpp $(AFLAGS) -I.. -DID_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG #-DHASH_TABLE_HPP_DEBUG
    2424
    2525div2: main.cpp
    26         $(CC) -o div2 main.cpp $(AFLAGS) -DDIV2_STRATEGY -DBUFFER_PROFILING  #-DHASH_TABLE_HPP_DEBUG #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG
     26        $(CC) -o div2 main.cpp $(AFLAGS) -I.. -DDIV2_STRATEGY -DBUFFER_PROFILING  #-DHASH_TABLE_HPP_DEBUG #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG
    2727
    2828logbase2: main.cpp
    29         $(CC) -o logbase2 main.cpp $(AFLAGS) -DLOGBASE2_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
     29        $(CC) -o logbase2 main.cpp $(AFLAGS) -I.. -DLOGBASE2_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
    3030
    3131div2_logbase2: main.cpp
    32         $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
     32        $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -I.. -DDIV2_LOGBASE2_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
    3333
    3434bit_byte: main.cpp
    35         $(CC) -o bit_byte main.cpp $(AFLAGS) -DBIT_BYTE_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
     35        $(CC) -o bit_byte main.cpp $(AFLAGS) -I.. -DBIT_BYTE_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
    3636
    3737###########################################################################
     
    3939###########################################################################
    4040id_diff_test: id
    41         $(CC) -o id main.cpp $(AFLAGS) -DID_STRATEGY -DIDENTITY_TEST
     41        $(CC) -o id main.cpp $(AFLAGS) -I.. -DID_STRATEGY -DIDENTITY_TEST
    4242        python $(TEST_SCRIPT) id -d
    4343        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
    4444
    4545div2_diff_test: div2
    46         $(CC) -o div2 main.cpp $(AFLAGS) -DDIV2_STRATEGY -DIDENTITY_TEST
     46        $(CC) -o div2 main.cpp $(AFLAGS) -I.. -DDIV2_STRATEGY -DIDENTITY_TEST
    4747        python $(TEST_SCRIPT) div2 -d
    4848        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
    4949
    5050logbase2_diff_test: logbase2
    51         $(CC) -o logbase2 main.cpp $(AFLAGS) -DLOGBASE2_STRATEGY -DIDENTITY_TEST
     51        $(CC) -o logbase2 main.cpp $(AFLAGS) -I.. -DLOGBASE2_STRATEGY -DIDENTITY_TEST
    5252        python $(TEST_SCRIPT) logbase2 -d
    5353        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
    5454
    5555div2_logbase2_diff_test: div2_logbase2
    56         $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DIDENTITY_TEST
     56        $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -I.. -DDIV2_LOGBASE2_STRATEGY -DIDENTITY_TEST
    5757        python $(TEST_SCRIPT) div2_logbase2 -d
    5858        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
    5959
    6060bit_byte_diff_test: bit_byte
    61         $(CC) -o bit_byte main.cpp $(AFLAGS) -DBIT_BYTE_STRATEGY -DIDENTITY_TEST
     61        $(CC) -o bit_byte main.cpp $(AFLAGS) -I.. -DBIT_BYTE_STRATEGY -DIDENTITY_TEST
    6262        python $(TEST_SCRIPT) bit_byte -d
    6363        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
     
    6767###########################################################################
    6868id_gid_test:
    69         $(CC) -o id main.cpp $(AFLAGS) -DID_STRATEGY -DGID_TEST
     69        $(CC) -o id main.cpp $(AFLAGS) -I.. -DID_STRATEGY -DGID_TEST
    7070        python $(TEST_SCRIPT) id -g
    7171
    7272div2_gid_test:
    73         $(CC) -o div2 main.cpp $(AFLAGS) -DDIV2_STRATEGY -DGID_TEST
     73        $(CC) -o div2 main.cpp $(AFLAGS) -I.. -DDIV2_STRATEGY -DGID_TEST
    7474        python $(TEST_SCRIPT) div2 -g
    7575
    7676logbase2_gid_test:
    77         $(CC) -o logbase2 main.cpp $(AFLAGS) -DLOGBASE2_STRATEGY -DGID_TEST
     77        $(CC) -o logbase2 main.cpp $(AFLAGS) -I.. -DLOGBASE2_STRATEGY -DGID_TEST
    7878        python $(TEST_SCRIPT) logbase2 -g
    7979
    8080div2_logbase2_gid_test:
    81         $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DGID_TEST
     81        $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -I.. -DDIV2_LOGBASE2_STRATEGY -DGID_TEST
    8282        python $(TEST_SCRIPT) div2_logbase2 -g
    8383
    8484bit_byte_gid_test:
    85         $(CC) -o bit_byte main.cpp $(AFLAGS) -DBIT_BYTE_STRATEGY -DGID_TEST
     85        $(CC) -o bit_byte main.cpp $(AFLAGS) -I.. -DBIT_BYTE_STRATEGY -DGID_TEST
    8686        python $(TEST_SCRIPT) bit_byte -g
    8787
  • trunk/symbol_table/src/byte_pool.hpp

    r1967 r2274  
    99#define BYTE_POOL_HPP
    1010
    11 #include "../lib/allocator.hpp"
     11#include <simd-lib/allocator.hpp>
    1212#include <string.h>
    1313
  • trunk/symbol_table/src/gid.hpp

    r2092 r2274  
    22#define GID_HPP
    33
    4 #include "../lib/bitblock.hpp"
     4#include <simd-lib/bitblock.hpp>
    55#include <vector>
    66using namespace std;
  • trunk/symbol_table/src/hash_table.hpp

    r2198 r2274  
    2121#define MAX_TABLE_SIZE 65536
    2222
    23 #include "../lib/bitblock.hpp"
    24 #include "../lib/byte_compare.hpp"
    25 #include "../lib/allocator.hpp"
    26 #include "../lib/s2p.hpp"
    27 #include "../lib/byte_pool.hpp"
    28 #include "../lib/hash.hpp"
     23#include <simd-lib/bitblock.hpp>
     24#include <simd-lib/byte_compare.hpp>
     25#include <simd-lib/allocator.hpp>
     26#include <simd-lib/s2p.hpp>
     27#include <simd-lib/byte_pool.hpp>
     28#include <simd-lib/hash.hpp>
    2929#include "gid.hpp"
    3030#include "compare_strategy.hpp"
  • trunk/symbol_table/src/symbol_table.hpp

    r2271 r2274  
    2424#define ID_SYMBOL_TABLE_TEMPLATE_HPP
    2525
    26 #include "../lib/buffer.hpp"
    27 #include "../lib/bitblock_iterator.hpp"
    28 #include "../lib/bitblock_scan.hpp"
     26#include <simd-lib/buffer.hpp>
     27#include <simd-lib/bitblock_iterator.hpp>
     28#include <simd-lib/bitblock_scan.hpp>
    2929#include "strategy_types.hpp"
    3030#include "gid.hpp"
  • trunk/symbol_table/src/transpose.hpp

    r2113 r2274  
    22#define TRANSPOSE_HPP
    33
    4 #include "../lib/bitblock.hpp"
    5 #include "../lib/s2p.hpp"
     4#include <simd-lib/bitblock.hpp>
     5#include <simd-lib/s2p.hpp>
    66#include "basis_bits.hpp"
    77
Note: See TracChangeset for help on using the changeset viewer.