Commit 41afa5dc authored by Jan Philipp Haller's avatar Jan Philipp Haller
Browse files

Refactored for new generator interface,

updated dependency versions,
using addCmakeLibraryLinkage,
updated GenerationTest.
parent 3d785384
Pipeline #336008 canceled with stages
......@@ -61,8 +61,7 @@ public class CNNArch2MxNet extends CNNArchGenerator {
cMakeConfig = new CMakeConfig(rootModelName);
cMakeConfig.addModuleDependency(new CMakeFindModule("Armadillo", true));
cMakeConfig.addCMakeCommand("set(LIBS ${LIBS} mxnet)");
//cMakeConfig.addCmakeLibraryLinkage("mxnet");
cMakeConfig.addCmakeLibraryLinkage("mxnet");
fileContents.addAll(cMakeConfig.generateCMakeFiles());
......
......@@ -13,9 +13,9 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
# additional library linkage
set(LIBS ${LIBS} mxnet)
# additional commands
set(LIBS ${LIBS} mxnet)
# create static library
include_directories(${INCLUDE_DIRS})
......@@ -27,4 +27,4 @@ set_target_properties(alexnet PROPERTIES LINKER_LANGUAGE CXX)
# export cmake project
export(TARGETS alexnet FILE alexnet.cmake)
# additional commands end
# additional commands end
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment