Commit 4ce0e72f authored by Evgeny Kusmenko's avatar Evgeny Kusmenko

Merge branch 'use_math_opt_generator' into 'master'

use EMAMOpt2CPP instead of EMAM2CPP

See merge request !30
parents e86f9476 d594501a
Pipeline #106752 failed with stages
in 3 minutes and 54 seconds
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<!-- .. SE-Libraries .................................................. --> <!-- .. SE-Libraries .................................................. -->
<CNNArch.version>0.2.8</CNNArch.version> <CNNArch.version>0.2.8</CNNArch.version>
<CNNTrain.version>0.2.6</CNNTrain.version> <CNNTrain.version>0.2.6</CNNTrain.version>
<embedded-montiarc-math-generator>0.1.2-SNAPSHOT</embedded-montiarc-math-generator> <embedded-montiarc-math-opt-generator>0.1.3</embedded-montiarc-math-opt-generator>
<!-- .. Libraries .................................................. --> <!-- .. Libraries .................................................. -->
<guava.version>18.0</guava.version> <guava.version>18.0</guava.version>
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
<dependency> <dependency>
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-generator</artifactId> <artifactId>embedded-montiarc-math-opt-generator</artifactId>
<version>${embedded-montiarc-math-generator}</version> <version>${embedded-montiarc-math-opt-generator}</version>
</dependency> </dependency>
......
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 14)
project(alexnet LANGUAGES CXX) project(alexnet LANGUAGES CXX)
...@@ -7,12 +7,12 @@ project(alexnet LANGUAGES CXX) ...@@ -7,12 +7,12 @@ project(alexnet LANGUAGES CXX)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
# add dependencies # add dependencies
find_package(Armadillo REQUIRED)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${Armadillo_INCLUDE_DIRS})
set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
find_package(Caffe2 REQUIRED) find_package(Caffe2 REQUIRED)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${Caffe2_INCLUDE_DIRS}) set(INCLUDE_DIRS ${INCLUDE_DIRS} ${Caffe2_INCLUDE_DIRS})
set(LIBS ${LIBS} ${Caffe2_LIBRARIES}) set(LIBS ${LIBS} ${Caffe2_LIBRARIES})
find_package(Armadillo REQUIRED)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${Armadillo_INCLUDE_DIRS})
set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
# additional commands # additional commands
set(LIBS ${LIBS} -lprotobuf -lglog -lgflags) set(LIBS ${LIBS} -lprotobuf -lglog -lgflags)
...@@ -28,7 +28,7 @@ endif() ...@@ -28,7 +28,7 @@ endif()
# create static library # create static library
include_directories(${INCLUDE_DIRS}) include_directories(${INCLUDE_DIRS})
add_library(alexnet alexnet.h) add_library(alexnet alexnet.cpp)
target_include_directories(alexnet PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS}) target_include_directories(alexnet PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
target_link_libraries(alexnet PUBLIC ${LIBS}) target_link_libraries(alexnet PUBLIC ${LIBS})
set_target_properties(alexnet PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(alexnet PROPERTIES LINKER_LANGUAGE CXX)
......
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