Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
generators
CNNArch2Caffe2
Commits
4ce0e72f
Commit
4ce0e72f
authored
Feb 21, 2019
by
Evgeny Kusmenko
Browse files
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
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
4ce0e72f
...
...
@@ -17,7 +17,7 @@
<!-- .. SE-Libraries .................................................. -->
<CNNArch.version>
0.2.8
</CNNArch.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 .................................................. -->
<guava.version>
18.0
</guava.version>
...
...
@@ -89,8 +89,8 @@
<dependency>
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-math-generator
</artifactId>
<version>
${embedded-montiarc-math-generator}
</version>
<artifactId>
embedded-montiarc-math-
opt-
generator
</artifactId>
<version>
${embedded-montiarc-math-
opt-
generator}
</version>
</dependency>
...
...
src/test/resources/target_code/CMakeLists.txt
View file @
4ce0e72f
cmake_minimum_required
(
VERSION 3.5
)
set
(
CMAKE_CXX_STANDARD 1
1
)
set
(
CMAKE_CXX_STANDARD 1
4
)
project
(
alexnet LANGUAGES CXX
)
...
...
@@ -7,12 +7,12 @@ project(alexnet LANGUAGES CXX)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake
)
# add dependencies
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
}
)
find_package
(
Armadillo REQUIRED
)
set
(
INCLUDE_DIRS
${
INCLUDE_DIRS
}
${
Armadillo_INCLUDE_DIRS
}
)
set
(
LIBS
${
LIBS
}
${
Armadillo_LIBRARIES
}
)
# additional commands
set
(
LIBS
${
LIBS
}
-lprotobuf -lglog -lgflags
)
...
...
@@ -28,7 +28,7 @@ endif()
# create static library
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_link_libraries
(
alexnet PUBLIC
${
LIBS
}
)
set_target_properties
(
alexnet PROPERTIES LINKER_LANGUAGE CXX
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment