bert/research-project
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simpler build for deinplace tool.

Browse Source
This commit is contained in:
Bert Peters
2018-03-24 12:48:56 +01:00
parent 1077f6ab46
commit a0a39c82c7
3 changed files with 3 additions and 1421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -40,12 +40,6 @@ install(TARGETS fmri DESTINATION bin)
# Build instructions for the deinplace tool # Build instructions for the deinplace tool
find_package(Protobuf REQUIRED) find_package(Protobuf REQUIRED)
protobuf_generate_cpp(CAFFE_PROTO_CPP CAFFE_PROTO_HEADERS "src/proto/caffe.proto") add_executable(deinplace "src/tools/deinplace.cpp")
add_executable(deinplace
"src/tools/deinplace.cpp"
${CAFFE_PROTO_CPP}
${CAFFE_PROTO_HEADERS}
)
target_compile_options(deinplace PRIVATE "-Wall" "-Wextra" "-pedantic") target_compile_options(deinplace PRIVATE "-Wall" "-Wextra" "-pedantic")
target_link_libraries(deinplace protobuf::libprotobuf) target_link_libraries(deinplace Caffe::Caffe protobuf::libprotobuf)
target_include_directories(deinplace PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")

1412
src/proto/caffe.proto
View File

File diff suppressed because it is too large Load Diff

2
src/tools/deinplace.cpp
View File

@@ -4,7 +4,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <google/protobuf/text_format.h> #include <google/protobuf/text_format.h>
#include <google/protobuf/io/zero_copy_stream_impl.h> #include <google/protobuf/io/zero_copy_stream_impl.h>
#include "caffe.pb.h" #include <caffe/proto/caffe.pb.h>
static struct static struct
{ {