Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ift
NIFTy
Commits
c53029ef
Commit
c53029ef
authored
Oct 04, 2016
by
theos
Browse files
Adapted to new version of keepers.get_Configuration()
parent
4d18d0b9
Changes
3
Hide whitespace changes
Inline
Side-by-side
nifty/config/d2o_config.py
View file @
c53029ef
...
...
@@ -6,5 +6,8 @@ import keepers
# pre-create the D2O configuration instance and set its path explicitly
d2o_configuration
=
keepers
.
get_Configuration
(
'D2O'
,
path
=
os
.
path
.
expanduser
(
'~'
)
+
"/.nifty/d2o_config"
)
name
=
'D2O'
,
file_name
=
'D2O.conf'
,
search_pathes
=
[
os
.
path
.
expanduser
(
'~'
)
+
"/.config/nifty/"
,
os
.
path
.
expanduser
(
'~'
)
+
"/.config/"
,
'./'
])
nifty/config/nifty_config.py
View file @
c53029ef
...
...
@@ -52,13 +52,12 @@ variable_use_healpy = keepers.Variable(
genus
=
'boolean'
)
variable_use_libsharp
=
keepers
.
Variable
(
'use_libsharp'
,
[
True
,
False
],
lambda
z
:
((
'libsharp_wrapper_gl'
in
dependency_injector
)
if
z
else
True
)
and
isinstance
(
z
,
bool
),
genus
=
'boolean'
)
'use_libsharp'
,
[
True
,
False
],
lambda
z
:
((
'libsharp_wrapper_gl'
in
dependency_injector
)
if
z
else
True
)
and
isinstance
(
z
,
bool
),
genus
=
'boolean'
)
variable_verbosity
=
keepers
.
Variable
(
'verbosity'
,
[
1
],
...
...
@@ -88,16 +87,19 @@ variable_default_distribution_strategy = keepers.Variable(
genus
=
'str'
)
nifty_configuration
=
keepers
.
get_Configuration
(
'NIFTy'
,
[
variable_fft_module
,
variable_lm2gl
,
variable_use_healpy
,
variable_use_libsharp
,
variable_verbosity
,
variable_default_field_dtype
,
variable_default_distribution_strategy
,
],
path
=
os
.
path
.
expanduser
(
'~'
)
+
"/.nifty/nifty_config"
)
name
=
'NIFTy'
,
variables
=
[
variable_fft_module
,
variable_lm2gl
,
variable_use_healpy
,
variable_use_libsharp
,
variable_verbosity
,
variable_default_field_dtype
,
variable_default_distribution_strategy
],
file_name
=
'NIFTy.conf'
,
search_pathes
=
[
os
.
path
.
expanduser
(
'~'
)
+
"/.config/nifty/"
,
os
.
path
.
expanduser
(
'~'
)
+
"/.config/"
,
'./'
])
########
### Compatibility variables
########
...
...
setup.py
View file @
c53029ef
...
...
@@ -44,9 +44,9 @@ setup(name="ift_nifty",
]),
include_dirs
=
[
numpy
.
get_include
()],
dependency_links
=
[
'git+https://gitlab.mpcdf.mpg.de/ift/keepers.git#egg=keepers'
,
'git+https://gitlab.mpcdf.mpg.de/ift/keepers.git#egg=keepers
-0.1.1
'
,
'git+https://gitlab.mpcdf.mpg.de/ift/d2o.git#egg=d2o-1.0.4'
],
install_requires
=
[
'keepers'
,
'd2o>=1.0.4'
],
install_requires
=
[
'keepers
>=0.1.1
'
,
'd2o>=1.0.4'
],
package_data
=
{
'nifty.demos'
:
[
'demo_faraday_map.npy'
],
},
license
=
"GPLv3"
,
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment