Changeset 2279 for trunk


Ignore:
Timestamp:
Aug 7, 2012, 7:13:40 PM (7 years ago)
Author:
ksherdy
Message:

Update include path.

Location:
trunk/symbol_table
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/pablo_out/Makefile

    r2275 r2279  
    1717TEST_DST_DIR = ../test/pout
    1818
     19INCLUDE=../lib/
     20
    1921###########################################################################
    2022# Perf Builds
    2123###########################################################################
    2224id: main.cpp
    23         $(CC) -o id main.cpp $(AFLAGS) -DID_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG #-DHASH_TABLE_HPP_DEBUG
     25        $(CC) -o id main.cpp $(AFLAGS) -I$(INCLUDE) -DID_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG #-DHASH_TABLE_HPP_DEBUG
    2426
    2527div2: main.cpp
    26         $(CC) -o div2 main.cpp $(AFLAGS) -DDIV2_STRATEGY -DBUFFER_PROFILING  #-DHASH_TABLE_HPP_DEBUG #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG
     28        $(CC) -o div2 main.cpp $(AFLAGS) -I$(INCLUDE) -DDIV2_STRATEGY -DBUFFER_PROFILING  #-DHASH_TABLE_HPP_DEBUG #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG
    2729
    2830logbase2: main.cpp
    29         $(CC) -o logbase2 main.cpp $(AFLAGS) -DLOGBASE2_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
     31        $(CC) -o logbase2 main.cpp $(AFLAGS) -I$(INCLUDE) -DLOGBASE2_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
    3032
    3133div2_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
     34        $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -I$(INCLUDE) -DDIV2_LOGBASE2_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
    3335
    3436bit_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
     37        $(CC) -o bit_byte main.cpp $(AFLAGS) -I$(INCLUDE) -DBIT_BYTE_STRATEGY -DBUFFER_PROFILING  #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
    3638
    3739###########################################################################
     
    3941###########################################################################
    4042id_diff_test: id
    41         $(CC) -o id main.cpp $(AFLAGS) -DID_STRATEGY -DIDENTITY_TEST
     43        $(CC) -o id main.cpp $(AFLAGS) -I$(INCLUDE) -DID_STRATEGY -DIDENTITY_TEST
    4244        python $(TEST_SCRIPT) id -d
    4345        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
    4446
    4547div2_diff_test: div2
    46         $(CC) -o div2 main.cpp $(AFLAGS) -DDIV2_STRATEGY -DIDENTITY_TEST
     48        $(CC) -o div2 main.cpp $(AFLAGS) -I$(INCLUDE) -DDIV2_STRATEGY -DIDENTITY_TEST
    4749        python $(TEST_SCRIPT) div2 -d
    4850        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
    4951
    5052logbase2_diff_test: logbase2
    51         $(CC) -o logbase2 main.cpp $(AFLAGS) -DLOGBASE2_STRATEGY -DIDENTITY_TEST
     53        $(CC) -o logbase2 main.cpp $(AFLAGS) -I$(INCLUDE) -DLOGBASE2_STRATEGY -DIDENTITY_TEST
    5254        python $(TEST_SCRIPT) logbase2 -d
    5355        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
    5456
    5557div2_logbase2_diff_test: div2_logbase2
    56         $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DIDENTITY_TEST
     58        $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -I$(INCLUDE) -DDIV2_LOGBASE2_STRATEGY -DIDENTITY_TEST
    5759        python $(TEST_SCRIPT) div2_logbase2 -d
    5860        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
    5961
    6062bit_byte_diff_test: bit_byte
    61         $(CC) -o bit_byte main.cpp $(AFLAGS) -DBIT_BYTE_STRATEGY -DIDENTITY_TEST
     63        $(CC) -o bit_byte main.cpp $(AFLAGS) -I$(INCLUDE) -DBIT_BYTE_STRATEGY -DIDENTITY_TEST
    6264        python $(TEST_SCRIPT) bit_byte -d
    6365        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
     
    6769###########################################################################
    6870id_gid_test:
    69         $(CC) -o id main.cpp $(AFLAGS) -DID_STRATEGY -DGID_TEST
     71        $(CC) -o id main.cpp $(AFLAGS) -I$(INCLUDE) -DID_STRATEGY -DGID_TEST
    7072        python $(TEST_SCRIPT) id -g
    7173
    7274div2_gid_test:
    73         $(CC) -o div2 main.cpp $(AFLAGS) -DDIV2_STRATEGY -DGID_TEST
     75        $(CC) -o div2 main.cpp $(AFLAGS) -I$(INCLUDE) -DDIV2_STRATEGY -DGID_TEST
    7476        python $(TEST_SCRIPT) div2 -g
    7577
    7678logbase2_gid_test:
    77         $(CC) -o logbase2 main.cpp $(AFLAGS) -DLOGBASE2_STRATEGY -DGID_TEST
     79        $(CC) -o logbase2 main.cpp $(AFLAGS) -I$(INCLUDE) -DLOGBASE2_STRATEGY -DGID_TEST
    7880        python $(TEST_SCRIPT) logbase2 -g
    7981
    8082div2_logbase2_gid_test:
    81         $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DGID_TEST
     83        $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -I$(INCLUDE) -DDIV2_LOGBASE2_STRATEGY -DGID_TEST
    8284        python $(TEST_SCRIPT) div2_logbase2 -g
    8385
    8486bit_byte_gid_test:
    85         $(CC) -o bit_byte main.cpp $(AFLAGS) -DBIT_BYTE_STRATEGY -DGID_TEST
     87        $(CC) -o bit_byte main.cpp $(AFLAGS) -I$(INCLUDE) -DBIT_BYTE_STRATEGY -DGID_TEST
    8688        python $(TEST_SCRIPT) bit_byte -g
    8789
  • trunk/symbol_table/templates/group_strms_template.hpp

    r2185 r2279  
    22#define GROUP_STRMS_TEMPLATE_HPP
    33
    4 #include "../lib/bitblock.hpp"
    5 #include "../lib/carryQ.hpp"
     4#include <simd-lib/bitblock.hpp>
     5#include <simd-lib/carryQ.hpp>
    66
    77// GENERATED
  • trunk/symbol_table/templates/hash_strms_template.hpp

    r2182 r2279  
    22#define HASH_STRMS_TEMPLATE_HPP
    33
    4 #include "../lib/bitblock.hpp"
    5 #include "../lib/carryQ.hpp"
     4#include <simd-lib/bitblock.hpp>
     5#include <simd-lib/carryQ.hpp>
    66#include "../src/basis_bits.hpp"
    77
  • trunk/symbol_table/templates/main_template.cpp

    r2197 r2279  
    2121 */
    2222
    23 #include "../lib/allocator.hpp"
    24 #include "../lib/bitblock.hpp"
    25 #include "../lib/bitblock_scan.hpp"
    26 #include "../lib/buffer.hpp"
    27 #include "../lib/carryQ.hpp"
    28 #include "../lib/s2p.hpp"
    29 #include "../lib/perflib/perfsec.h"
     23#include <simd-lib/allocator.hpp>
     24#include <simd-lib/bitblock.hpp>
     25#include <simd-lib/bitblock_scan.hpp>
     26#include <simd-lib/buffer.hpp>
     27#include <simd-lib/carryQ.hpp>
     28#include <simd-lib/s2p.hpp>
     29#include <simd-lib/perflib/perfsec.h>
    3030#include "../src/transpose.hpp"
    3131
  • trunk/symbol_table/templates/marker_strms_template.hpp

    r2182 r2279  
    11#ifndef MARKERS_TEMPLATE_HPP
    22#define MARKERS_TEMPLATE_HPP
    3 #include "../lib/bitblock.hpp"
    4 #include "../lib/carryQ.hpp"
     3#include <simd-lib/bitblock.hpp>
     4#include <simd-lib/carryQ.hpp>
    55
    66// GENERATED
Note: See TracChangeset for help on using the changeset viewer.