-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Caffe without the patch, cpp-package fixed also with Caffe plugin (#5…
…573) * 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
- Loading branch information
1 parent
7f688f7
commit a5abd79
Showing
66 changed files
with
559 additions
and
7,914 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
|
|
||
| if(USE_CPP_PACKAGE AND NOT MSVC) | ||
|
|
||
| set(CPP_PACKAGE_OP_H_HEADER ${CMAKE_CURRENT_LIST_DIR}/include/mxnet-cpp/op.h) | ||
|
|
||
| add_custom_target( | ||
| cpp_package_op_h ALL | ||
| BYPRODUCTS ${CPP_PACKAGE_OP_H_HEADER} | ||
| MAIN_DEPENDENCY mxnet | ||
| DEPENDS mxnet ${CMAKE_SOURCE_DIR}/cpp-package/src/OpWrapperGenerator/OpWrapperGenerator.py | ||
| COMMAND echo "Running: OpWrapperGenerator.py" | ||
| COMMAND python OpWrapperGenerator.py ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/$<TARGET_FILE:mxnet> | ||
| WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cpp-package/src/OpWrapperGenerator/ | ||
| ) | ||
|
|
||
| add_subdirectory(example) | ||
|
|
||
| endif() |
Empty file.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| ifndef LINT_LANG | ||
| LINT_LANG="all" | ||
| endif | ||
|
|
||
| ifdef CAFFE_PATH | ||
| export LD_LIBRARY_PATH=$(CAFFE_PATH)/lib | ||
| endif | ||
|
|
||
| CPP_PACKAGE_OP_H_FILE = cpp-package/include/mxnet-cpp/op.h | ||
|
|
||
| EXTRA_PACKAGES += cpp-package-all | ||
| EXTRA_PACKAGES_CLEAN += cpp-package-clean | ||
|
|
||
| .PHONY: cpp-package-all cpp-package-lint cpp-package-clean | ||
|
|
||
| cpp-package-all: $(CPP_PACKAGE_OP_H_FILE) | ||
|
|
||
| cpp-package-clean: | ||
| rm -f $(CPP_PACKAGE_OP_H_FILE) | ||
|
|
||
| $(CPP_PACKAGE_OP_H_FILE): lib/libmxnet.so cpp-package/src/OpWrapperGenerator/OpWrapperGenerator.py | ||
| (cd cpp-package/src/OpWrapperGenerator; python OpWrapperGenerator.py $(ROOTDIR)/lib/libmxnet.so) | ||
|
|
||
| cpp-package-lint: | ||
| (cd cpp-package; python scripts/lint.py dmlc ${LINT_LANG} include example) | ||
|
|
||
| include cpp-package/example/example.mk | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
|
|
||
| if(NOT MSVC) | ||
| set(UNITTEST_STATIC_LINK ON) | ||
| endif() | ||
|
|
||
| set(CPP_EXAMPLE_LIBS | ||
| rt | ||
| ${BEGIN_WHOLE_ARCHIVE} mxnet_static ${END_WHOLE_ARCHIVE} | ||
| dmlccore | ||
| ${mxnet_LINKER_LIBS} | ||
| ) | ||
|
|
||
| set(CPP_PACKAGE_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../include/mxnet-cpp/) | ||
|
|
||
| set(CPPEX_DEPS cpp_package_op_h) | ||
|
|
||
| file(GLOB_RECURSE CPP_PACKAGE_HEADERS | ||
| "${CPP_PACKAGE_INCLUDE_DIR}/*.h" | ||
| "${CPP_PACKAGE_INCLUDE_DIR}/*.hpp" | ||
| ) | ||
|
|
||
| include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include) | ||
|
|
||
| add_executable(lenet lenet.cpp ${CPP_PACKAGE_HEADERS}) | ||
| target_link_libraries(lenet ${CPP_EXAMPLE_LIBS}) | ||
| add_dependencies(lenet ${CPPEX_DEPS}) | ||
|
|
||
| add_executable(lenet_with_mxdataiter lenet_with_mxdataiter.cpp ${CPP_PACKAGE_HEADERS}) | ||
| target_link_libraries(lenet_with_mxdataiter ${CPP_EXAMPLE_LIBS}) | ||
| add_dependencies(lenet_with_mxdataiter ${CPPEX_DEPS}) | ||
|
|
||
| add_executable(alexnet alexnet.cpp ${CPP_PACKAGE_HEADERS}) | ||
| target_link_libraries(alexnet ${CPP_EXAMPLE_LIBS}) | ||
| add_dependencies(alexnet ${CPPEX_DEPS}) | ||
|
|
||
| add_executable(charRNN charRNN.cpp ${CPP_PACKAGE_HEADERS}) | ||
| target_link_libraries(charRNN ${CPP_EXAMPLE_LIBS}) | ||
| add_dependencies(charRNN ${CPPEX_DEPS}) | ||
|
|
||
| add_executable(googlenet googlenet.cpp ${CPP_PACKAGE_HEADERS}) | ||
| target_link_libraries(googlenet ${CPP_EXAMPLE_LIBS}) | ||
| add_dependencies(googlenet ${CPPEX_DEPS}) | ||
|
|
||
| add_executable(inception_bn inception_bn.cpp ${CPP_PACKAGE_HEADERS}) | ||
| target_link_libraries(inception_bn ${CPP_EXAMPLE_LIBS}) | ||
| add_dependencies(inception_bn ${CPPEX_DEPS}) | ||
|
|
||
| add_executable(mlp mlp.cpp ${CPP_PACKAGE_HEADERS}) | ||
| target_link_libraries(mlp ${CPP_EXAMPLE_LIBS}) | ||
| add_dependencies(mlp ${CPPEX_DEPS}) | ||
|
|
||
| add_executable(resnet resnet.cpp ${CPP_PACKAGE_HEADERS}) | ||
| target_link_libraries(resnet ${CPP_EXAMPLE_LIBS}) | ||
| add_dependencies(resnet ${CPPEX_DEPS}) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.