Skip to content
Snippets Groups Projects

Get rid off fortran compiler usage for Lapack/Blas.

Merged Get rid off fortran compiler usage for Lapack/Blas.
features/no-fortran into master
1 unresolved thread
Merged Markus Blatt requested to merge features/no-fortran into master
1 unresolved thread

FindLAPACK and FindBLAS check for the name mangling with added underline as a fallback, anyway. Hence there is no need for using a Fortran compiler. With this commit we now simply add another check for a LAPACK function to see whether it has an underline added and adapt the existing macro in config.h accordingly.

Closes #184 (closed)

Merge request reports

Pipeline #25250 passed

Stage: test

Pipeline passed for 3dfeff22 on features/no-fortran

Approval is optional

Merged by Christoph GrüningerChristoph Grüninger 5 years ago (Mar 13, 2020 8:16pm UTC)

Merge details

  • Changes merged into master with 9666beaa.
  • Deleted the source branch.

  • Closed #184 (closed)

  • Auto-merge enabled

Pipeline #25252 passed

Stage: test

Pipeline passed for 9666beaa on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
cmake/modules/DuneCommonMacros.cmake
16 if(${HAVE_LAPACK})
17 dune_register_package_flags(LIBRARIES "${LAPACK_LIBRARIES}")
18 endif(${HAVE_LAPACK})
19 set(HAVE_BLAS ${BLAS_FOUND})
20 else(Fortran_Works)
21 set(HAVE_LAPACK Off)
22 set(HAVE_BLAS Off)
23 endif(Fortran_Works)
12 # search for lapack
13 find_package(LAPACK)
14 set(HAVE_LAPACK ${LAPACK_FOUND})
15 if(${HAVE_LAPACK})
16 dune_register_package_flags(LIBRARIES "${LAPACK_LIBRARIES}")
17 cmake_push_check_state()
18 set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
19 check_function_exists("dsyev_" LAPACK_NEEDS_UNDERLINE)
  • Christoph Grüninger
    Christoph Grüninger @gruenich ·
    Owner

    I'd prefer to stick to our solution and extend it to cover the uppercase variant. Replacing Find* modules cuts you off from improvements and bug fixes from CMake's Find* modules.

    Actually, I couldn't find the uppercase test within Eigen's test.

  • Christoph Grüninger added 1 commit

    added 1 commit

    • 9f549df9 - [changelog] Meantion that Fortran is no longer a built requirement

    Compare with previous version

  • Christoph Grüninger
    Christoph Grüninger @gruenich ·
    Owner

    Can we merge this and see if anybody complains? We could then adjust to fit their needs.

    @christi Do you veto a merge?

  • Christian Engwer
    Christian Engwer @christi ·
    Owner

    Go ahead

  • Christoph Grüninger added 54 commits

    added 54 commits

    • 9f549df9...46ca5e99 - 52 commits from branch master
    • 54ac7b4b - Get rid off fortran compiler usage for Lapack/Blas.
    • 3dfeff22 - [changelog] Meantion that Fortran is no longer a built requirement

    Compare with previous version

  • Christoph Grüninger enabled an automatic merge when the pipeline for 3dfeff22 succeeds

    enabled an automatic merge when the pipeline for 3dfeff22 succeeds

  • Christoph Grüninger merged

    merged

  • Christoph Grüninger mentioned in commit 9666beaa

    mentioned in commit 9666beaa

  • Santiago Ospina De Los Ríos mentioned in merge request infrastructure/dune-website!564 (merged)

    mentioned in merge request infrastructure/dune-website!564 (merged)

    • Please register or sign in to reply