Mentions légales du service

Skip to content
Snippets Groups Projects

Factorize the extended laplacian code

Merged Factorize the extended laplacian code
faverge/spm:laplacian into master
All threads resolved!
Merged Mathieu Faverge requested to merge faverge/spm:laplacian into master
All threads resolved!

Factorize the 2D/3D extended laplacian in a single function. Add the extended laplacian to the testings.

@ramet Let me know if you see something wrong.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Mathieu Faverge added 1 commit

    added 1 commit

    • 77cf5962 - Relace a bit the constraint on the norm test as it was failing for an error at 1e-16

    Compare with previous version

  • RAMET Pierre
    RAMET Pierre @ramet ·
    Owner

    I am not able to compile the current MR on my environment (MacOS with MKL). Probably since the update of cmake modules... Do we really need OpenMP to compile SPM ? Sequential BLAS vs Multithreaded ?

    -- A cache variable, namely LAPACKE_DIR, has been set to specify the install directory of LAPACKE
-- A cache variable, namely LAPACK_DIR, has been set to specify the install directory of LAPACK
-- A cache variable, namely BLAS_DIR, has been set to specify the install directory of BLAS
-- Found PkgConfig: /usr/local/bin/pkg-config (found version "0.29.2")
CMake Error at /usr/local/Cellar/cmake/3.11.1/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
  Could NOT find OpenMP_C (missing: OpenMP_C_FLAGS OpenMP_C_LIB_NAMES)
Call Stack (most recent call first):
  /usr/local/Cellar/cmake/3.11.1/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:378 (_FPHSA_FAILURE_MESSAGE)
  /usr/local/Cellar/cmake/3.11.1/share/cmake/Modules/FindOpenMP.cmake:442 (find_package_handle_standard_args)
  cmake_modules/morse_cmake/modules/find/FindBLAS.cmake:542 (find_package)
  cmake_modules/morse_cmake/modules/find/FindLAPACK.cmake:286 (find_package)
  cmake_modules/morse_cmake/modules/find/FindLAPACKE.cmake:117 (find_package)
  CMakeLists.txt:117 (find_package)

    With PaStiX I have the following log:

    -- A cache variable, namely CBLAS_DIR, has been set to specify the install directory of CBLAS
-- A cache variable, namely BLAS_DIR, has been set to specify the install directory of BLAS
-- Found PkgConfig: /usr/local/bin/pkg-config (found version "0.29.2")
-- Checking for one of the modules 'mkl-dynamic-lp64-iomp'
-- Checking for one of the modules 'mkl-dynamic-lp64-seq'
-- Checking for one of the modules 'openblas'
-- Checking for one of the modules 'blas'
-- Looking for BLAS - not found using PkgConfig.
   Perhaps you should add the directory containing blas.pc to
   the PKG_CONFIG_PATH environment variable.
-- Could NOT find OpenMP_C (missing: OpenMP_C_FLAGS OpenMP_C_LIB_NAMES)
-- Could NOT find OpenMP_CXX (missing: OpenMP_CXX_FLAGS OpenMP_CXX_LIB_NAMES)
-- Found OpenMP_Fortran: -fopenmp (found version "4.5")
-- Could NOT find OpenMP (missing: OpenMP_C_FOUND OpenMP_CXX_FOUND) (found version "4.5")
-- Looking for Fortran sgemm
-- Looking for Fortran sgemm - found
-- Looking for Fortran sgemm
-- Looking for Fortran sgemm - found
-- Looking for MKL BLAS: found
-- A library with BLAS API found.
-- BLAS_LIBRARIES /opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_intel_lp64.dylib;/opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_sequential.dylib;/opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_core.dylib;/usr/lib/libm.dylib
-- Looking for cblas_dscal
-- Looking for cblas_dscal - found
-- Looking for cblas_zgemm3m
-- Looking for cblas_zgemm3m - found
-- Looking for cblas: test with blas succeeds
-- Looking for cblas_dscal
-- Looking for cblas_dscal - found
-- Found CBLAS: /opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_intel_lp64.dylib;/opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_sequential.dylib;/opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_core.dylib;/usr/lib/libm.dylib
-- cblas:
-- A cache variable, namely LAPACKE_DIR, has been set to specify the install directory of LAPACKE
-- A cache variable, namely LAPACK_DIR, has been set to specify the install directory of LAPACK
-- Looking for BLAS - not found using PkgConfig.
   Perhaps you should add the directory containing blas.pc to
   the PKG_CONFIG_PATH environment variable.
-- Could NOT find OpenMP_C (missing: OpenMP_C_FLAGS OpenMP_C_LIB_NAMES)
-- Could NOT find OpenMP_CXX (missing: OpenMP_CXX_FLAGS OpenMP_CXX_LIB_NAMES)
-- Found OpenMP_Fortran: -fopenmp (found version "4.5")
-- Could NOT find OpenMP (missing: OpenMP_C_FOUND OpenMP_CXX_FOUND) (found version "4.5")
-- Looking for MKL BLAS: found
-- A library with BLAS API found.
-- BLAS_LIBRARIES /opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_intel_lp64.dylib;/opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_sequential.dylib;/opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_core.dylib;/usr/lib/libm.dylib
-- Looking for Fortran CHEEV
-- Looking for Fortran CHEEV - found
-- Looking for LAPACK in BLAS: found
-- Checking for one of the modules 'mkl-dynamic-lp64-iomp'
-- Checking for one of the modules 'mkl-dynamic-lp64-seq'
-- Checking for one of the modules 'openblas'
-- Checking for one of the modules 'lapack'
-- Looking for LAPACK - not found using PkgConfig.
   Perhaps you should add the directory containing lapack.pc to
   the PKG_CONFIG_PATH environment variable.
-- A library with LAPACK API found.
-- LAPACK_LIBRARIES /opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_intel_lp64.dylib;/opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_sequential.dylib;/opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_core.dylib;/usr/lib/libm.dylib
-- Looking for LAPACKE_dgeqrf
-- Looking for LAPACKE_dgeqrf - found
-- Looking for lapacke: test with lapack succeeds
-- Looking for LAPACKE_dgeqrf
-- Looking for LAPACKE_dgeqrf - found
-- Found LAPACKE: /opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_intel_lp64.dylib;/opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_sequential.dylib;/opt/intel/compilers_and_libraries_2018.0.104/mac/mkl/lib/libmkl_core.dylib;/usr/lib/libm.dylib
-- lapacke:
    Edited by RAMET Pierre
  • RAMET Pierre
  • RAMET Pierre
  • Mathieu Faverge
    Mathieu Faverge @faverge ·
    Author Owner

    I haven't tried to comoile it with pastix yet. It will require some changes I'll do later.

  • RAMET Pierre
    RAMET Pierre @ramet ·
    Owner

    I don't, my errors are obtained with solverstack/spm. Compilation logs with PaStiX show that there are some differences regarding the find lapacke between spm and PaStiX...

  • Mathieu Faverge added 3 commits

    added 3 commits

    • 0115c8a5 - Restore 1 in the testing
    • ef72d775 - Fix option for xlap
    • 1813920a - Add drawing and reducing influyence of gamma and delta points respectively by sqrt(2) and sqrt(3)

    Compare with previous version

  • Mathieu Faverge resolved all discussions

    resolved all discussions

  • RAMET Pierre
    RAMET Pierre @ramet ·
    Owner

    I can compile SPM if I remove the 'REQUIRED' option to CBLAS and LAPACKE (same as PaStiX). Ctest run successfully.

  • Mathieu Faverge added 1 commit

    added 1 commit

    • 073fe730 - Remove the required on cblas/lapacke packages

    Compare with previous version

  • Mathieu Faverge merged

    merged

  • Mathieu Faverge mentioned in commit eddf5328

    mentioned in commit eddf5328

  • RAMET Pierre mentioned in issue morse_cmake#12 (closed)

    mentioned in issue morse_cmake#12 (closed)

    • Please register or sign in to reply