Changeset 2931


Ignore:
Timestamp:
Mar 10, 2013, 6:01:38 PM (5 years ago)
Author:
ksherdy
Message:

Update template include paths.

Location:
proto/parabix2
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/.project

    r2276 r2931  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<projectDescription>
    3         <name>parablix2</name>
     3        <name>parabix2</name>
    44        <comment></comment>
    55        <projects>
    66        </projects>
    77        <buildSpec>
     8                <buildCommand>
     9                        <name>org.python.pydev.PyDevBuilder</name>
     10                        <arguments>
     11                        </arguments>
     12                </buildCommand>
    813        </buildSpec>
    914        <natures>
     15                <nature>org.python.pydev.pythonNature</nature>
    1016        </natures>
    1117</projectDescription>
  • proto/parabix2/Makefile

    r2818 r2931  
    1010PABLO_TEMPLATE=pablo_template.cpp
    1111PABLO_TEMPLATE_LSST=pablo_template_lsst.cpp
    12 PABLO_COMPILER=../Compiler2265/pablomain.py
     12//PABLO_COMPILER=../Compiler2265/pablomain.py
     13PABLO_COMPILER=../Compiler/pablomain.py
    1314PABLO_ADD_DEBUG = # -a -b
    1415
    15 PABLO_TEMPLATEJ=pablo_templatej.cpp
     16PABLO_TEMPLATEJ=pabloj_template.cpp
    1617
    1718# LSST
  • proto/parabix2/pablo_template.cpp

    r2806 r2931  
    11// Stream struct and function headers and definitions
    22
    3 #include "../lib/simd-lib/bitblock.hpp"
    4 #include "../lib/simd-lib/carryQ.hpp"
    5 #include "../lib/simd-lib/pabloSupport.hpp"
     3#include <simd-lib/bitblock.hpp>
     4#include <simd-lib/carryQ.hpp>
     5#include <simd-lib/pabloSupport.hpp>
    66
    77#define LocalCarryDeclare(name, count)\
     
    1919#include <sys/stat.h>
    2020
    21 #include "../lib/simd-lib/s2p.hpp"
    22 #include "../lib/simd-lib/buffer.hpp"
    23 #include "../lib/simd-lib/bitblock_iterator.hpp"
    24 #include "../lib/simd-lib/perflib/perfsec.h"
     21#include <simd-lib/s2p.hpp>
     22#include <simd-lib/buffer.hpp>
     23#include <simd-lib/bitblock_iterator.hpp>
     24#include <simd-lib/perflib/perfsec.h>
    2525
    2626#include <xmldecl.h>
     
    4444#warning "Compiling with experimental STL_ALIGNED_VECTOR."
    4545#include <vector>
    46 #include "../lib/simd-lib/stl_aligned_allocator.hpp"
     46#include <simd-lib/stl_aligned_allocator.hpp>
    4747#endif
    4848
     
    7878// Headers that depend @ global stream struct types.
    7979//////////////////////////////////////////////////////////////////////////////////////////
    80 #include "../lib/simd-lib/transpose.hpp"
     80#include <simd-lib/transpose.hpp>
    8181#include <post_process.hpp>
    8282
  • proto/parabix2/pablo_template_lsst.cpp

    r2820 r2931  
    11// Stream struct and function headers and definitions
    22
    3 #include "../lib/simd-lib/bitblock.hpp"
    4 #include "../lib/simd-lib/carryQ.hpp"
    5 #include "../lib/simd-lib/pabloSupport.hpp"
     3#include <simd-lib/bitblock.hpp>
     4#include <simd-lib/carryQ.hpp>
     5#include <simd-lib/pabloSupport.hpp>
    66
    77#define LocalCarryDeclare(name, count)\
     
    1919#include <sys/stat.h>
    2020
    21 #include "../lib/simd-lib/s2p.hpp"
    22 #include "../lib/simd-lib/buffer.hpp"
    23 #include "../lib/simd-lib/bitblock_iterator.hpp"
    24 #include "../lib/simd-lib/perflib/perfsec.h"
     21#include <simd-lib/s2p.hpp>
     22#include <simd-lib/buffer.hpp>
     23#include <simd-lib/bitblock_iterator.hpp>
     24#include <simd-lib/perflib/perfsec.h>
    2525
    2626#include <xmldecl.h>
     
    4444#warning "Compiling with experimental STL_ALIGNED_VECTOR."
    4545#include <vector>
    46 #include "../lib/simd-lib/stl_aligned_allocator.hpp"
     46#include <simd-lib/stl_aligned_allocator.hpp>
    4747#endif
    4848
     
    8686#ifdef LSST
    8787
    88 #include "../lib/lsst-lib/src/lsst.hpp"
    89 #include "../lib/lsst-lib/src/gid.hpp"
     88#include <lsst-lib/src/lsst.hpp>
     89#include <lsst-lib/src/gid.hpp>
    9090
    9191#endif
     
    9494// Headers that depend @ global stream struct types.
    9595//////////////////////////////////////////////////////////////////////////////////////////
    96 #include "../lib/simd-lib/transpose.hpp"
     96#include <simd-lib/transpose.hpp>
    9797#include <post_process.hpp>
    9898
  • proto/parabix2/pabloj_template.cpp

    r2817 r2931  
    11// PabloJ generated headers
    2 #include "/home/ken/workspace/pablo/output/cpplang/pablo_definitions.hpp"
     2#include "/home/ksherdy/workspace/pabloj/output/cpplang/pablo_definitions.hpp"
    33
    44// CPP standard headers
     
    1010
    1111// Parabix support libraries
    12 #include "../lib/simd-lib/s2p.hpp"
    13 #include "../lib/simd-lib/buffer.hpp"
    14 #include "../lib/simd-lib/bitblock_iterator.hpp"
    15 #include "../lib/simd-lib/perflib/perfsec.h"
     12#include <simd-lib/s2p.hpp>
     13#include <simd-lib/buffer.hpp>
     14#include <simd-lib/bitblock_iterator.hpp>
     15#include <simd-lib/perflib/perfsec.h>
    1616
    1717// Application specific headers and definitions
     
    2929#warning "Compiling with experimental STL_ALIGNED_VECTOR."
    3030#include <vector>
    31 #include "../lib/simd-lib/stl_aligned_allocator.hpp"
     31#include <simd-lib/stl_aligned_allocator.hpp>
    3232#endif
    3333
     
    6363// Headers that depend @ global stream struct types.
    6464//////////////////////////////////////////////////////////////////////////////////////////
    65 #include "../lib/simd-lib/transpose.hpp"
     65#include <simd-lib/transpose.hpp>
    6666#include <post_process.hpp>
    6767
  • proto/parabix2/src/Makefile

    r2818 r2931  
    1717CFLAGS= $(SSE) -O3
    1818SSE=-msse2 #-msse4.1 -DUSE_PTEST #-mssse3 -msse4.1 -msse4.2
    19 INCLUDES=-I../util -I../lib/ -I../lib/cc-lib/
     19INCLUDES=-I../util -I../lib -I../lib/cc-lib
    2020
    2121PAPI_DIR=/usr/local/papi
     
    5050        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING
    5151       
     52buffer_profilingj: $(SRCFILE)
     53        $(CC) -o $(OUTFILEJ) $(SRCFILEJ) $(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING
     54
    5255as: $(OUTFILE).s
    5356        as $(OUTFILE).s -o $(OUTFILE).o
Note: See TracChangeset for help on using the changeset viewer.