update optiling headers

pull/491/head
yanghaoran 4 years ago
parent 38a40dd232
commit 975e65054a

@ -20,12 +20,29 @@
#include "graph/debug/ge_attr_define.h"
#include "graph/node.h"
#include "register/op_tiling_registry.h"
#include <nlohmann/json.hpp>
namespace optiling {
#define REGISTER_OP_TILING_FUNC(optype, opfunc) REGISTER_OP_TILING_FUNC_UNIQ_HELPER(optype, opfunc, __COUNTER__)
#define REGISTER_OP_TILING_FUNC_UNIQ_HELPER(optype, opfunc, counter) \
REGISTER_OP_TILING_FUNC_UNIQ(optype, opfunc, counter)
#define REGISTER_OP_TILING_FUNC_UNIQ(optype, opfunc, counter) \
static OpTilingInterf g_##optype##TilingInterf##counter(#optype, opfunc)
using OpTilingFuncOld =
std::function<bool(const std::string &, const TeOpParas &, const nlohmann::json &, OpRunInfo &)>;
class FMK_FUNC_HOST_VISIBILITY OpTilingInterf {
public:
OpTilingInterf(std::string op_type, OpTilingFuncOld func);
~OpTilingInterf() = default;
static std::string OpTilingUuid;
};
extern "C" ge::graphStatus OpParaCalculate(const ge::Node &node, OpRunInfo &run_info);
extern "C" ge::graphStatus OpAtomicCalculate(const ge::Node &node, OpRunInfo &run_info);
}
} // namespace optiling
#endif // INC_REGISTER_OP_TILING_H_

@ -19,30 +19,17 @@
#include <functional>
#include <map>
#include <nlohmann/json.hpp>
#include <sstream>
#include <string>
#include <vector>
#include "external/register/register_types.h"
#include "external/graph/tensor.h"
#define REGISTER_OP_TILING_FUNC(optype, opfunc) \
REGISTER_OP_TILING_FUNC_UNIQ_HELPER(optype, opfunc, __COUNTER__)
#define REGISTER_OP_TILING(optype, opfunc) REGISTER_OP_TILING_UNIQ_HELPER(optype, opfunc, __COUNTER__)
#define REGISTER_OP_TILING_FUNC_UNIQ_HELPER(optype, opfunc, counter) \
REGISTER_OP_TILING_FUNC_UNIQ(optype, opfunc, counter)
#define REGISTER_OP_TILING_FUNC_NEW(optype, opfunc) REGISTER_OP_TILING_UNIQ_HELPER(optype, opfunc, __COUNTER__)
#define REGISTER_OP_TILING_FUNC_UNIQ(optype, opfunc, counter) \
static OpTilingInterf g_##optype##TilingInterf##counter(#optype, opfunc)
#define REGISTER_OP_TILING_FUNC_NEW(optype, opfunc) \
REGISTER_OP_TILING_UNIQ_HELPER(optype, opfunc, __COUNTER__)
#define REGISTER_OP_TILING(optype, opfunc) \
REGISTER_OP_TILING_UNIQ_HELPER(optype, opfunc, __COUNTER__)
#define REGISTER_OP_TILING_UNIQ_HELPER(optype, opfunc, counter) \
REGISTER_OP_TILING_UNIQ(optype, opfunc, counter)
#define REGISTER_OP_TILING_UNIQ_HELPER(optype, opfunc, counter) REGISTER_OP_TILING_UNIQ(optype, opfunc, counter)
#define REGISTER_OP_TILING_UNIQ(optype, opfunc, counter) \
static OpTilingRegistryInterf g_##optype##TilingRegistryInterf##counter(#optype, opfunc)
@ -66,7 +53,6 @@ struct TeOpTensor {
std::map<std::string, std::string> attrs;
};
struct TeOpTensorArg {
TensorArgType arg_type;
std::vector<TeOpTensor> tensor;
@ -79,9 +65,8 @@ struct OpRunInfo {
bool clear_atomic;
};
using TeOpAttrArgs = std::vector<std::string>;
using TeConstTensorData = std::tuple<const uint8_t*, size_t, ge::Tensor>;
using TeConstTensorData = std::tuple<const uint8_t *, size_t, ge::Tensor>;
struct TeOpParas {
std::vector<TeOpTensorArg> inputs;
@ -91,63 +76,36 @@ struct TeOpParas {
std::string op_type;
};
using OpTilingFunc = std::function<bool(const std::string&, const TeOpParas&,
const nlohmann::json& , OpRunInfo&)>;
using OpTilingFuncPtr = bool(*)(const std::string&, const TeOpParas&, const nlohmann::json& , OpRunInfo&);
class FMK_FUNC_HOST_VISIBILITY OpTilingInterf
{
public:
OpTilingInterf(std::string op_type, OpTilingFunc func);
~OpTilingInterf() = default;
static std::map<std::string, OpTilingFunc> &RegisteredOpInterf();
static std::string OpTilingUuid;
};
struct OpCompileInfo {
std::string str;
std::string key;
};
using OpTilingFuncNew = std::function<bool(const TeOpParas&, const OpCompileInfo& , OpRunInfo&)>;
using OpTilingFunc = std::function<bool(const TeOpParas &, const OpCompileInfo &, OpRunInfo &)>;
using OpTilingFuncPtrNew = bool(*)(const TeOpParas&, const OpCompileInfo& , OpRunInfo&);
using OpTilingFuncPtr = bool (*)(const TeOpParas &, const OpCompileInfo &, OpRunInfo &);
class FMK_FUNC_HOST_VISIBILITY OpTilingRegistryInterf {
public:
OpTilingRegistryInterf(std::string op_type, OpTilingFuncNew func);
public:
OpTilingRegistryInterf(std::string op_type, OpTilingFunc func);
~OpTilingRegistryInterf() = default;
static std::map<std::string, OpTilingFuncNew> &RegisteredOpInterf();
static std::map<std::string, OpTilingFunc> &RegisteredOpInterf();
};
template <class T>
ByteBuffer& ByteBufferPut(ByteBuffer &buf, const T &value)
{
buf.write(reinterpret_cast<const char*>(&value), sizeof(value));
ByteBuffer &ByteBufferPut(ByteBuffer &buf, const T &value) {
buf.write(reinterpret_cast<const char *>(&value), sizeof(value));
buf.flush();
return buf;
}
template <class T>
ByteBuffer& ByteBufferGet(ByteBuffer &buf, T &value)
{
buf.read(reinterpret_cast<char*>(&value), sizeof(value));
ByteBuffer &ByteBufferGet(ByteBuffer &buf, T &value) {
buf.read(reinterpret_cast<char *>(&value), sizeof(value));
return buf;
}
inline size_t ByteBufferGetAll(ByteBuffer &buf, char *dest, size_t dest_len)
{
size_t nread = 0;
size_t rn = 0;
do {
rn = buf.readsome(dest + nread, dest_len - nread);
nread += rn;
} while (rn > 0 && dest_len > nread);
return nread;
}
}
size_t ByteBufferGetAll(ByteBuffer &buf, char *dest, size_t dest_len);
} // namespace optiling
#endif // INC_REGISTER_OP_TILING_REGISTRY_H_

Loading…
Cancel
Save