Skip to content
Snippets Groups Projects
Commit 291bd684 authored by Olivier BICHLER's avatar Olivier BICHLER
Browse files

Corrected MSVC errors

parent d34fccc3
No related branches found
No related tags found
No related merge requests found
...@@ -108,8 +108,9 @@ public: ...@@ -108,8 +108,9 @@ public:
assert(static_cast<std::size_t>(inputIdx) < NUM && "wrong inputIdx for Add operator."); assert(static_cast<std::size_t>(inputIdx) < NUM && "wrong inputIdx for Add operator.");
return std::static_pointer_cast<Data>(mInputs[inputIdx]); return std::static_pointer_cast<Data>(mInputs[inputIdx]);
} }
std::shared_ptr<Data> getRawOutput(const IOIndex_t /*outputIdx*/) const override final { std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final {
assert(outputIdx == 0 && "operator supports only 1 output"); assert(outputIdx == 0 && "operator supports only 1 output");
(void) outputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mOutput); return std::static_pointer_cast<Data>(mOutput);
} }
......
...@@ -108,12 +108,14 @@ public: ...@@ -108,12 +108,14 @@ public:
} }
std::shared_ptr<Data> getRawInput(const IOIndex_t /*inputIdx*/) const override final { std::shared_ptr<Data> getRawInput(const IOIndex_t inputIdx) const override final {
assert(inputIdx == 0 && "operators supports only 1 inputs"); assert(inputIdx == 0 && "operators supports only 1 inputs");
(void) inputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mInput); return std::static_pointer_cast<Data>(mInput);
} }
std::shared_ptr<Data> getRawOutput(const IOIndex_t /*outputIdx*/) const override final { std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final {
assert(outputIdx == 0 && "operator supports only 1 output"); assert(outputIdx == 0 && "operator supports only 1 output");
(void) outputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mOutput); return std::static_pointer_cast<Data>(mOutput);
} }
......
...@@ -107,8 +107,9 @@ public: ...@@ -107,8 +107,9 @@ public:
assert(inputIdx < 5 && "operators supports only 5 inputs"); assert(inputIdx < 5 && "operators supports only 5 inputs");
return std::static_pointer_cast<Data>(mInputs[inputIdx]); return std::static_pointer_cast<Data>(mInputs[inputIdx]);
} }
std::shared_ptr<Data> getRawOutput(const IOIndex_t /*outputIdx*/) const override final { std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final {
assert(outputIdx == 0 && "operator supports only 1 output"); assert(outputIdx == 0 && "operator supports only 1 output");
(void) outputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mOutput); return std::static_pointer_cast<Data>(mOutput);
} }
......
...@@ -121,8 +121,9 @@ public: ...@@ -121,8 +121,9 @@ public:
assert(inputIdx < 3 && "Conv Operators supports only 3 inputs"); assert(inputIdx < 3 && "Conv Operators supports only 3 inputs");
return mInputs[inputIdx]; return mInputs[inputIdx];
} }
inline std::shared_ptr<Tensor> getOutput(const IOIndex_t /*outputIdx*/) const override final { inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final {
assert((outputIdx == 0) && "Conv Operator has only 1 output"); assert((outputIdx == 0) && "Conv Operator has only 1 output");
(void) outputIdx; // avoid unused warning
return mOutput; return mOutput;
} }
......
...@@ -121,8 +121,9 @@ class ConvDepthWise_Op : public Operator, ...@@ -121,8 +121,9 @@ class ConvDepthWise_Op : public Operator,
assert(inputIdx < 3 && "ConvDepthWise Operators supports only 3 inputs"); assert(inputIdx < 3 && "ConvDepthWise Operators supports only 3 inputs");
return mInputs[inputIdx]; return mInputs[inputIdx];
} }
inline std::shared_ptr<Tensor> getOutput(const IOIndex_t /*outputIdx*/) const override final { inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final {
assert((outputIdx == 0) && "ConvDepthWise Operator has only 1 output"); assert((outputIdx == 0) && "ConvDepthWise Operator has only 1 output");
(void) outputIdx; // avoid unused warning
return mOutput; return mOutput;
} }
......
...@@ -98,7 +98,7 @@ public: ...@@ -98,7 +98,7 @@ public:
} }
inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final { inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final {
assert((outputIdx == 0) && "FC Operator has only 1 output"); assert((outputIdx == 0) && "FC Operator has only 1 output");
(void) outputIdx; (void) outputIdx; // avoid unused warning
return mOutput; return mOutput;
} }
...@@ -109,7 +109,7 @@ public: ...@@ -109,7 +109,7 @@ public:
} }
std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final { std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final {
assert(outputIdx == 0 && "operator supports only 1 output"); assert(outputIdx == 0 && "operator supports only 1 output");
(void) outputIdx; (void) outputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mOutput); return std::static_pointer_cast<Data>(mOutput);
} }
......
...@@ -53,8 +53,9 @@ public: ...@@ -53,8 +53,9 @@ public:
setDatatype(DataType::Float32); setDatatype(DataType::Float32);
} }
void associateInput(const IOIndex_t /*inputIdx*/, std::shared_ptr<Data> data) override final { void associateInput(const IOIndex_t inputIdx, std::shared_ptr<Data> data) override final {
assert(inputIdx == 0 && "operator supports only 1 input"); assert(inputIdx == 0 && "operator supports only 1 input");
(void) inputIdx; // avoid unused warning
assert(strcmp(data->type(), Tensor::Type)==0 && "input data must be of Tensor type"); assert(strcmp(data->type(), Tensor::Type)==0 && "input data must be of Tensor type");
mInput = std::dynamic_pointer_cast<Tensor>(data); mInput = std::dynamic_pointer_cast<Tensor>(data);
} }
...@@ -73,22 +74,26 @@ public: ...@@ -73,22 +74,26 @@ public:
inline Tensor& output(const IOIndex_t /*outputIdx*/) const override final { return *(mOutput.get()); } inline Tensor& output(const IOIndex_t /*outputIdx*/) const override final { return *(mOutput.get()); }
inline std::shared_ptr<Tensor> getInput(const IOIndex_t /*inputIdx*/) const override final { inline std::shared_ptr<Tensor> getInput(const IOIndex_t inputIdx) const override final {
assert((inputIdx == 0) && "LeakyReLU Operator has only 1 input"); assert((inputIdx == 0) && "LeakyReLU Operator has only 1 input");
(void) inputIdx; // avoid unused warning
return mInput; return mInput;
} }
inline std::shared_ptr<Tensor> getOutput(const IOIndex_t /*outputIdx*/) const override final { inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final {
assert((outputIdx == 0) && "LeakyReLU Operator has only 1 output"); assert((outputIdx == 0) && "LeakyReLU Operator has only 1 output");
(void) outputIdx; // avoid unused warning
return mOutput; return mOutput;
} }
std::shared_ptr<Data> getRawInput(const IOIndex_t /*inputIdx*/) const override final { std::shared_ptr<Data> getRawInput(const IOIndex_t inputIdx) const override final {
assert(inputIdx == 0 && "operator supports only 1 input"); assert(inputIdx == 0 && "operator supports only 1 input");
(void) inputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mInput); return std::static_pointer_cast<Data>(mInput);
} }
std::shared_ptr<Data> getRawOutput(const IOIndex_t /*outputIdx*/) const override final { std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final {
assert(outputIdx == 0 && "operator supports only 1 output"); assert(outputIdx == 0 && "operator supports only 1 output");
(void) outputIdx; // avoid unused warning
return mOutput; return mOutput;
} }
......
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
setDatatype(DataType::Float32); setDatatype(DataType::Float32);
} }
void associateInput(const IOIndex_t /*inputIdx*/, std::shared_ptr<Data> data) override final { void associateInput(const IOIndex_t inputIdx, std::shared_ptr<Data> data) override final {
assert(inputIdx < 2 && "operators supports only 2 inputs"); assert(inputIdx < 2 && "operators supports only 2 inputs");
assert(strcmp(data->type(), Tensor::Type)==0 && "input data must be of Tensor type"); assert(strcmp(data->type(), Tensor::Type)==0 && "input data must be of Tensor type");
mInputs[inputIdx] = std::dynamic_pointer_cast<Tensor>(data); mInputs[inputIdx] = std::dynamic_pointer_cast<Tensor>(data);
...@@ -88,8 +88,9 @@ public: ...@@ -88,8 +88,9 @@ public:
assert(inputIdx < 2 && "MatMul Operators has 2 inputs"); assert(inputIdx < 2 && "MatMul Operators has 2 inputs");
return mInputs[inputIdx]; return mInputs[inputIdx];
} }
inline std::shared_ptr<Tensor> getOutput(const IOIndex_t /*outputIdx*/) const override final { inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final {
assert((outputIdx == 0) && "MatMul Operators has 1 output"); assert((outputIdx == 0) && "MatMul Operators has 1 output");
(void) outputIdx; // avoid unused warning
return mOutput; return mOutput;
} }
...@@ -98,8 +99,9 @@ public: ...@@ -98,8 +99,9 @@ public:
assert(inputIdx < 2 && "operators supports only 2 inputs"); assert(inputIdx < 2 && "operators supports only 2 inputs");
return std::static_pointer_cast<Data>(mInputs[inputIdx]); return std::static_pointer_cast<Data>(mInputs[inputIdx]);
} }
std::shared_ptr<Data> getRawOutput(const IOIndex_t /*outputIdx*/) const override final { std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final {
assert(outputIdx == 0 && "operator supports only 1 output"); assert(outputIdx == 0 && "operator supports only 1 output");
(void) outputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mOutput); return std::static_pointer_cast<Data>(mOutput);
} }
......
...@@ -73,7 +73,7 @@ public: ...@@ -73,7 +73,7 @@ public:
} }
inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final { inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final {
assert((outputIdx == 0) && "Producer Operator has only 1 output"); assert((outputIdx == 0) && "Producer Operator has only 1 output");
(void) outputIdx; (void) outputIdx; // avoid unused warning
return mOutput; return mOutput;
} }
...@@ -85,7 +85,7 @@ public: ...@@ -85,7 +85,7 @@ public:
std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final { std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final {
assert(outputIdx == 0 && "operator supports only 1 output"); assert(outputIdx == 0 && "operator supports only 1 output");
(void) outputIdx; (void) outputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mOutput); return std::static_pointer_cast<Data>(mOutput);
} }
......
...@@ -42,8 +42,9 @@ public: ...@@ -42,8 +42,9 @@ public:
setDatatype(DataType::Float32); setDatatype(DataType::Float32);
} }
void associateInput(const IOIndex_t /*inputIdx*/, std::shared_ptr<Data> data) override final { void associateInput(const IOIndex_t inputIdx, std::shared_ptr<Data> data) override final {
assert(inputIdx == 0 && "operator supports only 1 input"); assert(inputIdx == 0 && "operator supports only 1 input");
(void) inputIdx; // avoid unused warning
assert(strcmp(data->type(), Tensor::Type)==0 && "input data must be of Tensor type"); assert(strcmp(data->type(), Tensor::Type)==0 && "input data must be of Tensor type");
mInput = std::dynamic_pointer_cast<Tensor>(data); mInput = std::dynamic_pointer_cast<Tensor>(data);
} }
...@@ -62,22 +63,26 @@ public: ...@@ -62,22 +63,26 @@ public:
inline Tensor& output(const IOIndex_t /*outputIdx*/) const override final { return *(mOutput.get()); } inline Tensor& output(const IOIndex_t /*outputIdx*/) const override final { return *(mOutput.get()); }
inline std::shared_ptr<Tensor> getInput(const IOIndex_t /*inputIdx*/) const override final { inline std::shared_ptr<Tensor> getInput(const IOIndex_t inputIdx) const override final {
assert((inputIdx == 0) && "ReLU Operator has only 1 input"); assert((inputIdx == 0) && "ReLU Operator has only 1 input");
(void) inputIdx; // avoid unused warning
return mInput; return mInput;
} }
inline std::shared_ptr<Tensor> getOutput(const IOIndex_t /*outputIdx*/) const override final { inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final {
assert((outputIdx == 0) && "ReLU Operator has only 1 output"); assert((outputIdx == 0) && "ReLU Operator has only 1 output");
(void) outputIdx; // avoid unused warning
return mOutput; return mOutput;
} }
std::shared_ptr<Data> getRawInput(const IOIndex_t /*inputIdx*/) const override final { std::shared_ptr<Data> getRawInput(const IOIndex_t inputIdx) const override final {
assert(inputIdx == 0 && "operator supports only 1 input"); assert(inputIdx == 0 && "operator supports only 1 input");
(void) inputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mInput); return std::static_pointer_cast<Data>(mInput);
} }
std::shared_ptr<Data> getRawOutput(const IOIndex_t /*outputIdx*/) const override final { std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final {
assert(outputIdx == 0 && "operator supports only 1 output"); assert(outputIdx == 0 && "operator supports only 1 output");
(void) outputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mOutput); return std::static_pointer_cast<Data>(mOutput);
} }
......
...@@ -42,8 +42,9 @@ public: ...@@ -42,8 +42,9 @@ public:
setDatatype(DataType::Float32); setDatatype(DataType::Float32);
} }
void associateInput(const IOIndex_t /*inputIdx*/, std::shared_ptr<Data> data) override final { void associateInput(const IOIndex_t inputIdx, std::shared_ptr<Data> data) override final {
assert(inputIdx == 0 && "operator supports only 1 input"); assert(inputIdx == 0 && "operator supports only 1 input");
(void) inputIdx; // avoid unused warning
assert(strcmp(data->type(), Tensor::Type)==0 && "input data must be of Tensor type"); assert(strcmp(data->type(), Tensor::Type)==0 && "input data must be of Tensor type");
mInput = std::dynamic_pointer_cast<Tensor>(data); mInput = std::dynamic_pointer_cast<Tensor>(data);
} }
...@@ -62,22 +63,26 @@ public: ...@@ -62,22 +63,26 @@ public:
inline Tensor& output(const IOIndex_t /*outputIdx*/) const override final { return *(mOutput.get()); } inline Tensor& output(const IOIndex_t /*outputIdx*/) const override final { return *(mOutput.get()); }
inline std::shared_ptr<Tensor> getInput(const IOIndex_t /*inputIdx*/) const override final { inline std::shared_ptr<Tensor> getInput(const IOIndex_t inputIdx) const override final {
assert((inputIdx == 0) && "Softmax Operator has only 1 input"); assert((inputIdx == 0) && "Softmax Operator has only 1 input");
(void) inputIdx; // avoid unused warning
return mInput; return mInput;
} }
inline std::shared_ptr<Tensor> getOutput(const IOIndex_t /*outputIdx*/) const override final { inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final {
assert((outputIdx == 0) && "Softmax Operator has only 1 output"); assert((outputIdx == 0) && "Softmax Operator has only 1 output");
(void) outputIdx; // avoid unused warning
return mOutput; return mOutput;
} }
std::shared_ptr<Data> getRawInput(const IOIndex_t /*inputIdx*/) const override final { std::shared_ptr<Data> getRawInput(const IOIndex_t inputIdx) const override final {
assert(inputIdx == 0 && "operator supports only 1 input"); assert(inputIdx == 0 && "operator supports only 1 input");
(void) inputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mInput); return std::static_pointer_cast<Data>(mInput);
} }
std::shared_ptr<Data> getRawOutput(const IOIndex_t /*outputIdx*/) const override final { std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final {
assert(outputIdx == 0 && "operator supports only 1 output"); assert(outputIdx == 0 && "operator supports only 1 output");
(void) outputIdx; // avoid unused warning
return std::static_pointer_cast<Data>(mOutput); return std::static_pointer_cast<Data>(mOutput);
} }
......
...@@ -98,9 +98,9 @@ void init_Tensor(py::module& m){ ...@@ -98,9 +98,9 @@ void init_Tensor(py::module& m){
.def_buffer([](Tensor& b) -> py::buffer_info { .def_buffer([](Tensor& b) -> py::buffer_info {
const std::unique_ptr<TensorImpl>& tensorImpl = b.getImpl(); const std::unique_ptr<TensorImpl>& tensorImpl = b.getImpl();
std::vector<ssize_t> dims; std::vector<size_t> dims;
std::vector<ssize_t> strides; std::vector<size_t> strides;
ssize_t stride = tensorImpl->scalarSize(); size_t stride = tensorImpl->scalarSize();
for (unsigned int dim = b.nbDims(); dim > 0; dim--) { for (unsigned int dim = b.nbDims(); dim > 0; dim--) {
dims.push_back(b.dims()[dim-1]); dims.push_back(b.dims()[dim-1]);
......
...@@ -30,13 +30,13 @@ Aidge::Connector Aidge::GraphView::operator()( ...@@ -30,13 +30,13 @@ Aidge::Connector Aidge::GraphView::operator()(
assert((ctors.size() == static_cast<std::size_t>(inNode->nbDataInputs())) && "Wrong number of arguments.\n"); assert((ctors.size() == static_cast<std::size_t>(inNode->nbDataInputs())) && "Wrong number of arguments.\n");
for (std::pair<std::shared_ptr<Node>, IOIndex_t> &input : inNode->inputs()) { for (std::pair<std::shared_ptr<Node>, IOIndex_t> &input : inNode->inputs()) {
assert((gk_IODefaultIndex == input.second) && "At least one input connection is not free.\n"); assert((gk_IODefaultIndex == input.second) && "At least one input connection is not free.\n");
(void)input; // Suppress ununsed warning (void)input; // avoid unused warning
} }
for (const Connector &ctor : ctors) { for (const Connector &ctor : ctors) {
assert((ctor.node() != nullptr) && assert((ctor.node() != nullptr) &&
"Input Connector must be associated with a node"); "Input Connector must be associated with a node");
(void)ctors; // Suppress ununsed warning (void)ctors; // avoid unused warning
} }
IOIndex_t inID = 0; IOIndex_t inID = 0;
for (const Connector &ctor : ctors) { for (const Connector &ctor : ctors) {
......
...@@ -37,7 +37,7 @@ Aidge::Connector Aidge::Node::operator()(const std::vector<Connector> &ctors) { ...@@ -37,7 +37,7 @@ Aidge::Connector Aidge::Node::operator()(const std::vector<Connector> &ctors) {
assert((ctors.size() == nbDataInputs()) && "Wrong number of arguments.\n"); assert((ctors.size() == nbDataInputs()) && "Wrong number of arguments.\n");
for (std::pair<std::shared_ptr<Node>, IOIndex_t> &input : inputs()) { for (std::pair<std::shared_ptr<Node>, IOIndex_t> &input : inputs()) {
assert((gk_IODefaultIndex == input.second) && "At least one input connection is not free.\n"); assert((gk_IODefaultIndex == input.second) && "At least one input connection is not free.\n");
(void) input; (void) input; // avoid unused warning
} }
IOIndex_t i = 0; IOIndex_t i = 0;
for (const Connector &ctor : ctors) { for (const Connector &ctor : ctors) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment