Commit 51517fba authored by Carlos Alfredo Yeverino Rodriguez's avatar Carlos Alfredo Yeverino Rodriguez

Merge branch 'bugfix_cmake_order_generation' into 'master'

bugfix for the correct order of the cmake generation, added testCMakeGeneration again

See merge request !32
parents a5911c58 df90b9ba
Pipeline #106934 passed with stages
in 7 minutes and 26 seconds
......@@ -17,7 +17,7 @@
<!-- .. SE-Libraries .................................................. -->
<CNNArch.version>0.2.8</CNNArch.version>
<CNNTrain.version>0.2.6</CNNTrain.version>
<embedded-montiarc-math-opt-generator>0.1.3</embedded-montiarc-math-opt-generator>
<embedded-montiarc-math-opt-generator>0.1.4</embedded-montiarc-math-opt-generator>
<!-- .. Libraries .................................................. -->
<guava.version>18.0</guava.version>
......
......@@ -206,7 +206,7 @@ public class GenerationTest extends AbstractSymtabTest{
"CNNTrainer_unsupportedConfig.py"));
}
/*@Test
@Test
public void testCMakeGeneration() {
Log.getFindings().clear();
String rootModelName = "alexnet";
......@@ -229,7 +229,7 @@ public class GenerationTest extends AbstractSymtabTest{
Paths.get("./src/test/resources/target_code/cmake"),
Arrays.asList(
"FindArmadillo.cmake"));
}*/
}
@Test
public void testWrongArgumentCNNArch2Caffe2Cli() throws ParseException {
......
......@@ -7,12 +7,12 @@ project(alexnet LANGUAGES CXX)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
# add dependencies
find_package(Caffe2 REQUIRED)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${Caffe2_INCLUDE_DIRS})
set(LIBS ${LIBS} ${Caffe2_LIBRARIES})
find_package(Armadillo REQUIRED)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${Armadillo_INCLUDE_DIRS})
set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
find_package(Caffe2 REQUIRED)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${Caffe2_INCLUDE_DIRS})
set(LIBS ${LIBS} ${Caffe2_LIBRARIES})
# additional commands
set(LIBS ${LIBS} -lprotobuf -lglog -lgflags)
......
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