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
8af8b70d
Commit
8af8b70d
authored
Feb 22, 2019
by
Carlos Alfredo Yeverino Rodriguez
Browse files
Merge branch 'master' into 'revert-
e86f9476
'
# Conflicts: # pom.xml
parents
da5ffefd
51517fba
Pipeline
#106960
passed with stages
in 2 minutes and 28 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
8af8b70d
...
...
@@ -8,16 +8,16 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
cnnarch-caffe2-generator
</artifactId>
<version>
0.2.
8
-SNAPSHOT
</version>
<version>
0.2.
9
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
<properties>
<!-- .. SE-Libraries .................................................. -->
<CNNArch.version>
0.2.
7
</CNNArch.version>
<CNNTrain.version>
0.2.6
-SNAPSHOT
</CNNTrain.version>
<embedded-montiarc-math-generator>
0.1.
2-SNAPSHOT
</embedded-montiarc-math-generator>
<CNNArch.version>
0.2.
8
</CNNArch.version>
<CNNTrain.version>
0.2.6
</CNNTrain.version>
<embedded-montiarc-math-
opt-
generator>
0.1.
4
</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 @
8af8b70d
cmake_minimum_required
(
VERSION 3.5
)
set
(
CMAKE_CXX_STANDARD 1
1
)
set
(
CMAKE_CXX_STANDARD 1
4
)
project
(
alexnet LANGUAGES CXX
)
...
...
@@ -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