Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Nektar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Giacomo Castiglioni
Nektar
Commits
4367910b
Commit
4367910b
authored
8 years ago
by
Kilian Lackhove
Browse files
Options
Downloads
Patches
Plain Diff
fix THIRDPARTY_BUILD_BLAS_LAPACK with THIRDPARTY_BUILD_PETSC
parent
3922a427
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/ThirdPartyBlasLapack.cmake
+5
-0
5 additions, 0 deletions
cmake/ThirdPartyBlasLapack.cmake
cmake/ThirdPartyPETSc.cmake
+6
-1
6 additions, 1 deletion
cmake/ThirdPartyPETSc.cmake
with
11 additions
and
1 deletion
cmake/ThirdPartyBlasLapack.cmake
+
5
−
0
View file @
4367910b
...
...
@@ -40,6 +40,7 @@ IF(THIRDPARTY_BUILD_BLAS_LAPACK)
-G
${
CMAKE_GENERATOR
}
-DCMAKE_Fortran_COMPILER:FILEPATH=
${
CMAKE_Fortran_COMPILER
}
-DCMAKE_INSTALL_PREFIX:PATH=
${
TPDIST
}
-DCMAKE_INSTALL_LIBDIR:PATH=
${
TPDIST
}
/lib
-DBUILD_SHARED_LIBS:STRING=ON
-DBUILD_TESTING:STRING=OFF
${
TPSRC
}
/lapack-3.7.0
...
...
@@ -47,8 +48,12 @@ IF(THIRDPARTY_BUILD_BLAS_LAPACK)
SET
(
NATIVE_BLAS blas CACHE FILEPATH
"BLAS library"
FORCE
)
SET
(
NATIVE_LAPACK lapack CACHE FILEPATH
"LAPACK library"
FORCE
)
SET
(
NATIVE_BLAS_LIB_DIR
${
TPDIST
}
/lib CACHE FILEPATH
"BLAS library dir"
FORCE
)
SET
(
NATIVE_LAPACK_LIB_DIR
${
TPDIST
}
/lib CACHE FILEPATH
"LAPACK library dir"
FORCE
)
MARK_AS_ADVANCED
(
NATIVE_BLAS
)
MARK_AS_ADVANCED
(
NATIVE_LAPACK
)
MARK_AS_ADVANCED
(
NATIVE_BLAS_LIB_DIR
)
MARK_AS_ADVANCED
(
NATIVE_LAPACK_LIB_DIR
)
LINK_DIRECTORIES
(
${
TPDIST
}
/lib
)
INCLUDE_DIRECTORIES
(
${
TPDIST
}
/include
)
...
...
This diff is collapsed.
Click to expand it.
cmake/ThirdPartyPETSc.cmake
+
6
−
1
View file @
4367910b
...
...
@@ -49,6 +49,7 @@ IF (NEKTAR_USE_PETSC)
# we use a MUMPS build in ordering here, in the future it might make
# sense to hook it up with metis/scotch since this MIGHT be faster
SET
(
PETSC_MUMPS --download-scalapack --download-mumps
)
SET
(
PETSC_DEPS
""
)
IF
(
NEKTAR_USE_BLAS_LAPACK
)
IF
(
NEKTAR_USE_MKL AND MKL_FOUND
)
...
...
@@ -56,7 +57,10 @@ IF (NEKTAR_USE_PETSC)
ELSEIF
(
NEKTAR_USE_WIN32_LAPACK
)
SET
(
PETSC_MUMPS
${
PETSC_MUMPS
}
--with-blas-lapack-dir=
${
LAPACK_DIR
}
)
ELSEIF
(
NEKTAR_USE_SYSTEM_BLAS_LAPACK
)
SET
(
PETSC_MUMPS
${
PETSC_MUMPS
}
--with-blas-lapack-dir=
${
NATIVE_BLAS_LIB_DIR
}
;
${
NATIVE_LAPACK_LIB_DIR
}
)
SET
(
PETSC_MUMPS
${
PETSC_MUMPS
}
--with-blas-lapack-dir=
${
NATIVE_LAPACK_LIB_DIR
}
)
IF
(
THIRDPARTY_BUILD_BLAS_LAPACK
)
SET
(
PETSC_DEPS
${
PETSC_DEPS
}
lapack-3.7.0
)
ENDIF
()
ELSE
()
MESSAGE
(
STATUS
"No suitable blas/lapack found, downloading"
)
SET
(
PETSC_MUMPS
${
PETSC_MUMPS
}
--download-fblaslapack
)
...
...
@@ -73,6 +77,7 @@ IF (NEKTAR_USE_PETSC)
EXTERNALPROJECT_ADD
(
petsc-3.7.2
DEPENDS
${
PETSC_DEPS
}
PREFIX
${
TPSRC
}
STAMP_DIR
${
TPBUILD
}
/stamp
DOWNLOAD_DIR
${
TPSRC
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment