Disable mkl

This commit is contained in:
Matteo Giantomassi 2017-03-10 22:57:33 +01:00
parent 8f4a6ad592
commit 981eb56e65
2 changed files with 6 additions and 2 deletions

View File

@ -30,6 +30,9 @@ install:
#- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION dep1 dep2 ...
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- source activate test-environment
# https://github.com/BVLC/caffe/issues/3884
# https://docs.continuum.io/mkl-optimizations/
- conda install nomkl
- conda install gcc scipy
- conda install pandas netcdf4
- pip install pytest scripttest nose nose-exclude

View File

@ -22,7 +22,7 @@ ArrayWithUnit = units.ArrayWithUnit
####################
### Abipy import ###
####################
from abipy.flowapi import Pseudo, PseudoTable, Mrgscr, Mrgddb, Mrggkk, Flow, TaskManager
from abipy.flowapi import Pseudo, PseudoTable, Mrgscr, Mrgddb, Mrggkk, Flow, TaskManager, AbinitBuild
#from pymatgen.io.abinit.flows import (Flow, G0W0WithQptdmFlow, bandstructure_flow, PhononFlow,
# g0w0_flow, phonon_flow, phonon_conv_flow, nonlinear_coeff_flow)
@ -272,6 +272,8 @@ def abicheck(verbose=0):
# Get info on the Abinit build.
from abipy.core.testing import cmp_version
from abipy.flowapi import PyFlowScheduler
if manager is not None:
cprint("AbiPy Manager:\n%s\n" % str(manager), color="green")
build = AbinitBuild(manager=manager)
@ -283,7 +285,6 @@ def abicheck(verbose=0):
app("Abipy requires Abinit version >= %s but got %s" % (min_abinit_version, build.version))
# Get info on the scheduler.
from abipy.flowapi import PyFlowScheduler
try:
scheduler = PyFlowScheduler.from_user_config()
cprint("Abipy Scheduler:\n%s\n" % str(scheduler), color="yellow")