Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
fleur
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
52
Issues
52
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
fleur
fleur
Commits
54be40ad
Commit
54be40ad
authored
Sep 19, 2017
by
Daniel Wortmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated gitlab build configuration to create an MPI version
parent
6d265e45
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
.gitlab-ci.yml
.gitlab-ci.yml
+3
-3
cmake/machines.sh
cmake/machines.sh
+7
-2
cmake/machines/GITLAB.cmake
cmake/machines/GITLAB.cmake
+7
-0
No files found.
.gitlab-ci.yml
View file @
54be40ad
...
...
@@ -5,8 +5,8 @@ build-gfortran:
paths
:
-
build
script
:
-
apt-get update -qq && apt-get install -y -qq build-essential gfortran gfortran-6 g++-6 gcc-6 binutils-gold git cmake libxml2-dev liblapack-dev libblas-dev doxygen
-
cd /builds/fleur/fleur; ./configure.sh
AUTO
; cd build; make
-
apt-get update -qq && apt-get install -y -qq build-essential gfortran gfortran-6 g++-6 gcc-6 binutils-gold git cmake libxml2-dev liblapack-dev libblas-dev doxygen
libopenmpi-dev libscalapack-mpi-dev
-
cd /builds/fleur/fleur; ./configure.sh
GITLAB
; cd build; make
test-gfortran
:
image
:
ubuntu:16.10
stage
:
test
...
...
@@ -14,7 +14,7 @@ test-gfortran:
paths
:
-
build
script
:
-
apt-get update -qq && apt-get install -y -qq build-essential gfortran gfortran-6 g++-6 gcc-6 binutils-gold git cmake libxml2-dev liblapack-dev libblas-dev
doxygen
-
apt-get update -qq && apt-get install -y -qq build-essential gfortran gfortran-6 g++-6 gcc-6 binutils-gold git cmake libxml2-dev liblapack-dev libblas-dev
libopenmpi-dev libscalapack-mpi-dev
-
ulimit -s unlimited ;cd /builds/fleur/fleur/build;ctest
...
...
cmake/machines.sh
View file @
54be40ad
...
...
@@ -100,8 +100,13 @@ module load LIBRARIES
echo
"GOOD LUCK!"
fi
else
echo
"No valid machine configuration specified"
exit
if
[
-r
$DIR
/cmake/machines/
${
machine
}
.cmake
]
then
cp
$DIR
/cmake/machines/
${
machine
}
.cmake config.cmake
else
echo
"No valid machine configuration specified"
exit
fi
fi
}
cmake/machines/GITLAB.cmake
0 → 100644
View file @
54be40ad
#Set the compiler names
set
(
CMAKE_Fortran_COMPILER mpif90
)
#set(CMAKE_C_COMPILER mpiicc)
#Add include pathes
#set(FLEUR_Fortran_FLAGS "")
#Add linker stuff
set
(
FLEUR_LIBRARIES
${
FLEUR_LIBRARIES
}
"/usr/lib/x86_64-linux-gnu/libxml2.so;/usr/lib/x86_64-linux-gnu/libscalapack-openmpi.so;/usr/lib/x86_64-linux-gnu/libblacsF77init-openmpi.so;/usr/lib/x86_64-linux-gnu/libblacs-openmpi.so;/usr/lib/liblapack.so;/usr/lib/libblas.so"
)
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