-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refresh complex mode patches in firedrake
- Loading branch information
1 parent
7e0fe6f
commit 10143d6
Showing
2 changed files
with
20 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,18 @@ | ||
| diff --git a/setup.py b/setup.py | ||
| index 026bcf25..34d9c14a 100644 | ||
| index 6a0b0f3c8..ba49278f4 100644 | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -14,7 +14,7 @@ from firedrake_configuration import get_config | ||
| @@ -10,12 +10,9 @@ import petsc4py | ||
| import rtree | ||
| import versioneer | ||
|
|
||
| -from firedrake_configuration import get_config | ||
| - | ||
| try: | ||
| from Cython.Distutils.extension import Extension | ||
| config = get_config() | ||
| - complex_mode = config['options'].get('complex', False) | ||
| - config = get_config() | ||
| - complex_mode = config["options"].get("complex", False) | ||
| + complex_mode = True | ||
| except ImportError: | ||
| # No Cython Extension means no complex mode! | ||
| from distutils.extension import Extension | ||
| from setuptools import Extension |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,18 @@ | ||
| diff --git a/setup.py b/setup.py | ||
| index 026bcf25..34d9c14a 100644 | ||
| index 6a0b0f3c8..f1c419683 100644 | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -14,7 +14,7 @@ from firedrake_configuration import get_config | ||
| @@ -10,12 +10,9 @@ import petsc4py | ||
| import rtree | ||
| import versioneer | ||
|
|
||
| -from firedrake_configuration import get_config | ||
| - | ||
| try: | ||
| from Cython.Distutils.extension import Extension | ||
| config = get_config() | ||
| - complex_mode = config['options'].get('complex', False) | ||
| - config = get_config() | ||
| - complex_mode = config["options"].get("complex", False) | ||
| + complex_mode = False | ||
| except ImportError: | ||
| # No Cython Extension means no complex mode! | ||
| from distutils.extension import Extension | ||
| from setuptools import Extension |