Skip to content

Remove the old dnn network implementation. This commit removes the ol… #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/cifar10.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void testCIFAR10() {
A = bb.createWeightVar(ElemKind::FloatTy, {minibatchSize, 32, 32, 3});
E = bb.createWeightVar(ElemKind::IndexTy, {minibatchSize, 1});

// Create the rest of the network. NodeBase *SM = createSimpleNet(N, A, E);
// Create the rest of the network.
auto *CV0 = bb.createConvOp(A, 16, 5, 1, 2);
auto *RL0 = bb.createRELUOp(*CV0);
auto *MP0 = bb.createPoolOp(*RL0, PoolInst::OpKind::kMax, 2, 2, 0);
Expand Down
6 changes: 0 additions & 6 deletions glow.cpp

This file was deleted.

2 changes: 1 addition & 1 deletion include/glow/IR/IR.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include "glow/IR/Type.h"
#include "glow/IR/UseDef.h"

#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringRef.h"

#include <list>
#include <vector>
Expand Down
11 changes: 11 additions & 0 deletions include/glow/IR/Instrs.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,17 @@ class ConvolutionInst : public Instruction {
size_t getDepth() const { return depth_; }

void verify() const;

/// Calculate the size of the output tensor based on the convolution
/// parameters.
static std::pair<size_t, size_t> calculateOutputDims(size_t sx, size_t sy,
size_t pad,
size_t filterSize,
size_t stride) {
size_t outsx = ((sx + pad * 2 - filterSize) / stride + 1);
size_t outsy = ((sy + pad * 2 - filterSize) / stride + 1);
return {outsx, outsy};
}
};

class PoolInst : public Instruction {
Expand Down
3 changes: 1 addition & 2 deletions include/glow/Importer/Caffe2.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ class caffe2ModelLoader {
caffe2ModelLoader(const std::string &netDescFilename,
const std::string &netWeightFilename,
llvm::ArrayRef<const char *> names,
llvm::ArrayRef<Tensor *> tensors,
Interpreter &IP);
llvm::ArrayRef<Tensor *> tensors, Interpreter &IP);

/// \returns the output of the network. This is usually the result of the last
/// softmax or regression layer.
Expand Down
194 changes: 0 additions & 194 deletions include/glow/Network/Network.h

This file was deleted.

100 changes: 0 additions & 100 deletions include/glow/Network/Node.h

This file was deleted.

Loading