Ignore:
Timestamp:
Nov 18, 2016, 1:46:55 PM (2 years ago)
Author:
nmedfort
Message:

Merged PabloFunction? and PabloKernel? classes. Updated projects where necessary.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/kernels/cc_kernel.h

    r5202 r5217  
    99#include "interface.h"
    1010#include "kernel.h"
    11 #include <re/re_cc.h>
    1211#include <pablo/pablo_kernel.h>
    13 #include <cc/cc_compiler.h>
     12
     13namespace re {
     14    class CC;
     15}
    1416
    1517namespace kernel {
    1618
    1719class KernelBuilder;
    18 
    19 
    2020
    2121class DirectCharacterClassKernelBuilder : public KernelBuilder {
     
    2424    DirectCharacterClassKernelBuilder(IDISA::IDISA_Builder * iBuilder, std::string ccSetName, std::vector<re::CC *> charClasses, unsigned codeUnitSize) :
    2525    KernelBuilder(iBuilder, "cc",
    26                   {Binding{parabix::StreamSetType(iBuilder,1, 8 * codeUnitSize), "codeUnitStream"}},
    27                   {Binding{parabix::StreamSetType(iBuilder,charClasses.size(), 1), "ccStream"}},
     26                  {Binding{iBuilder->getStreamSetTy(1, 8 * codeUnitSize), "codeUnitStream"}},
     27                  {Binding{iBuilder->getStreamSetTy(charClasses.size(), 1), "ccStream"}},
    2828                  {}, {}, {}), mCharClasses(charClasses), mCodeUnitSize(codeUnitSize) {}
    2929   
     
    3535   
    3636};
    37    
    38    
    3937
    4038class ParabixCharacterClassKernelBuilder: public pablo::PabloKernel {
    4139public:
    42     ParabixCharacterClassKernelBuilder(IDISA::IDISA_Builder * iBuilder, std::string ccSetName, std::vector<re::CC *> charClasses, unsigned basisBitsCount) :
    43         PabloKernel(iBuilder, ccSetName +"_kernel", cc::ParabixCharacterClassFunction(ccSetName, charClasses, basisBitsCount)) {}
    44    
     40    ParabixCharacterClassKernelBuilder(IDISA::IDISA_Builder * iBuilder, std::string ccSetName, const std::vector<re::CC *> & charClasses, unsigned basisBitsCount);
    4541};
    46  
    4742
    4843}
Note: See TracChangeset for help on using the changeset viewer.