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
c602ba43
Commit
c602ba43
authored
Jan 19, 2021
by
Evgeny Kusmenko
Browse files
Merge branch 'ExecutionSemantics' into 'master'
Execution semantics See merge request
!44
parents
f253088f
7bb37858
Pipeline
#393947
passed with stage
in 2 minutes and 21 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
pom.xml
View file @
c602ba43
...
...
@@ -9,14 +9,14 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
cnnarch-caffe2-generator
</artifactId>
<version>
0.4.
0
-SNAPSHOT
</version>
<version>
0.4.
4
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
<properties>
<!-- .. SE-Libraries .................................................. -->
<CNNArch2X.version>
0.4.
0
-SNAPSHOT
</CNNArch2X.version>
<CNNArch2X.version>
0.4.
4
-SNAPSHOT
</CNNArch2X.version>
<!-- .. Libraries .................................................. -->
...
...
src/test/resources/target_code/cmake/FindArmadillo.cmake
View file @
c602ba43
...
...
@@ -15,7 +15,7 @@ find_path(Armadillo_INCLUDE_DIR
)
find_library
(
Armadillo_LIBRARY
NAMES armadillo
PATH_SUFFIXES
"lib"
"lib64"
"lib/x86_64-linux-gnu"
"examples/lib_win64"
"build"
"Release"
PATH_SUFFIXES
"lib"
"lib64"
"lib/x86_64-linux-gnu"
"examples/lib_win64"
"build"
"Release"
"x64"
"x86"
PATHS
HINTS $ENV{Armadillo_HOME}
)
...
...
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