Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
fleur
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
57
Issues
57
List
Boards
Labels
Milestones
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
fleur
fleur
Commits
0d4060a3
Commit
0d4060a3
authored
Mar 16, 2017
by
Daniel Wortmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of fleur-git:fleur into develop
parents
5053f7da
43105eb6
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
16 additions
and
10 deletions
+16
-10
cmake/compilerflags.cmake
cmake/compilerflags.cmake
+1
-1
cmake/machines.sh
cmake/machines.sh
+9
-9
cmake/machines/CLAIX.cmake
cmake/machines/CLAIX.cmake
+0
-0
cmake/machines/IFF.cmake
cmake/machines/IFF.cmake
+0
-0
cmake/machines/JUQUEEN/JUQUEEN.cmake
cmake/machines/JUQUEEN/JUQUEEN.cmake
+0
-0
cmake/machines/JURECA/JURECA.cmake
cmake/machines/JURECA/JURECA.cmake
+0
-0
cmake/machines/JURECA/JURECAGPU.cmake
cmake/machines/JURECA/JURECAGPU.cmake
+0
-0
cmake/machines/JURECA/gccsource.sh
cmake/machines/JURECA/gccsource.sh
+6
-0
cmake/machines/JURECA/intelsource.sh
cmake/machines/JURECA/intelsource.sh
+0
-0
cmake/machines/JURECA/pgisource.sh
cmake/machines/JURECA/pgisource.sh
+0
-0
cmake/machines/MARCONI.cmake
cmake/machines/MARCONI.cmake
+0
-0
No files found.
cmake/compilerflags.cmake
View file @
0d4060a3
...
...
@@ -7,7 +7,7 @@ if (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
set
(
CMAKE_Fortran_FLAGS
"
${
CMAKE_Fortran_FLAGS
}
-mkl -r8 -qopenmp"
)
endif
()
set
(
CMAKE_Fortran_FLAGS_RELEASE
"
${
CMAKE_Fortran_FLAGS_RELEASE
}
-xHost -O4"
)
set
(
CMAKE_Fortran_FLAGS_DEBUG
"
${
CMAKE_Fortran_FLAGS_DEBUG
}
-C -traceback -O0 -g"
)
set
(
CMAKE_Fortran_FLAGS_DEBUG
"
${
CMAKE_Fortran_FLAGS_DEBUG
}
-C -traceback -O0 -g
-ftrapuv -check uninit
"
)
elseif
(
${
CMAKE_Fortran_COMPILER_ID
}
MATCHES
"PGI"
)
message
(
"PGI Fortran detected"
)
set
(
CMAKE_Fortran_FLAGS
"
${
CMAKE_Fortran_FLAGS
}
-mp -Mr8 -Mr8intrinsics -Mcuda:kepler+ -ta:tesla:cuda7.5 -DUSE_STREAMS -DNUM_STREAMS=
${
N_STREAMS
}
-Minfo=accel -acc"
)
...
...
cmake/machines.sh
View file @
0d4060a3
...
...
@@ -26,10 +26,10 @@ function configure_machine(){
echo
"All required modules load loaded"
else
echo
"You have to load the required modules"
echo
"See and/or source
$DIR
/cmake/ma
s
chines/JURECA/intelsource.sh"
echo
"See and/or source
$DIR
/cmake/machines/JURECA/intelsource.sh"
exit
fi
cp
$DIR
/cmake/ma
s
chines/JURECA/JURECA.cmake config.cmake
cp
$DIR
/cmake/machines/JURECA/JURECA.cmake config.cmake
elif
module list 2>&1 |grep
-q
PGI
then
echo
"PGI toolchain used"
...
...
@@ -41,14 +41,14 @@ function configure_machine(){
echo
"All required modules loaded, all variables set"
else
echo
"Not all modules are loaded"
echo
"See and/or source
$DIR
/cmake/ma
s
chines/JURECA/pgisource.sh"
echo
"See and/or source
$DIR
/cmake/machines/JURECA/pgisource.sh"
echo
"And set the variables XML2_ROOT and MAGMA_ROOT"
exit
fi
cp
$DIR
/cmake/ma
s
chines/JURECA/JURECAGPU.cmake config.cmake
cp
$DIR
/cmake/machines/JURECA/JURECAGPU.cmake config.cmake
else
echo
"You have to load the correct modules for compiling"
echo
" Look for files to source in
$DIR
/cmake/ma
s
chines/JURECA"
echo
" Look for files to source in
$DIR
/cmake/machines/JURECA"
exit
fi
# JUQUEEN
...
...
@@ -64,13 +64,13 @@ function configure_machine(){
echo
"module load hdf5/1.8.15_BGQ scalapack/2.0.2_elpa_simd"
exit
fi
cp
$DIR
/cmake/ma
s
chines/JUQUEEN/JUQUEEN.cmake config.cmake
cp
$DIR
/cmake/machines/JUQUEEN/JUQUEEN.cmake config.cmake
#IFF linux cluster
elif
[
"
$machine
"
=
"IFF"
]
then
echo
"IFF cluster configuration used"
cp
$DIR
/cmake/ma
s
chines/IFF.cmake config.cmake
cp
$DIR
/cmake/machines/IFF.cmake config.cmake
#RWTH cluster
elif
[
"
$machine
"
=
"CLAIX"
]
...
...
@@ -81,7 +81,7 @@ function configure_machine(){
echo
"Please use intelmpi, e.g. do a module switch openmpi intelmpi"
exit
fi
cp
$DIR
/cmake/ma
s
chines/CLAIX.cmake config.cmake
cp
$DIR
/cmake/machines/CLAIX.cmake config.cmake
module load LIBRARIES
elif
[
"
$machine
"
=
"MARCONI"
]
then
...
...
@@ -90,7 +90,7 @@ module load LIBRARIES
echo
"Load the modules needed to compile: intel,intelmpi,cmake"
exit
fi
cp
$DIR
/cmake/ma
s
chines/MARCONI.cmake config.cmake
cp
$DIR
/cmake/machines/MARCONI.cmake config.cmake
elif
[
"
$machine
"
=
"AUTO"
]
then
echo
"No machine specific settings used"
...
...
cmake/ma
s
chines/CLAIX.cmake
→
cmake/machines/CLAIX.cmake
View file @
0d4060a3
File moved
cmake/ma
s
chines/IFF.cmake
→
cmake/machines/IFF.cmake
View file @
0d4060a3
File moved
cmake/ma
s
chines/JUQUEEN/JUQUEEN.cmake
→
cmake/machines/JUQUEEN/JUQUEEN.cmake
View file @
0d4060a3
File moved
cmake/ma
s
chines/JURECA/JURECA.cmake
→
cmake/machines/JURECA/JURECA.cmake
View file @
0d4060a3
File moved
cmake/ma
s
chines/JURECA/JURECAGPU.cmake
→
cmake/machines/JURECA/JURECAGPU.cmake
View file @
0d4060a3
File moved
cmake/machines/JURECA/gccsource.sh
0 → 100644
View file @
0d4060a3
ml purge
ml CMake GCC Python ParaStationMPI
ml OpenBLAS
export
FC
=
mpif90
cmake/ma
s
chines/JURECA/intelsource.sh
→
cmake/machines/JURECA/intelsource.sh
View file @
0d4060a3
File moved
cmake/ma
s
chines/JURECA/pgisource.sh
→
cmake/machines/JURECA/pgisource.sh
View file @
0d4060a3
File moved
cmake/ma
s
chines/MARCONI.cmake
→
cmake/machines/MARCONI.cmake
View file @
0d4060a3
File moved
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