Skip to content

Commit

Permalink
Fix/absoluteimports (#98)
Browse files Browse the repository at this point in the history
* fconverted to absolute imports for clarity and to fix issue with docs building

* added missing init file in linalg package

* corrected travis file to use requirements files

* incremented version number for merge
  • Loading branch information
edaub authored Jun 8, 2020
1 parent 8dd1b6f commit dbdec2e
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 19 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ python:
- "3.7"
install:
- pip install -r requirements.txt
- pip install pytest-cov codecov patsy
- pip install -r requirements-dev.txt
- pip install -r requirements-optional.txt
- python setup.py install
script:
- pytest --cov=./
Expand Down
2 changes: 1 addition & 1 deletion mogp_emulator/DimensionReduction.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
import sys
import numpy as np
from scipy.spatial.distance import cdist, pdist, squareform
from .utils import k_fold_cross_validation, integer_bisect
from mogp_emulator.utils import k_fold_cross_validation, integer_bisect

def gram_matrix(X, k):
"""Computes the Gram matrix of `X`
Expand Down
8 changes: 4 additions & 4 deletions mogp_emulator/GaussianProcess.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import numpy as np
from .MeanFunction import MeanFunction, MeanBase
from .Kernel import Kernel, SquaredExponential
from .Priors import Prior
from mogp_emulator.MeanFunction import MeanFunction, MeanBase
from mogp_emulator.Kernel import Kernel, SquaredExponential
from mogp_emulator.Priors import Prior
from scipy import linalg
from scipy.optimize import OptimizeResult
from .linalg.cholesky import jit_cholesky
from mogp_emulator.linalg.cholesky import jit_cholesky

class GaussianProcess(object):
"""
Expand Down
2 changes: 1 addition & 1 deletion mogp_emulator/HistoryMatching.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import numpy as np
from .GaussianProcess import GaussianProcess, PredictResult
from mogp_emulator.GaussianProcess import GaussianProcess, PredictResult

class HistoryMatching(object):
r"""
Expand Down
2 changes: 1 addition & 1 deletion mogp_emulator/MeanFunction.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
import numpy as np
from functools import partial
from inspect import signature
from .formula import mean_from_patsy_formula, mean_from_string
from mogp_emulator.formula import mean_from_patsy_formula, mean_from_string

def MeanFunction(formula, inputdict={}, use_patsy=True):
"""
Expand Down
8 changes: 4 additions & 4 deletions mogp_emulator/MultiOutputGP.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from multiprocessing import Pool
import numpy as np
from .GaussianProcess import GaussianProcess, PredictResult
from .MeanFunction import MeanBase
from .Kernel import Kernel, SquaredExponential
from .Priors import Prior
from mogp_emulator.GaussianProcess import GaussianProcess, PredictResult
from mogp_emulator.MeanFunction import MeanBase
from mogp_emulator.Kernel import Kernel, SquaredExponential
from mogp_emulator.Priors import Prior

class MultiOutputGP(object):
"""
Expand Down
6 changes: 3 additions & 3 deletions mogp_emulator/SequentialDesign.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import numpy as np
from scipy.spatial.distance import cdist
from inspect import signature
from .ExperimentalDesign import ExperimentalDesign
from .GaussianProcess import GaussianProcess
from .fitting import fit_GP_MAP
from mogp_emulator.ExperimentalDesign import ExperimentalDesign
from mogp_emulator.GaussianProcess import GaussianProcess
from mogp_emulator.fitting import fit_GP_MAP
from numpy.linalg import LinAlgError

class SequentialDesign(object):
Expand Down
4 changes: 2 additions & 2 deletions mogp_emulator/fitting.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import scipy.stats
from scipy.linalg import LinAlgError
from scipy.optimize import minimize
from .GaussianProcess import GaussianProcess
from .MultiOutputGP import MultiOutputGP
from mogp_emulator.GaussianProcess import GaussianProcess
from mogp_emulator.MultiOutputGP import MultiOutputGP
from multiprocessing import Pool
from functools import partial

Expand Down
2 changes: 1 addition & 1 deletion mogp_emulator/formula.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from . import MeanFunction
from mogp_emulator import MeanFunction
try:
from patsy import ModelDesc, Term, EvalFactor
no_patsy = False
Expand Down
Empty file.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
MAJOR = 0
MINOR = 3
MICRO = 0
PRERELEASE = 6
PRERELEASE = 7
ISRELEASED = False
version = "{}.{}.{}".format(MAJOR, MINOR, MICRO)

Expand Down

0 comments on commit dbdec2e

Please sign in to comment.