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
55
Issues
55
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
aeadf45e
Commit
aeadf45e
authored
Jun 16, 2018
by
Daniel Wortmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfixes in configure scripts
parent
47583276
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
5 deletions
+23
-5
CMakeLists.txt
CMakeLists.txt
+2
-0
cmake/machines/IFF.sh
cmake/machines/IFF.sh
+1
-1
cmake/machines/JURECA.sh
cmake/machines/JURECA.sh
+19
-3
cmake/process_arguments.sh
cmake/process_arguments.sh
+1
-1
No files found.
CMakeLists.txt
View file @
aeadf45e
...
...
@@ -4,7 +4,9 @@ if (EXISTS "${CMAKE_BINARY_DIR}/config.cmake")
include
(
"
${
CMAKE_BINARY_DIR
}
/config.cmake"
)
endif
()
set
(
tmp
${
CMAKE_Fortran_FLAGS
}
)
project
(
FLEUR LANGUAGES C Fortran
)
set
(
CMAKE_Fortran_FLAGS
${
CMAKE_Fortran_FLAGS
}
${
tmp
}
)
include
(
"cmake/CompilerConfig.txt"
)
...
...
cmake/machines/IFF.sh
View file @
aeadf45e
FC
=
${
FC
:
=mpiifort
}
export
FC
=
${
FC
:
=mpiifort
}
FLEUR_LIBRARIES
=
"-lxml2;-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64;-mt_mpi;
${
FLEUR_LIBRARIES
}
"
cmake/machines/JURECA.sh
View file @
aeadf45e
if
module list 2>&1 |grep
-q
-i
intel
then
echo
"Intel toolchain used"
FC
=
mpif90
CC
=
mpicc
export
FC
=
${
FC
:
=mpif90
}
export
CC
=
${
CC
:
=mpicc
}
#determine XML2 module
xml2
=
`
module
--show_hidden
spider libxml2 2>&1 |grep libxml2/|grep
-v
module |tail
-1
`
module load
$xml2
#determine ELPA module
elpa
=
`
module spider ELPA 2>&1 |grep hybrid
`
module load
$elpa
CLI_ELPA_OPENMP
=
1
FLEUR_LIBDIR
=
"
$FLEUR_LIB
$ELPA_LIB
"
FLEUR_INCLUDEDIR
=
"
$FLEUR_INCLUDEDIR
$ELPA_MODULES_OPENMP
"
#load hdf5 module
module load HDF5
FLEUR_LIBRARIES
=
"-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64"
elif
module list 2>&1 |grep
-q
PGI
...
...
@@ -12,5 +25,8 @@ then
CC
=
mpicc
FLEUR_INCLUDEDIR
=
"
$XML2_ROOT
/include"
FLEUR_LIBRARIES
=
"-lstdc++;-L
$MKLROOT
/lib/intel64;-lmkl_scalapack_lp64;-lmkl_intel_lp64;-lmkl_pgi_thread;-lmkl_core;-lmkl_blacs_intelmpi_lp64"
else
echo
"You need to load the modules for the compiler"
echo
"e.g. module load intel-para"
exit
fi
cmake/process_arguments.sh
View file @
aeadf45e
...
...
@@ -21,7 +21,7 @@ do
-mpi
)
shift
;
CLI_FLEUR_USE_MPI
=
$1
;;
-magma
)
shift
;
CLI_FLEUR_USE_MAGMA
=
$1
;;
-gpu
)
shift
;
CLI_FLEUR_USE_GPU
=
$1
;;
-li
braries
)
shift
;
CLI_LIBRARIES
=
$1
;;
-li
nk
)
shift
;
CLI_LIBRARIES
=
$1
;;
-libdir
)
shift
;
CLI_LIBDIR
=
"
$CLI_LIBDIR
$1
"
;;
-flags
)
shift
;
CLI_FLAGS
=
$1
;;
-includedir
)
shift
;
CLI_INCLUDEDIR
=
"
$CLI_INCLUDEDIR
$1
"
;;
...
...
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