Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
MIGraphX
Commits
2a4766f7
Commit
2a4766f7
authored
Sep 27, 2018
by
Paul
Browse files
Add gcc7
parent
a9c48b34
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
6 deletions
+27
-6
Dockerfile
Dockerfile
+7
-3
Jenkinsfile
Jenkinsfile
+7
-3
cmake/EnableCompilerWarnings.cmake
cmake/EnableCompilerWarnings.cmake
+13
-0
No files found.
Dockerfile
View file @
2a4766f7
...
@@ -6,9 +6,12 @@ ARG PREFIX=/usr/local
...
@@ -6,9 +6,12 @@ ARG PREFIX=/usr/local
RUN
dpkg
--add-architecture
i386
RUN
dpkg
--add-architecture
i386
# Add rocm repository
# Add rocm repository
RUN
apt-get update
&&
DEBIAN_FRONTEND
=
noninteractive apt-get
install
-y
curl apt-utils wget
RUN
apt-get update
&&
DEBIAN_FRONTEND
=
noninteractive apt-get
install
-y
curl apt-utils wget
software-properties-common
RUN
curl https://raw.githubusercontent.com/RadeonOpenCompute/ROCm-docker/master/add-rocm.sh | bash
RUN
curl https://raw.githubusercontent.com/RadeonOpenCompute/ROCm-docker/master/add-rocm.sh | bash
# Add ubuntu toolchain
RUN
apt-get update
&&
add-apt-repository ppa:ubuntu-toolchain-r/test
-y
# Install dependencies
# Install dependencies
RUN
apt-get update
&&
DEBIAN_FRONTEND
=
noninteractive apt-get
install
-y
--allow-unauthenticated
\
RUN
apt-get update
&&
DEBIAN_FRONTEND
=
noninteractive apt-get
install
-y
--allow-unauthenticated
\
apt-utils
\
apt-utils
\
...
@@ -19,6 +22,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-
...
@@ -19,6 +22,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-
cmake
\
cmake
\
curl
\
curl
\
doxygen
\
doxygen
\
g++-7
\
gdb
\
gdb
\
git
\
git
\
hsa-rocr-dev
\
hsa-rocr-dev
\
...
@@ -26,14 +30,14 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-
...
@@ -26,14 +30,14 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-
lcov
\
lcov
\
libelf-dev
\
libelf-dev
\
libncurses5-dev
\
libncurses5-dev
\
libpthread-stubs0-dev
\
libnuma-dev
\
libnuma-dev
\
libpthread-stubs0-dev
\
python
\
python
\
python-dev
\
python-dev
\
python-pip
\
python-pip
\
rocminfo
\
rocm-opencl
\
rocm-opencl
\
rocm-opencl-dev
\
rocm-opencl-dev
\
rocminfo
\
software-properties-common
\
software-properties-common
\
wget
&&
\
wget
&&
\
apt-get clean
&&
\
apt-get clean
&&
\
...
...
Jenkinsfile
View file @
2a4766f7
...
@@ -97,11 +97,15 @@ rocmtest tidy: rocmnode('rocmtest') { cmake_build ->
...
@@ -97,11 +97,15 @@ rocmtest tidy: rocmnode('rocmtest') { cmake_build ->
stage
(
'Clang Release'
)
{
stage
(
'Clang Release'
)
{
cmake_build
(
'hcc'
,
'-DCMAKE_BUILD_TYPE=release'
)
cmake_build
(
'hcc'
,
'-DCMAKE_BUILD_TYPE=release'
)
}
}
},
gcc:
rocmnode
(
'rocmtest'
)
{
cmake_build
->
},
gcc
5
:
rocmnode
(
'rocmtest'
)
{
cmake_build
->
stage
(
'GCC Debug'
)
{
stage
(
'GCC
5
Debug'
)
{
cmake_build
(
'g++-5'
,
'-DCMAKE_BUILD_TYPE=debug'
)
cmake_build
(
'g++-5'
,
'-DCMAKE_BUILD_TYPE=debug'
)
}
}
stage
(
'GCC Release'
)
{
stage
(
'GCC
5
Release'
)
{
cmake_build
(
'g++-5'
,
'-DCMAKE_BUILD_TYPE=release'
)
cmake_build
(
'g++-5'
,
'-DCMAKE_BUILD_TYPE=release'
)
}
}
},
gcc7:
rocmnode
(
'rocmtest'
)
{
cmake_build
->
stage
(
'GCC 7 Debug'
)
{
cmake_build
(
'g++-7'
,
'-DCMAKE_BUILD_TYPE=debug'
)
}
}
}
cmake/EnableCompilerWarnings.cmake
View file @
2a4766f7
...
@@ -68,6 +68,19 @@ else()
...
@@ -68,6 +68,19 @@ else()
-Wno-sign-compare
-Wno-sign-compare
)
)
# Flags for gcc 7
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"GNU"
)
if
(
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER
"7.0"
)
list
(
APPEND CMAKE_COMPILER_WARNINGS
-Wduplicated-branches
-Wduplicated-cond
-Wno-noexcept-type
-Wodr
-Wshift-negative-value
-Wshift-overflow=2
)
endif
()
endif
()
if
(
CMAKE_
${
COMPILER
}
_COMPILER_ID MATCHES
"Clang"
)
if
(
CMAKE_
${
COMPILER
}
_COMPILER_ID MATCHES
"Clang"
)
list
(
APPEND CMAKE_COMPILER_WARNINGS
list
(
APPEND CMAKE_COMPILER_WARNINGS
-Weverything
-Weverything
...
...
Write
Preview
Markdown
is supported
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