Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
af953fad
Commit
af953fad
authored
Jun 10, 2019
by
Jason Swails
Browse files
Try to fix all builds in docker containers.
parent
2e8eef42
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
2 deletions
+14
-2
devtools/Jenkinsfile
devtools/Jenkinsfile
+1
-0
devtools/ci/jenkins/Dockerfile
devtools/ci/jenkins/Dockerfile
+1
-1
devtools/ci/jenkins/Dockerfile.opencl
devtools/ci/jenkins/Dockerfile.opencl
+11
-0
devtools/ci/jenkins/install.sh
devtools/ci/jenkins/install.sh
+1
-1
No files found.
devtools/Jenkinsfile
View file @
af953fad
...
@@ -27,6 +27,7 @@ pipeline {
...
@@ -27,6 +27,7 @@ pipeline {
dockerfile
{
dockerfile
{
dir
"devtools/ci/jenkins"
dir
"devtools/ci/jenkins"
label
"cuda"
label
"cuda"
filename
"Dockerfile.opencl"
}
}
}
}
steps
{
steps
{
...
...
devtools/ci/jenkins/Dockerfile
View file @
af953fad
FROM
nvidia/cuda:10.
0
-devel-ubuntu18.04
FROM
nvidia/cuda:10.
1
-devel-ubuntu18.04
ENV
PATH="/opt/miniconda/bin:${PATH}"
ENV
PATH="/opt/miniconda/bin:${PATH}"
...
...
devtools/ci/jenkins/Dockerfile.opencl
0 → 100644
View file @
af953fad
FROM nvidia/opencl:devel-ubuntu18.04
ENV PATH="/opt/miniconda/bin:${PATH}"
RUN apt-get update && \
apt-get install -y wget git gromacs doxygen gfortran libfftw3-dev gcc g++ bzip2 automake make lsb-core && \
wget https://repo.continuum.io/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh -O miniconda.sh && \
bash miniconda.sh -b -p "/opt/miniconda" && \
rm -f miniconda.sh && \
mkdir /.conda && chmod -R 777 /.conda && chmod -R 777 /opt/miniconda && \
conda install -y cmake numpy scipy pytest swig cython
devtools/ci/jenkins/install.sh
View file @
af953fad
...
@@ -14,7 +14,7 @@ g++ --version
...
@@ -14,7 +14,7 @@ g++ --version
if
[
!
-z
"
$OPENMM_CUDA_COMPILER
"
]
;
then
if
[
!
-z
"
$OPENMM_CUDA_COMPILER
"
]
;
then
echo
"Using nvcc (
$OPENMM_CUDA_COMPILER
) version:"
echo
"Using nvcc (
$OPENMM_CUDA_COMPILER
) version:"
$OPENMM_CUDA_COMPILER
--version
$OPENMM_CUDA_COMPILER
--version
CUDA_ARGS
=
"-DCUDA_TOOLKIT_ROOT_DIR=
${
CUDA_HOME
}
"
CUDA_ARGS
=
"-DCUDA_TOOLKIT_ROOT_DIR=
${
CUDA_HOME
}
-DOPENMM_BUILD_CUDA_LIB=true
"
fi
fi
cmake
-DCMAKE_INSTALL_PREFIX
=
"
`
pwd
`
/install"
-DCMAKE_CXX_COMPILER
=
g++
-DCMAKE_C_COMPILER
=
gcc
\
cmake
-DCMAKE_INSTALL_PREFIX
=
"
`
pwd
`
/install"
-DCMAKE_CXX_COMPILER
=
g++
-DCMAKE_C_COMPILER
=
gcc
\
...
...
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