This is an automated email from the ASF dual-hosted git repository.
zhasheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git.
from 5df0025 Fix race condition in FusedOp (#18498)
add e3493e7 remove tools dependent on mx.module APIs (#18508)
No new revisions were added by this update.
Summary of changes:
docs/static_site/src/pages/api/faq/caffe.md | 61 +-
example/ssd/README.md | 14 -
example/ssd/tools/caffe_converter/.gitignore | 5 -
example/ssd/tools/caffe_converter/Makefile | 33 -
example/ssd/tools/caffe_converter/README.md | 37 -
example/ssd/tools/caffe_converter/caffe.proto | 1938 --------------------
.../caffe_parse/parse_from_protobuf.py | 55 -
example/ssd/tools/caffe_converter/caffe_parser.py | 80 -
.../ssd/tools/caffe_converter/caffe_proto_utils.py | 204 ---
.../ssd/tools/caffe_converter/compare_layers.py | 365 ----
example/ssd/tools/caffe_converter/convert_mean.py | 63 -
example/ssd/tools/caffe_converter/convert_model.py | 224 ---
.../ssd/tools/caffe_converter/convert_symbol.py | 394 ----
example/ssd/tools/caffe_converter/make_win32.bat | 20 -
example/ssd/tools/caffe_converter/mean_image.py | 67 -
tools/caffe_converter/.gitignore | 2 -
tools/caffe_converter/Makefile | 33 -
tools/caffe_converter/README.md | 30 -
tools/caffe_converter/caffe.proto | 1416 --------------
tools/caffe_converter/caffe_parser.py | 81 -
tools/caffe_converter/caffe_proto_utils.py | 204 ---
tools/caffe_converter/compare_layers.py | 362 ----
tools/caffe_converter/convert_caffe_modelzoo.py | 162 --
tools/caffe_converter/convert_mean.py | 63 -
tools/caffe_converter/convert_model.py | 229 ---
tools/caffe_converter/convert_symbol.py | 333 ----
tools/caffe_converter/make_win32.bat | 20 -
tools/caffe_converter/run.sh | 50 -
tools/caffe_converter/test_converter.py | 110 --
tools/caffe_translator/README.md | 96 -
tools/caffe_translator/build.gradle | 152 --
tools/caffe_translator/build_from_source.md | 38 -
tools/caffe_translator/faq.md | 34 -
tools/caffe_translator/gradle.properties | 29 -
.../gradle/wrapper/gradle-wrapper.properties | 22 -
tools/caffe_translator/gradlew | 189 --
tools/caffe_translator/gradlew.bat | 101 -
.../scripts/convert_caffe_model.py | 121 --
tools/caffe_translator/settings.gradle | 19 -
.../io/mxnet/caffetranslator/CaffePrototxt.g4 | 74 -
.../main/java/io/mxnet/caffetranslator/Config.java | 55 -
.../java/io/mxnet/caffetranslator/Converter.java | 429 -----
.../mxnet/caffetranslator/CreateModelListener.java | 144 --
.../io/mxnet/caffetranslator/GenerationHelper.java | 195 --
.../io/mxnet/caffetranslator/GeneratorOutput.java | 35 -
.../java/io/mxnet/caffetranslator/Launcher.java | 178 --
.../main/java/io/mxnet/caffetranslator/Layer.java | 141 --
.../java/io/mxnet/caffetranslator/MLModel.java | 105 --
.../java/io/mxnet/caffetranslator/Optimizer.java | 48 -
.../io/mxnet/caffetranslator/ParserHelper.java | 36 -
.../main/java/io/mxnet/caffetranslator/Solver.java | 148 --
.../io/mxnet/caffetranslator/SolverListener.java | 58 -
.../io/mxnet/caffetranslator/SymbolGenerator.java | 29 -
.../caffetranslator/SymbolGeneratorFactory.java | 53 -
.../main/java/io/mxnet/caffetranslator/Utils.java | 42 -
.../generators/AccuracyMetricsGenerator.java | 83 -
.../caffetranslator/generators/BaseGenerator.java | 60 -
.../generators/BatchNormGenerator.java | 65 -
.../generators/ConcatGenerator.java | 49 -
.../generators/ConvolutionGenerator.java | 101 -
.../generators/DeconvolutionGenerator.java | 103 --
.../generators/DropoutGenerator.java | 43 -
.../generators/EltwiseGenerator.java | 69 -
.../caffetranslator/generators/FCGenerator.java | 82 -
.../generators/FlattenGenerator.java | 49 -
.../generators/PermuteGenerator.java | 48 -
.../generators/PluginIntLayerGenerator.java | 80 -
.../generators/PluginLayerHelper.java | 63 -
.../generators/PluginLossGenerator.java | 69 -
.../generators/PoolingGenerator.java | 86 -
.../caffetranslator/generators/PowerGenerator.java | 51 -
.../caffetranslator/generators/ReluGenerator.java | 44 -
.../caffetranslator/generators/ScaleGenerator.java | 66 -
.../generators/SoftmaxOutputGenerator.java | 43 -
.../mxnet/caffetranslator/misc/CollectStats.java | 73 -
.../mxnet/caffetranslator/misc/StatsListener.java | 103 --
.../src/main/resources/templates/accuracy.st | 20 -
.../src/main/resources/templates/activation.st | 19 -
.../src/main/resources/templates/add.st | 19 -
.../src/main/resources/templates/batchnorm.st | 32 -
.../src/main/resources/templates/concat.st | 19 -
.../src/main/resources/templates/convolution.st | 27 -
.../src/main/resources/templates/deconvolution.st | 28 -
.../src/main/resources/templates/dropout.st | 19 -
.../src/main/resources/templates/fc.st | 19 -
.../src/main/resources/templates/flatten.st | 19 -
.../src/main/resources/templates/group.st | 19 -
.../src/main/resources/templates/imports.st | 25 -
.../src/main/resources/templates/init_params.st | 25 -
.../src/main/resources/templates/iterator.st | 28 -
.../src/main/resources/templates/logging.st | 29 -
.../src/main/resources/templates/lrn.st | 19 -
.../src/main/resources/templates/lrpolicy_exp.st | 21 -
.../src/main/resources/templates/lrpolicy_inv.st | 21 -
.../main/resources/templates/lrpolicy_multistep.st | 23 -
.../src/main/resources/templates/lrpolicy_poly.st | 21 -
.../main/resources/templates/lrpolicy_sigmoid.st | 21 -
.../src/main/resources/templates/lrpolicy_step.st | 22 -
.../src/main/resources/templates/maxium.st | 19 -
.../main/resources/templates/metrics_classes.st | 104 --
.../src/main/resources/templates/mul.st | 19 -
.../src/main/resources/templates/opt_adadelta.st | 32 -
.../src/main/resources/templates/opt_adagrad.st | 28 -
.../src/main/resources/templates/opt_adam.st | 36 -
.../src/main/resources/templates/opt_nesterov.st | 28 -
.../src/main/resources/templates/opt_rmsprop.st | 32 -
.../src/main/resources/templates/opt_sgd.st | 28 -
.../src/main/resources/templates/opt_vars.st | 24 -
.../main/resources/templates/param_initializer.st | 30 -
.../src/main/resources/templates/params_loader.st | 31 -
.../src/main/resources/templates/permute.st | 19 -
.../src/main/resources/templates/pooling.st | 34 -
.../src/main/resources/templates/power.st | 19 -
.../src/main/resources/templates/runner.st | 75 -
.../src/main/resources/templates/softmaxoutput.st | 21 -
.../src/main/resources/templates/symbols.stg | 25 -
.../src/main/resources/templates/top_k_accuracy.st | 20 -
.../src/main/resources/templates/var.st | 19 -
tools/coreml/README.md | 128 --
tools/coreml/converter/__init__.py | 16 -
tools/coreml/converter/_add_pooling.py | 118 --
tools/coreml/converter/_layers.py | 656 -------
tools/coreml/converter/_mxnet_converter.py | 235 ---
tools/coreml/converter/utils.py | 118 --
tools/coreml/mxnet_coreml_converter.py | 115 --
tools/coreml/pip_package/.gitignore | 10 -
tools/coreml/pip_package/MANIFEST.in | 19 -
tools/coreml/pip_package/README.rst | 61 -
tools/coreml/pip_package/setup.py | 69 -
tools/coreml/test/test_mxnet_converter.py | 1091 -----------
tools/coreml/test/test_mxnet_image.py | 142 --
tools/coreml/test/test_mxnet_models.py | 165 --
tools/pip/setup.py | 1 -
133 files changed, 1 insertion(+), 14737 deletions(-)
delete mode 100644 example/ssd/tools/caffe_converter/.gitignore
delete mode 100644 example/ssd/tools/caffe_converter/Makefile
delete mode 100644 example/ssd/tools/caffe_converter/README.md
delete mode 100644 example/ssd/tools/caffe_converter/caffe.proto
delete mode 100644
example/ssd/tools/caffe_converter/caffe_parse/parse_from_protobuf.py
delete mode 100644 example/ssd/tools/caffe_converter/caffe_parser.py
delete mode 100644 example/ssd/tools/caffe_converter/caffe_proto_utils.py
delete mode 100644 example/ssd/tools/caffe_converter/compare_layers.py
delete mode 100644 example/ssd/tools/caffe_converter/convert_mean.py
delete mode 100644 example/ssd/tools/caffe_converter/convert_model.py
delete mode 100644 example/ssd/tools/caffe_converter/convert_symbol.py
delete mode 100644 example/ssd/tools/caffe_converter/make_win32.bat
delete mode 100644 example/ssd/tools/caffe_converter/mean_image.py
delete mode 100644 tools/caffe_converter/.gitignore
delete mode 100644 tools/caffe_converter/Makefile
delete mode 100644 tools/caffe_converter/README.md
delete mode 100644 tools/caffe_converter/caffe.proto
delete mode 100644 tools/caffe_converter/caffe_parser.py
delete mode 100644 tools/caffe_converter/caffe_proto_utils.py
delete mode 100644 tools/caffe_converter/compare_layers.py
delete mode 100644 tools/caffe_converter/convert_caffe_modelzoo.py
delete mode 100644 tools/caffe_converter/convert_mean.py
delete mode 100644 tools/caffe_converter/convert_model.py
delete mode 100644 tools/caffe_converter/convert_symbol.py
delete mode 100644 tools/caffe_converter/make_win32.bat
delete mode 100755 tools/caffe_converter/run.sh
delete mode 100644 tools/caffe_converter/test_converter.py
delete mode 100644 tools/caffe_translator/README.md
delete mode 100644 tools/caffe_translator/build.gradle
delete mode 100644 tools/caffe_translator/build_from_source.md
delete mode 100644 tools/caffe_translator/faq.md
delete mode 100644 tools/caffe_translator/gradle.properties
delete mode 100644
tools/caffe_translator/gradle/wrapper/gradle-wrapper.properties
delete mode 100755 tools/caffe_translator/gradlew
delete mode 100644 tools/caffe_translator/gradlew.bat
delete mode 100644 tools/caffe_translator/scripts/convert_caffe_model.py
delete mode 100644 tools/caffe_translator/settings.gradle
delete mode 100644
tools/caffe_translator/src/main/antlr/io/mxnet/caffetranslator/CaffePrototxt.g4
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/Config.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/Converter.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/CreateModelListener.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/GenerationHelper.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/GeneratorOutput.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/Launcher.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/Layer.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/MLModel.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/Optimizer.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/ParserHelper.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/Solver.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/SolverListener.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/SymbolGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/SymbolGeneratorFactory.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/Utils.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/AccuracyMetricsGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/BaseGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/BatchNormGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/ConcatGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/ConvolutionGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/DeconvolutionGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/DropoutGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/EltwiseGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/FCGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/FlattenGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/PermuteGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/PluginIntLayerGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/PluginLayerHelper.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/PluginLossGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/PoolingGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/PowerGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/ReluGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/ScaleGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/generators/SoftmaxOutputGenerator.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/misc/CollectStats.java
delete mode 100644
tools/caffe_translator/src/main/java/io/mxnet/caffetranslator/misc/StatsListener.java
delete mode 100644
tools/caffe_translator/src/main/resources/templates/accuracy.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/activation.st
delete mode 100644 tools/caffe_translator/src/main/resources/templates/add.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/batchnorm.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/concat.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/convolution.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/deconvolution.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/dropout.st
delete mode 100644 tools/caffe_translator/src/main/resources/templates/fc.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/flatten.st
delete mode 100644 tools/caffe_translator/src/main/resources/templates/group.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/imports.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/init_params.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/iterator.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/logging.st
delete mode 100644 tools/caffe_translator/src/main/resources/templates/lrn.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/lrpolicy_exp.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/lrpolicy_inv.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/lrpolicy_multistep.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/lrpolicy_poly.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/lrpolicy_sigmoid.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/lrpolicy_step.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/maxium.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/metrics_classes.st
delete mode 100644 tools/caffe_translator/src/main/resources/templates/mul.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/opt_adadelta.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/opt_adagrad.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/opt_adam.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/opt_nesterov.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/opt_rmsprop.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/opt_sgd.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/opt_vars.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/param_initializer.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/params_loader.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/permute.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/pooling.st
delete mode 100644 tools/caffe_translator/src/main/resources/templates/power.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/runner.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/softmaxoutput.st
delete mode 100644
tools/caffe_translator/src/main/resources/templates/symbols.stg
delete mode 100644
tools/caffe_translator/src/main/resources/templates/top_k_accuracy.st
delete mode 100644 tools/caffe_translator/src/main/resources/templates/var.st
delete mode 100644 tools/coreml/README.md
delete mode 100644 tools/coreml/converter/__init__.py
delete mode 100644 tools/coreml/converter/_add_pooling.py
delete mode 100644 tools/coreml/converter/_layers.py
delete mode 100644 tools/coreml/converter/_mxnet_converter.py
delete mode 100644 tools/coreml/converter/utils.py
delete mode 100644 tools/coreml/mxnet_coreml_converter.py
delete mode 100644 tools/coreml/pip_package/.gitignore
delete mode 100644 tools/coreml/pip_package/MANIFEST.in
delete mode 100644 tools/coreml/pip_package/README.rst
delete mode 100644 tools/coreml/pip_package/setup.py
delete mode 100644 tools/coreml/test/test_mxnet_converter.py
delete mode 100644 tools/coreml/test/test_mxnet_image.py
delete mode 100644 tools/coreml/test/test_mxnet_models.py