Merge branch 'release-2.1.0'

Author: alazzaro

CMakeLists.txt

@@ -373,6 +373,7 @@ endif ()
 include(CompilerConfiguration)
 include(CheckCompilerSupport)
 
+# subdirectories
 add_subdirectory(src)
 
 include(CTest)
@@ -384,4 +385,6 @@ if (WITH_EXAMPLES)
   add_subdirectory(examples)
 endif ()
 
+add_subdirectory(docs)
+
 include(CustomTargets)

DBCSR.md

@@ -15,6 +15,9 @@ predocmark: >
 media_dir: @CMAKE_SOURCE_DIR@/docs/media
 md_base_dir: @CMAKE_SOURCE_DIR@
 page_dir: @CMAKE_SOURCE_DIR@/docs/guide
+src_dir: ./src
+         ./tests
+         ./examples
 output_dir: @CMAKE_BINARY_DIR@/doc
 docmark_alt: #
 predocmark_alt: <

README.md

@@ -13,7 +13,7 @@ It is MPI and OpenMP parallel and can exploit Nvidia and AMD GPUs via CUDA and H
 
 ## How to Install
 
-Follow the [installation guide](docs/guide/2-user-guide/1-installation/1-install.md).
+Follow the [installation guide](https://cp2k.github.io/dbcsr/develop/page/2-user-guide/1-installation/index.html).
 
 ## Documentation
 

VERSION

@@ -1,6 +1,7 @@
 MAJOR = 2
 MINOR = 1
-PATCH = 0-rc19
+PATCH = 0
 # A specific DATE (YYYY-MM-DD) fixes an official release, otherwise
 # it is considered Development version.
-DATE  =
+DATE  = 2020-12-09
+

cmake/CustomTargets.cmake

@@ -1,3 +1,5 @@
+# =================================================================================================
+# BUILD DISTRIBUTION
 set(ARCHIVE_NAME "${CMAKE_PROJECT_NAME}-${dbcsr_VERSION}")
 add_custom_target(
   dist
@@ -9,22 +11,8 @@ add_custom_target(
           "${CMAKE_BINARY_DIR}/dist/${ARCHIVE_NAME}.tar.gz"
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
-find_program(
-  FORD_EXE ford
-  DOC "path to the ford executable (required to generate the documentation)")
-
-# Copy the FORD project-file into the build directory
-set(FORD_PROJECT_FILE "${CMAKE_BINARY_DIR}/DBCSR.md")
-configure_file(DBCSR.md "${FORD_PROJECT_FILE}")
-
-add_custom_target(
-  doc
-  COMMENT "Generating API documentation"
-  COMMAND "${FORD_EXE}" "${FORD_PROJECT_FILE}"
-  VERBATIM)
-add_dependencies(doc fypp) # only depend on the fypp step to avoid building
-                           # everything just for the docs
-
+# =================================================================================================
+# LCOV - COVERAGE REPORTS GENERATION
 find_program(
   LCOV_EXE lcov
   DOC "path to the lcov executable (required to generate coverage reports)")

docs/CMakeLists.txt

@@ -0,0 +1,22 @@
+# =================================================================================================
+# FORD - DOCUMENTATION GENERATION
+find_program(
+  FORD_EXE ford
+  DOC "path to the ford executable (required to generate the documentation)")
+
+# Copy the FORD project-file into the build directory
+set(FORD_PROJECT_FILE "${CMAKE_BINARY_DIR}/DBCSR.md")
+configure_file(${CMAKE_SOURCE_DIR}/DBCSR.md "${FORD_PROJECT_FILE}")
+
+# Copy the FORD project-file into the build directory
+add_custom_target(
+  doc
+  COMMENT "Generating API documentation and doc pages"
+  COMMAND "${FORD_EXE}" "${FORD_PROJECT_FILE}"
+  VERBATIM)
+add_dependencies(doc doc_copy_tests)
+if (WITH_C_API)
+  add_dependencies(doc doc_copy_examples)
+endif ()
+add_dependencies(doc fypp) # only depend on the fypp step to avoid building
+                           # everything just for the docs

docs/guide/2-user-guide/1-installation/2-cmake-build-recipes.md renamed to docs/guide/2-user-guide/1-installation/1-cmake-build-recipes.md

@@ -0,0 +1,4 @@
+title: Docker Images
+
+{!./tools/docker/README.md!}
+

docs/guide/2-user-guide/1-installation/1-install.md

@@ -1 +1,104 @@
-title: Installation
+title: Install
+
+# Install
+
+## Prerequisites
+
+You absolutely need:
+
+* [CMake](https://cmake.org/) (3.12+)
+* GNU make or Ninja
+* a Fortran compiler which supports at least Fortran 2008 (including the TS 29113 when using the C-bindings)
+* a BLAS+LAPACK implementation (reference, OpenBLAS and MKL have been tested. Note: DBCSR linked to OpenBLAS 0.3.6 gives wrong results on Power9 architectures.)
+* a Python version installed (2.7 or 3.6+ have been tested)
+
+Optionally:
+
+* [libxsmm](https://github.com/hfp/libxsmm) (1.10+, and `pkg-config`) for Small Matrix Multiplication acceleration
+* a LAPACK implementation (reference, OpenBLAS-bundled and MKL have been tested), required when building the tests
+
+To build `libsmm_acc`, DBCSR's GPU backend, you further need:
+
+* A GPU-capable compiler, either
+  * CUDA Toolkit (targets NVIDIA GPUs, minimal version required: 5.5) with cuBLAS
+  * or HIP compiler (targets NVIDIA or AMD GPUs) and hipBLAS (the tested version is ROCm 3.8)
+* a C++ compiler which supports at least C++11 standard
+
+We test against GNU and Intel compilers on Linux systems, GNU compiler on MacOS systems. See a list of supported compilers [here](./3-supported-compilers.html).
+
+## Get DBCSR
+
+Download either a [release tarball](https://github.com/cp2k/dbcsr/releases) or clone the latest version from Git using:
+
+```bash
+git clone --recursive https://github.com/cp2k/dbcsr.git
+```
+
+## Build
+
+DBCSR can be compiled in 4 main variants:
+* Serial, i.e. no OpenMP and MPI
+* OpenMP
+* MPI
+* OpenMP+MPI
+The 4 variants can be combined with the accelerator support.
+
+Run inside the `dbcsr` directory:
+
+```bash
+mkdir build
+cd build
+cmake ..
+make
+```
+
+ The configuration flags for the CMake command are (default first):
+
+```
+-DUSE_MPI=<ON|OFF>
+-DUSE_OPENMP=<ON|OFF>
+-DUSE_SMM=<blas|libxsmm>
+-DUSE_CUDA=<OFF|ON>
+-DWITH_CUDA_PROFILING=<OFF|ON>
+-DUSE_HIP=<OFF|ON>
+-DWITH_C_API=<ON|OFF>
+-DWITH_EXAMPLES=<ON|OFF>
+-DWITH_GPU=<P100|K20X|K40|K80|V100|Mi50>
+-DCMAKE_BUILD_TYPE=<Release|Debug|Coverage>
+-DBUILD_TESTING=<ON|OFF>
+-DTEST_MPI_RANKS=<auto,N>
+-DTEST_OMP_THREADS=<2,N>
+```
+
+When providing a custom build of `libxsmm`, make sure that its library directory is added to the `PKG_CONFIG_PATH` variable prior
+to running `cmake`. An example if `libxsmm` was checked out using Git to your home folder:
+
+```bash
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${HOME}/libxsmm/lib"
+```
+
+### CMake Build Recipes
+
+For build recipes on different platforms, make sure to also read the [CMake Build Recipes](./1-cmake-build-recipes.html).
+
+### Using Python in a virtual environment
+
+If you want to use Python from a virtual environment and your CMake version is < 3.15, specify the desired python interpreter manually using:
+
+```
+    -DPython_EXECUTABLE=/path/to/python
+```
+
+### C/C++ Interface
+
+If MPI support is enabled (the default), the C API is automatically built.
+
+### Workaround issue in HIP
+
+HIP is a relatively new language, and some issues still need to be ironed out. As a workaround to an [issue](https://github.com/ROCm-Developer-Tools/HIP/pull/1543) in HIP's JIT infrastructure, please set the following if you've built HIP from source:
+
+```bash
+    export HIP_PATH=/opt/rocm/hip
+```
+
+before running on an AMD GPU.