Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
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
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Dmitri Naumov
ogs
Commits
d6607297
Commit
d6607297
authored
8 years ago
by
Lars Bilke
Committed by
Dmitri Naumov
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] OGS_EIGEN_DYNAMIC_SHAPE_MATRICES defaults to OFF on Release.
parent
ca237af1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+3
-0
3 additions, 0 deletions
CHANGELOG.md
CMakeLists.txt
+16
-2
16 additions, 2 deletions
CMakeLists.txt
with
19 additions
and
2 deletions
CHANGELOG.md
+
3
−
0
View file @
d6607297
...
...
@@ -8,6 +8,9 @@
### Infrastructure
-
CMake option OGS_EIGEN_DYNAMIC_SHAPE_MATRICES defaults to OFF on Release
config, ON otherwise. Can be overridden by explicitly setting the option. #1673
### Fixes
# 6.0.8
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
16
−
2
View file @
d6607297
...
...
@@ -82,9 +82,23 @@ option(OGS_USE_MPI "Use MPI" OFF)
# Eigen
option
(
OGS_USE_EIGEN
"Use Eigen linear solver"
ON
)
option
(
OGS_USE_EIGEN_UNSUPPORTED
"Use Eigen unsupported modules"
ON
)
option
(
OGS_EIGEN_DYNAMIC_SHAPE_MATRICES
"Use dynamically allocated shape matrices"
ON
)
option
(
EIGEN_NO_DEBUG
"Disables Eigen's assertions"
OFF
)
set
(
OGS_EIGEN_DYNAMIC_SHAPE_MATRICES
"Default"
CACHE STRING
"Use dynamically allocated shape matrices"
)
set_property
(
CACHE OGS_EIGEN_DYNAMIC_SHAPE_MATRICES
PROPERTY STRINGS
"Default"
"ON"
"OFF"
)
if
(
OGS_EIGEN_DYNAMIC_SHAPE_MATRICES STREQUAL
"Default"
)
if
(
CMAKE_BUILD_TYPE STREQUAL
"Release"
OR
CMAKE_BUILD_TYPE STREQUAL
"RelWithDebInfo"
)
set
(
OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_INTERNAL OFF
)
else
()
set
(
OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_INTERNAL ON
)
endif
()
else
()
set
(
OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_INTERNAL
${
OGS_EIGEN_DYNAMIC_SHAPE_MATRICES
}
)
endif
()
# MKL
option
(
OGS_USE_MKL
"Use Intel MKL"
OFF
)
...
...
@@ -166,7 +180,7 @@ add_definitions(-DEIGEN_INITIALIZE_MATRICES_BY_ZERO) # TODO check if needed
if
(
EIGEN_NO_DEBUG
)
add_definitions
(
-DEIGEN_NO_DEBUG
)
endif
()
if
(
OGS_EIGEN_DYNAMIC_SHAPE_MATRICES
)
if
(
OGS_EIGEN_DYNAMIC_SHAPE_MATRICES
_INTERNAL
)
add_definitions
(
-DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES
)
endif
()
...
...
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