Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
generators
CNNArch2Caffe2
Commits
f426dffd
Commit
f426dffd
authored
Jan 24, 2019
by
Evgeny Kusmenko
Browse files
Merge branch 'cmake_corrected_cmakelists' into 'master'
Cmake corrected cmakelists See merge request
!18
parents
054df59c
a1964b01
Pipeline
#99686
passed with stages
in 5 minutes and 52 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
f426dffd
...
...
@@ -26,7 +26,8 @@ stages:
masterJobLinux
:
stage
:
linux
image
:
maven:3-jdk-8
script
:
script
:
-
apt-get update -q && apt-get install -y -q g++ libhdf5-serial-dev libhdf5-dev libopenblas-dev
-
mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install deploy --settings settings.xml
-
cat target/site/jacoco/index.html
-
mvn package sonar:sonar -s settings.xml
...
...
pom.xml
View file @
f426dffd
...
...
@@ -17,7 +17,7 @@
<!-- .. SE-Libraries .................................................. -->
<CNNArch.version>
0.2.7
</CNNArch.version>
<CNNTrain.version>
0.2.5
</CNNTrain.version>
<embedded-montiarc-math-generator>
0.
0.25-20180812.120330-2
</embedded-montiarc-math-generator>
<embedded-montiarc-math-generator>
0.
1.2-SNAPSHOT
</embedded-montiarc-math-generator>
<!-- .. Libraries .................................................. -->
<guava.version>
18.0
</guava.version>
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/CNNArch2Caffe2.java
View file @
f426dffd
...
...
@@ -157,6 +157,7 @@ public class CNNArch2Caffe2 implements CNNArchGenerator{
CMakeConfig
cMakeConfig
=
new
CMakeConfig
(
rootModelName
);
cMakeConfig
.
addModuleDependency
(
new
CMakeFindModule
(
"Armadillo"
,
true
));
cMakeConfig
.
addModuleDependency
(
new
CMakeFindModule
(
"Caffe2"
,
true
));
cMakeConfig
.
addCMakeCommand
(
"set(LIBS ${LIBS} -lprotobuf -lglog -lgflags)"
);
cMakeConfig
.
addCMakeCommand
(
"find_package(CUDA)"
+
"\n"
+
"set(INCLUDE_DIRS ${INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS})"
+
"\n"
+
"set(LIBS ${LIBS} ${CUDA_LIBRARIES} ${CUDA_curand_LIBRARY})"
+
"\n"
);
//Needed since CUDA cannot be found correctly (including CUDA_curand_LIBRARY) and as optional using CMakeFindModule
...
...
src/test/resources/target_code/CMakeLists.txt
View file @
f426dffd
...
...
@@ -7,14 +7,15 @@ 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
)
find_package
(
CUDA
)
set
(
INCLUDE_DIRS
${
INCLUDE_DIRS
}
${
CUDA_INCLUDE_DIRS
}
)
set
(
LIBS
${
LIBS
}
${
CUDA_LIBRARIES
}
${
CUDA_curand_LIBRARY
}
)
...
...
@@ -28,7 +29,7 @@ endif()
# create static library
include_directories
(
${
INCLUDE_DIRS
}
)
add_library
(
alexnet alexnet.h
)
target_include_directories
(
alexnet PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
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
.
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