Morph MORPH
SIGN IN SIGN UP
apache / mxnet UNCLAIMED

Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler; for Python, R, Julia, Scala, Go, Javascript and more

0 0 0 C++
Normal View History Raw
Add more license files (#7429) * Add more licenses * Revert "Add more licenses" This reverts commit 8395a84d21a0cebaf909ec277b7b5d6feffa1412. * Add license files
2017-08-11 14:12:47 -07:00
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
/*!
*/
#include <map>
#include <string>
Fix for cpp examples in mxnet/cpp-package. (#10726) * Fix for cpp examples in mxnet/cpp-package. - Refactored makefile - Added macro to check for using GPU/CPU - Changed cpp files to use correct data set - Added error checking for data files * cpplint fix * cpplint fix * Fix complitaion warnings and an error. * - Refarctored code , added a utils file for loading data - Enabled cpp tests to run on Jenkins. - Cleaned up Makefile * Removed unused header * cpplint fixes * cpplint * cpplint * Fix ci test to run examples * Enabling tests on ci run * Comment save param. This code will be fixed later. * Fixed lenet.cpp Added script to fetch lenet data Enabled lenet test on jenkins. Also added code to run for fewer epocs , as they take long time to train and infer. * lint fixes * Fix test_score.cpp some minor fixes * alexnet save fix. * Replaced "using namespace std;" with explicit "std::" * lint fix * lint fix
2018-05-09 17:33:49 -07:00
#include <fstream>
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
#include <vector>
Fix for cpp examples in mxnet/cpp-package. (#10726) * Fix for cpp examples in mxnet/cpp-package. - Refactored makefile - Added macro to check for using GPU/CPU - Changed cpp files to use correct data set - Added error checking for data files * cpplint fix * cpplint fix * Fix complitaion warnings and an error. * - Refarctored code , added a utils file for loading data - Enabled cpp tests to run on Jenkins. - Cleaned up Makefile * Removed unused header * cpplint fixes * cpplint * cpplint * Fix ci test to run examples * Enabling tests on ci run * Comment save param. This code will be fixed later. * Fixed lenet.cpp Added script to fetch lenet data Enabled lenet test on jenkins. Also added code to run for fewer epocs , as they take long time to train and infer. * lint fixes * Fix test_score.cpp some minor fixes * alexnet save fix. * Replaced "using namespace std;" with explicit "std::" * lint fix * lint fix
2018-05-09 17:33:49 -07:00
#include "utils.h"
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
#include "mxnet-cpp/MxNetCpp.h"
* [cpp-package] fix for issue #7725 (#8551) * remove some unused include (MxNetCpp.h already included op.h) * use same mnist data path avoiding duplication
2017-11-07 02:13:07 +08:00
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
using namespace mxnet::cpp;
Symbol ConvFactoryBN(Symbol data, int num_filter,
Shape kernel, Shape stride, Shape pad,
const std::string & name,
const std::string & suffix = "") {
Symbol conv_w("conv_" + name + suffix + "_w"), conv_b("conv_" + name + suffix + "_b");
Symbol conv = Convolution("conv_" + name + suffix, data,
conv_w, conv_b, kernel,
num_filter, stride, Shape(1, 1), pad);
fix batchNorm cpp example (#6454)
2017-05-27 00:44:41 +08:00
std::string name_suffix = name + suffix;
Symbol gamma(name_suffix + "_gamma");
Symbol beta(name_suffix + "_beta");
Symbol mmean(name_suffix + "_mmean");
Symbol mvar(name_suffix + "_mvar");
Symbol bn = BatchNorm("bn_" + name + suffix, conv, gamma, beta, mmean, mvar);
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
return Activation("relu_" + name + suffix, bn, "relu");
}
Symbol InceptionFactoryA(Symbol data, int num_1x1, int num_3x3red,
int num_3x3, int num_d3x3red, int num_d3x3,
PoolingPoolType pool, int proj,
const std::string & name) {
Symbol c1x1 = ConvFactoryBN(data, num_1x1, Shape(1, 1), Shape(1, 1),
Shape(0, 0), name + "1x1");
Symbol c3x3r = ConvFactoryBN(data, num_3x3red, Shape(1, 1), Shape(1, 1),
Shape(0, 0), name + "_3x3r");
Symbol c3x3 = ConvFactoryBN(c3x3r, num_3x3, Shape(3, 3), Shape(1, 1),
Shape(1, 1), name + "_3x3");
Symbol cd3x3r = ConvFactoryBN(data, num_d3x3red, Shape(1, 1), Shape(1, 1),
Shape(0, 0), name + "_double_3x3", "_reduce");
Symbol cd3x3 = ConvFactoryBN(cd3x3r, num_d3x3, Shape(3, 3), Shape(1, 1),
Shape(1, 1), name + "_double_3x3_0");
cd3x3 = ConvFactoryBN(data = cd3x3, num_d3x3, Shape(3, 3), Shape(1, 1),
Shape(1, 1), name + "_double_3x3_1");
Symbol pooling = Pooling(name + "_pool", data,
Caffe without the patch, cpp-package fixed also with Caffe plugin (#5573) * PEP8 indentation fix * Remove executable flag * Remove executable flags * Fixing cpp-package including problems with caffe converter * Fix warnings * Remove need for caffe patch for caffe plugin * Ignore cmake paths, remove rebuildable op.h for cpp-package * cpp-package examples fixed. Makefile and CMake of op.h and examples added. * cpp-package examples fixed. Makefile and CMake of op.h and examples added. * Fix source file * Better example.mk * Turn off caffe by default * lint fixes * Trying to figure out how to fix submodules * nohub problem on travis so force retry * Edited test to just run make instead of obsolete make example * Fix cpp-package op.h bootstrapping with CMake * Build tweaking cpp-package * Lint fixes * op.h generator * FIx cpp-package for latest merge from master * Fix lint * static link * link whole static lib * Trigger another build attempt * Trigger another build attempt * Add caffe plugin support (disabled until dependencies can be added to build machine) * Add cufft library * win32 cufft library * don't link unit tests as static * Add include for rebuildable protobuf header caffe.pb.h
2017-03-30 20:13:36 -07:00
Shape(3, 3), pool, false, false,
Add ci test for c++ package and rename enum values (#6341) * [cpp-package] Change enum value naming (#6309) * [cpp-package] Add test score * Add ci test for cpp package in jenkins
2017-05-19 23:49:41 +08:00
PoolingPoolingConvention::kValid,
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
Shape(1, 1), Shape(1, 1));
Symbol cproj = ConvFactoryBN(pooling, proj, Shape(1, 1), Shape(1, 1),
Shape(0, 0), name + "_proj");
std::vector<Symbol> lst;
lst.push_back(c1x1);
lst.push_back(c3x3);
lst.push_back(cd3x3);
lst.push_back(cproj);
return Concat("ch_concat_" + name + "_chconcat", lst, lst.size());
}
Symbol InceptionFactoryB(Symbol data, int num_3x3red, int num_3x3,
int num_d3x3red, int num_d3x3, const std::string & name) {
Symbol c3x3r = ConvFactoryBN(data, num_3x3red, Shape(1, 1),
Shape(1, 1), Shape(0, 0),
name + "_3x3", "_reduce");
Symbol c3x3 = ConvFactoryBN(c3x3r, num_3x3, Shape(3, 3), Shape(2, 2),
Shape(1, 1), name + "_3x3");
Symbol cd3x3r = ConvFactoryBN(data, num_d3x3red, Shape(1, 1), Shape(1, 1),
Shape(0, 0), name + "_double_3x3", "_reduce");
Symbol cd3x3 = ConvFactoryBN(cd3x3r, num_d3x3, Shape(3, 3), Shape(1, 1),
Shape(1, 1), name + "_double_3x3_0");
cd3x3 = ConvFactoryBN(cd3x3, num_d3x3, Shape(3, 3), Shape(2, 2),
Shape(1, 1), name + "_double_3x3_1");
Symbol pooling = Pooling("max_pool_" + name + "_pool", data,
Add ci test for c++ package and rename enum values (#6341) * [cpp-package] Change enum value naming (#6309) * [cpp-package] Add test score * Add ci test for cpp package in jenkins
2017-05-19 23:49:41 +08:00
Shape(3, 3), PoolingPoolType::kMax,
[Example] fix cpp example inception-bn and training acc issue (#13284) * fix inception-bn and training acc issue * add parameter initialization, fix lint * fix comparison * change optimizer to sgd * update sgd and update model name * add inception_bn in jenkins build * make max epoch an argument * remove inception_bn test * trigger ci * remove ci test * trigger ci
2018-11-27 09:48:25 -08:00
false, false, PoolingPoolingConvention::kValid,
Shape(2, 2), Shape(1, 1));
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
std::vector<Symbol> lst;
lst.push_back(c3x3);
lst.push_back(cd3x3);
lst.push_back(pooling);
return Concat("ch_concat_" + name + "_chconcat", lst, lst.size());
}
Symbol InceptionSymbol(int num_classes) {
// data and label
Symbol data = Symbol::Variable("data");
Symbol data_label = Symbol::Variable("data_label");
// stage 1
Symbol conv1 = ConvFactoryBN(data, 64, Shape(7, 7), Shape(2, 2), Shape(3, 3), "conv1");
Add ci test for c++ package and rename enum values (#6341) * [cpp-package] Change enum value naming (#6309) * [cpp-package] Add test score * Add ci test for cpp package in jenkins
2017-05-19 23:49:41 +08:00
Symbol pool1 = Pooling("pool1", conv1, Shape(3, 3), PoolingPoolType::kMax,
false, false, PoolingPoolingConvention::kValid, Shape(2, 2));
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
// stage 2
Symbol conv2red = ConvFactoryBN(pool1, 64, Shape(1, 1), Shape(1, 1), Shape(0, 0), "conv2red");
Symbol conv2 = ConvFactoryBN(conv2red, 192, Shape(3, 3), Shape(1, 1), Shape(1, 1), "conv2");
Add ci test for c++ package and rename enum values (#6341) * [cpp-package] Change enum value naming (#6309) * [cpp-package] Add test score * Add ci test for cpp package in jenkins
2017-05-19 23:49:41 +08:00
Symbol pool2 = Pooling("pool2", conv2, Shape(3, 3), PoolingPoolType::kMax,
false, false, PoolingPoolingConvention::kValid, Shape(2, 2));
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
// stage 3
Add ci test for c++ package and rename enum values (#6341) * [cpp-package] Change enum value naming (#6309) * [cpp-package] Add test score * Add ci test for cpp package in jenkins
2017-05-19 23:49:41 +08:00
Symbol in3a = InceptionFactoryA(pool2, 64, 64, 64, 64, 96, PoolingPoolType::kAvg, 32, "3a");
Symbol in3b = InceptionFactoryA(in3a, 64, 64, 96, 64, 96, PoolingPoolType::kAvg, 64, "3b");
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
Symbol in3c = InceptionFactoryB(in3b, 128, 160, 64, 96, "3c");
// stage 4
Add ci test for c++ package and rename enum values (#6341) * [cpp-package] Change enum value naming (#6309) * [cpp-package] Add test score * Add ci test for cpp package in jenkins
2017-05-19 23:49:41 +08:00
Symbol in4a = InceptionFactoryA(in3c, 224, 64, 96, 96, 128, PoolingPoolType::kAvg, 128, "4a");
Symbol in4b = InceptionFactoryA(in4a, 192, 96, 128, 96, 128, PoolingPoolType::kAvg, 128, "4b");
Symbol in4c = InceptionFactoryA(in4b, 160, 128, 160, 128, 160, PoolingPoolType::kAvg, 128, "4c");
Symbol in4d = InceptionFactoryA(in4c, 96, 128, 192, 160, 192, PoolingPoolType::kAvg, 128, "4d");
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
Symbol in4e = InceptionFactoryB(in4d, 128, 192, 192, 256, "4e");
// stage 5
Add ci test for c++ package and rename enum values (#6341) * [cpp-package] Change enum value naming (#6309) * [cpp-package] Add test score * Add ci test for cpp package in jenkins
2017-05-19 23:49:41 +08:00
Symbol in5a = InceptionFactoryA(in4e, 352, 192, 320, 160, 224, PoolingPoolType::kAvg, 128, "5a");
Symbol in5b = InceptionFactoryA(in5a, 352, 192, 320, 192, 224, PoolingPoolType::kMax, 128, "5b");
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
// average pooling
Add ci test for c++ package and rename enum values (#6341) * [cpp-package] Change enum value naming (#6309) * [cpp-package] Add test score * Add ci test for cpp package in jenkins
2017-05-19 23:49:41 +08:00
Symbol avg = Pooling("global_pool", in5b, Shape(7, 7), PoolingPoolType::kAvg);
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
// classifier
Symbol flatten = Flatten("flatten", avg);
Symbol conv1_w("conv1_w"), conv1_b("conv1_b");
Symbol fc1 = FullyConnected("fc1", flatten, conv1_w, conv1_b, num_classes);
return SoftmaxOutput("softmax", fc1, data_label);
}
print error message for mxnet::cpp::Operator::Invoke when failed (#14318) * raise exceptions for mxnet::cpp::Operator::Invoke when failed * fix input shape * fix cpplint * fix cpp-package example shape
2019-03-07 12:53:27 +08:00
NDArray ResizeInput(NDArray data, const Shape new_shape) {
NDArray pic = data.Reshape(Shape(0, 1, 28, 28));
NDArray pic_1channel;
Operator("_contrib_BilinearResize2D")
.SetParam("height", new_shape[2])
.SetParam("width", new_shape[3])
(pic).Invoke(pic_1channel);
NDArray output;
Operator("tile")
.SetParam("reps", Shape(1, 3, 1, 1))
(pic_1channel).Invoke(output);
return output;
}
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
int main(int argc, char const *argv[]) {
int batch_size = 40;
MXNET-1444/MXNET-1445: replace NULL by nullptr (#17543) * replace NULL by nullptr literal in cpp-package - MXNET-1444 - using nullptr is more explicit - macro NULL can be a integer literal with value zero (since C++11) - literal nullptr is of type std::nullptr_t - as template arg NULL and 0 evaluate to integer * replace NULL by nullptr literal in backend - MXNET-1445 - using nullptr is more explicit - macro NULL can be a integer literal with value zero (since C++11) - literal nullptr is of type std::nullptr_t - as template arg NULL and 0 evaluate to integer * fix whitespace errors in lib_api.h
2020-02-09 02:50:49 +01:00
int max_epoch = argc > 1 ? strtol(argv[1], nullptr, 10) : 100;
[Example] fix cpp example inception-bn and training acc issue (#13284) * fix inception-bn and training acc issue * add parameter initialization, fix lint * fix comparison * change optimizer to sgd * update sgd and update model name * add inception_bn in jenkins build * make max epoch an argument * remove inception_bn test * trigger ci * remove ci test * trigger ci
2018-11-27 09:48:25 -08:00
float learning_rate = 1e-2;
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
float weight_decay = 1e-4;
print error message for mxnet::cpp::Operator::Invoke when failed (#14318) * raise exceptions for mxnet::cpp::Operator::Invoke when failed * fix input shape * fix cpplint * fix cpp-package example shape
2019-03-07 12:53:27 +08:00
/*context*/
auto ctx = Context::cpu();
int num_gpu;
MXGetGPUCount(&num_gpu);
#if !MXNET_USE_CPU
if (num_gpu > 0) {
ctx = Context::gpu();
}
Fix for cpp examples in mxnet/cpp-package. (#10726) * Fix for cpp examples in mxnet/cpp-package. - Refactored makefile - Added macro to check for using GPU/CPU - Changed cpp files to use correct data set - Added error checking for data files * cpplint fix * cpplint fix * Fix complitaion warnings and an error. * - Refarctored code , added a utils file for loading data - Enabled cpp tests to run on Jenkins. - Cleaned up Makefile * Removed unused header * cpplint fixes * cpplint * cpplint * Fix ci test to run examples * Enabling tests on ci run * Comment save param. This code will be fixed later. * Fixed lenet.cpp Added script to fetch lenet data Enabled lenet test on jenkins. Also added code to run for fewer epocs , as they take long time to train and infer. * lint fixes * Fix test_score.cpp some minor fixes * alexnet save fix. * Replaced "using namespace std;" with explicit "std::" * lint fix * lint fix
2018-05-09 17:33:49 -07:00
#endif
[MXNET-1357] Fix the cpp-examples to add exception handling (#14441) * Adding exception handling to the cpp-package examples. * Updating exception handling to catch dmlc::error. * Removed the catch all exception.
2019-04-02 16:23:54 -07:00
TRY
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
auto inception_bn_net = InceptionSymbol(10);
std::map<std::string, NDArray> args_map;
std::map<std::string, NDArray> aux_map;
print error message for mxnet::cpp::Operator::Invoke when failed (#14318) * raise exceptions for mxnet::cpp::Operator::Invoke when failed * fix input shape * fix cpplint * fix cpp-package example shape
2019-03-07 12:53:27 +08:00
const Shape data_shape = Shape(batch_size, 3, 224, 224),
label_shape = Shape(batch_size);
args_map["data"] = NDArray(data_shape, ctx);
args_map["data_label"] = NDArray(label_shape, ctx);
Fix for cpp examples in mxnet/cpp-package. (#10726) * Fix for cpp examples in mxnet/cpp-package. - Refactored makefile - Added macro to check for using GPU/CPU - Changed cpp files to use correct data set - Added error checking for data files * cpplint fix * cpplint fix * Fix complitaion warnings and an error. * - Refarctored code , added a utils file for loading data - Enabled cpp tests to run on Jenkins. - Cleaned up Makefile * Removed unused header * cpplint fixes * cpplint * cpplint * Fix ci test to run examples * Enabling tests on ci run * Comment save param. This code will be fixed later. * Fixed lenet.cpp Added script to fetch lenet data Enabled lenet test on jenkins. Also added code to run for fewer epocs , as they take long time to train and infer. * lint fixes * Fix test_score.cpp some minor fixes * alexnet save fix. * Replaced "using namespace std;" with explicit "std::" * lint fix * lint fix
2018-05-09 17:33:49 -07:00
inception_bn_net.InferArgsMap(ctx, &args_map, args_map);
std::vector<std::string> data_files = { "./data/mnist_data/train-images-idx3-ubyte",
"./data/mnist_data/train-labels-idx1-ubyte",
"./data/mnist_data/t10k-images-idx3-ubyte",
"./data/mnist_data/t10k-labels-idx1-ubyte"
};
auto train_iter = MXDataIter("MNISTIter");
Add error checking for cpp examples. (#13828)
2019-01-17 01:40:23 -08:00
if (!setDataIter(&train_iter, "Train", data_files, batch_size)) {
return 1;
}
Fix for cpp examples in mxnet/cpp-package. (#10726) * Fix for cpp examples in mxnet/cpp-package. - Refactored makefile - Added macro to check for using GPU/CPU - Changed cpp files to use correct data set - Added error checking for data files * cpplint fix * cpplint fix * Fix complitaion warnings and an error. * - Refarctored code , added a utils file for loading data - Enabled cpp tests to run on Jenkins. - Cleaned up Makefile * Removed unused header * cpplint fixes * cpplint * cpplint * Fix ci test to run examples * Enabling tests on ci run * Comment save param. This code will be fixed later. * Fixed lenet.cpp Added script to fetch lenet data Enabled lenet test on jenkins. Also added code to run for fewer epocs , as they take long time to train and infer. * lint fixes * Fix test_score.cpp some minor fixes * alexnet save fix. * Replaced "using namespace std;" with explicit "std::" * lint fix * lint fix
2018-05-09 17:33:49 -07:00
auto val_iter = MXDataIter("MNISTIter");
Add error checking for cpp examples. (#13828)
2019-01-17 01:40:23 -08:00
if (!setDataIter(&val_iter, "Label", data_files, batch_size)) {
return 1;
}
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
[Example] fix cpp example inception-bn and training acc issue (#13284) * fix inception-bn and training acc issue * add parameter initialization, fix lint * fix comparison * change optimizer to sgd * update sgd and update model name * add inception_bn in jenkins build * make max epoch an argument * remove inception_bn test * trigger ci * remove ci test * trigger ci
2018-11-27 09:48:25 -08:00
// initialize parameters
Xavier xavier = Xavier(Xavier::gaussian, Xavier::in, 2);
for (auto &arg : args_map) {
xavier(arg.first, &arg.second);
}
Optimizer* opt = OptimizerRegistry::Find("sgd");
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
opt->SetParam("momentum", 0.9)
->SetParam("rescale_grad", 1.0 / batch_size)
[cpp-package] add lr scheduler (#6885) * add lr scheduler * Update lr_scheduler.h * Update mlp_gpu.cpp * Update test_score.cpp * update optimizer.hpp
2017-08-04 04:18:07 +08:00
->SetParam("clip_gradient", 10)
->SetParam("lr", learning_rate)
->SetParam("wd", weight_decay);
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
Fix for cpp examples in mxnet/cpp-package. (#10726) * Fix for cpp examples in mxnet/cpp-package. - Refactored makefile - Added macro to check for using GPU/CPU - Changed cpp files to use correct data set - Added error checking for data files * cpplint fix * cpplint fix * Fix complitaion warnings and an error. * - Refarctored code , added a utils file for loading data - Enabled cpp tests to run on Jenkins. - Cleaned up Makefile * Removed unused header * cpplint fixes * cpplint * cpplint * Fix ci test to run examples * Enabling tests on ci run * Comment save param. This code will be fixed later. * Fixed lenet.cpp Added script to fetch lenet data Enabled lenet test on jenkins. Also added code to run for fewer epocs , as they take long time to train and infer. * lint fixes * Fix test_score.cpp some minor fixes * alexnet save fix. * Replaced "using namespace std;" with explicit "std::" * lint fix * lint fix
2018-05-09 17:33:49 -07:00
auto *exec = inception_bn_net.SimpleBind(ctx, args_map);
[cpp-package] add lr scheduler (#6885) * add lr scheduler * Update lr_scheduler.h * Update mlp_gpu.cpp * Update test_score.cpp * update optimizer.hpp
2017-08-04 04:18:07 +08:00
auto arg_names = inception_bn_net.ListArguments();
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
[Example] fix cpp example inception-bn and training acc issue (#13284) * fix inception-bn and training acc issue * add parameter initialization, fix lint * fix comparison * change optimizer to sgd * update sgd and update model name * add inception_bn in jenkins build * make max epoch an argument * remove inception_bn test * trigger ci * remove ci test * trigger ci
2018-11-27 09:48:25 -08:00
// Create metrics
Accuracy train_acc, val_acc;
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
for (int iter = 0; iter < max_epoch; ++iter) {
LG << "Epoch: " << iter;
train_iter.Reset();
[Example] fix cpp example inception-bn and training acc issue (#13284) * fix inception-bn and training acc issue * add parameter initialization, fix lint * fix comparison * change optimizer to sgd * update sgd and update model name * add inception_bn in jenkins build * make max epoch an argument * remove inception_bn test * trigger ci * remove ci test * trigger ci
2018-11-27 09:48:25 -08:00
train_acc.Reset();
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
while (train_iter.Next()) {
auto data_batch = train_iter.GetDataBatch();
print error message for mxnet::cpp::Operator::Invoke when failed (#14318) * raise exceptions for mxnet::cpp::Operator::Invoke when failed * fix input shape * fix cpplint * fix cpp-package example shape
2019-03-07 12:53:27 +08:00
ResizeInput(data_batch.data, data_shape).CopyTo(&args_map["data"]);
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
data_batch.label.CopyTo(&args_map["data_label"]);
NDArray::WaitAll();
exec->Forward(true);
exec->Backward();
[cpp-package] add lr scheduler (#6885) * add lr scheduler * Update lr_scheduler.h * Update mlp_gpu.cpp * Update test_score.cpp * update optimizer.hpp
2017-08-04 04:18:07 +08:00
// Update parameters
for (size_t i = 0; i < arg_names.size(); ++i) {
if (arg_names[i] == "data" || arg_names[i] == "data_label") continue;
opt->Update(i, exec->arg_arrays[i], exec->grad_arrays[i]);
}
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
NDArray::WaitAll();
[Example] fix cpp example inception-bn and training acc issue (#13284) * fix inception-bn and training acc issue * add parameter initialization, fix lint * fix comparison * change optimizer to sgd * update sgd and update model name * add inception_bn in jenkins build * make max epoch an argument * remove inception_bn test * trigger ci * remove ci test * trigger ci
2018-11-27 09:48:25 -08:00
train_acc.Update(data_batch.label, exec->outputs[0]);
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
}
val_iter.Reset();
[Example] fix cpp example inception-bn and training acc issue (#13284) * fix inception-bn and training acc issue * add parameter initialization, fix lint * fix comparison * change optimizer to sgd * update sgd and update model name * add inception_bn in jenkins build * make max epoch an argument * remove inception_bn test * trigger ci * remove ci test * trigger ci
2018-11-27 09:48:25 -08:00
val_acc.Reset();
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
while (val_iter.Next()) {
auto data_batch = val_iter.GetDataBatch();
print error message for mxnet::cpp::Operator::Invoke when failed (#14318) * raise exceptions for mxnet::cpp::Operator::Invoke when failed * fix input shape * fix cpplint * fix cpp-package example shape
2019-03-07 12:53:27 +08:00
ResizeInput(data_batch.data, data_shape).CopyTo(&args_map["data"]);
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
data_batch.label.CopyTo(&args_map["data_label"]);
NDArray::WaitAll();
exec->Forward(false);
NDArray::WaitAll();
[Example] fix cpp example inception-bn and training acc issue (#13284) * fix inception-bn and training acc issue * add parameter initialization, fix lint * fix comparison * change optimizer to sgd * update sgd and update model name * add inception_bn in jenkins build * make max epoch an argument * remove inception_bn test * trigger ci * remove ci test * trigger ci
2018-11-27 09:48:25 -08:00
val_acc.Update(data_batch.label, exec->outputs[0]);
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
}
[Example] fix cpp example inception-bn and training acc issue (#13284) * fix inception-bn and training acc issue * add parameter initialization, fix lint * fix comparison * change optimizer to sgd * update sgd and update model name * add inception_bn in jenkins build * make max epoch an argument * remove inception_bn test * trigger ci * remove ci test * trigger ci
2018-11-27 09:48:25 -08:00
LG << "Train Accuracy: " << train_acc.Get();
LG << "Validation Accuracy: " << val_acc.Get();
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
}
delete exec;
fix memory-related issues to enable ASAN tests (#14223) * fix heap overflow * fix memory leak of optimizer and executer * uncomment memory pool free * run cleanup in engine shutdown phase * make asan tests blocking * fix abort in mxnet shutdown, use forked submodules temporally for tests * trigger CI * change submodule mshadow * change submodule dmlc-core
2019-03-03 12:37:11 +08:00
delete opt;
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
MXNotifyShutdown();
[MXNET-1357] Fix the cpp-examples to add exception handling (#14441) * Adding exception handling to the cpp-package examples. * Updating exception handling to catch dmlc::error. * Removed the catch all exception.
2019-04-02 16:23:54 -07:00
CATCH
Integrate cpp package (#5251) * Copy mxnet.cpp to cpp-package sub directory * Add missing type name declaration for nnvm::Tuple<dmlc::optional<int>> * Add trigger to update operation wrapper in cpp package when building mxnet * Add test to travis scripts * Disable op generation on windows
2017-03-22 11:55:51 +08:00
return 0;
}
Reference in New Issue Copy Permalink