Skip to content
Snippets Groups Projects
Commit 8e6c576f authored by Tim O'Donnell's avatar Tim O'Donnell
Browse files

Fix calibrate-percentile-ranks local parallelism interaction with model stitching

parent f1d17bf0
No related branches found
No related tags found
No related merge requests found
...@@ -108,7 +108,12 @@ def run(argv=sys.argv[1:]): ...@@ -108,7 +108,12 @@ def run(argv=sys.argv[1:]):
configure_logging(verbose=args.verbosity > 1) configure_logging(verbose=args.verbosity > 1)
predictor = Class1AffinityPredictor.load(args.models_dir) # It's important that we don't trigger a Keras import here since that breaks
# local parallelism (tensorflow backend). So we set optimization_level=0.
predictor = Class1AffinityPredictor.load(
args.models_dir,
optimization_level=0,
)
if args.allele: if args.allele:
alleles = [normalize_allele_name(a) for a in args.allele] alleles = [normalize_allele_name(a) for a in args.allele]
...@@ -236,6 +241,7 @@ def calibrate_percentile_ranks( ...@@ -236,6 +241,7 @@ def calibrate_percentile_ranks(
model_kwargs={}): model_kwargs={}):
if verbose: if verbose:
print("Calibrating", allele) print("Calibrating", allele)
predictor.optimize() # since we loaded with optimization_level=0
start = time.time() start = time.time()
summary_results = predictor.calibrate_percentile_ranks( summary_results = predictor.calibrate_percentile_ranks(
peptides=peptides, peptides=peptides,
......
...@@ -7,6 +7,7 @@ import pandas ...@@ -7,6 +7,7 @@ import pandas
from .hyperparameters import HyperparameterDefaults from .hyperparameters import HyperparameterDefaults
from .common import amino_acid_distribution, random_peptides from .common import amino_acid_distribution, random_peptides
class RandomNegativePeptides(object): class RandomNegativePeptides(object):
hyperparameter_defaults = HyperparameterDefaults( hyperparameter_defaults = HyperparameterDefaults(
random_negative_rate=0.0, random_negative_rate=0.0,
......
...@@ -18,6 +18,7 @@ from mhcflurry.testing_utils import cleanup, startup ...@@ -18,6 +18,7 @@ from mhcflurry.testing_utils import cleanup, startup
teardown = cleanup teardown = cleanup
setup = startup setup = startup
def run_and_check(n_jobs=0, delete=True, additional_args=[]): def run_and_check(n_jobs=0, delete=True, additional_args=[]):
source_models_dir = get_path("models_class1_pan", "models.with_mass_spec") source_models_dir = get_path("models_class1_pan", "models.with_mass_spec")
dest_models_dir = tempfile.mkdtemp(prefix="mhcflurry-test-models") dest_models_dir = tempfile.mkdtemp(prefix="mhcflurry-test-models")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment