Use the new layer info data in the simulator.

This commit is contained in:
2018-01-02 16:31:55 +01:00
parent 470399aabf
commit 5f81f0cec2
6 changed files with 13 additions and 45 deletions

View File

@@ -20,17 +20,7 @@ namespace fmri
class LayerData
{
public:
enum class Type
{
Input,
Convolutional,
ReLU,
Pooling,
Output,
Other
};
LayerData(const string &name, const vector<int> &shape, const DType *data, Type type);
LayerData(const string &name, const vector<int> &shape, const DType *data);
LayerData(const LayerData &) = delete;
LayerData(LayerData &&) = default;
@@ -38,18 +28,13 @@ namespace fmri
LayerData &operator=(LayerData &&) = default;
const string &name() const;
Type type() const;
const vector<int> &shape() const;
DType const *data() const;
size_t numEntries() const;
static Type typeFromString(string_view name);
private:
string name_;
vector<int> shape_;
unique_ptr<DType[]> data_;
Type type_;
};
}