From b9e75ecdb13b1f71ba2bc93d12c7aef9ec754fa2 Mon Sep 17 00:00:00 2001 From: juacrumar Date: Tue, 26 May 2020 13:32:12 +0200 Subject: [PATCH 1/2] create a .version file per replica --- n3fit/src/n3fit/io/writer.py | 5 +++++ n3fit/src/n3fit/tests/test_fit.py | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/n3fit/src/n3fit/io/writer.py b/n3fit/src/n3fit/io/writer.py index 1f43a3ca7a..214609136b 100644 --- a/n3fit/src/n3fit/io/writer.py +++ b/n3fit/src/n3fit/io/writer.py @@ -10,6 +10,7 @@ import json import numpy as np from reportengine.compat import yaml +import n3fit from n3fit.msr import compute_arclength @@ -241,3 +242,7 @@ def storefit( # create .time file with open(f"{replica_path}/{fitname}.time", "w") as fs: json.dump(timings, fs, indent=2) + + # create .version file + with open(f"{replica_path}/{fitname}.version", "w") as fs: + fs.write(n3fit.__version__) diff --git a/n3fit/src/n3fit/tests/test_fit.py b/n3fit/src/n3fit/tests/test_fit.py index a650a1a042..edb6d66fa4 100644 --- a/n3fit/src/n3fit/tests/test_fit.py +++ b/n3fit/src/n3fit/tests/test_fit.py @@ -24,6 +24,7 @@ from collections import namedtuple from numpy.testing import assert_almost_equal from reportengine.compat import yaml +import n3fit from n3fit.performfit import initialize_seeds log = logging.getLogger(__name__) @@ -103,6 +104,11 @@ def test_performfit(): fitting_time = times["walltime"]["replica_set_to_replica_fitted"] f.close() assert fitting_time < EXPECTED_MAX_FITTIME + version_path = tmp_path / f"{QUICKNAME}/nnfit/replica_{REPLICA}/{QUICKNAME}.version" + f = open(version_path, "r") + version = f.read() + f.close() + assert version == n3fit.__version__ def test_hyperopt(): From 4db94a749711b24426082d50f6bec3801a30ecb8 Mon Sep 17 00:00:00 2001 From: juacrumar Date: Tue, 26 May 2020 16:34:59 +0200 Subject: [PATCH 2/2] change name to version.info --- n3fit/src/n3fit/io/writer.py | 2 +- n3fit/src/n3fit/tests/test_fit.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/n3fit/src/n3fit/io/writer.py b/n3fit/src/n3fit/io/writer.py index 214609136b..e4ae14160e 100644 --- a/n3fit/src/n3fit/io/writer.py +++ b/n3fit/src/n3fit/io/writer.py @@ -244,5 +244,5 @@ def storefit( json.dump(timings, fs, indent=2) # create .version file - with open(f"{replica_path}/{fitname}.version", "w") as fs: + with open(f"{replica_path}/version.info", "w") as fs: fs.write(n3fit.__version__) diff --git a/n3fit/src/n3fit/tests/test_fit.py b/n3fit/src/n3fit/tests/test_fit.py index edb6d66fa4..379cc08bfb 100644 --- a/n3fit/src/n3fit/tests/test_fit.py +++ b/n3fit/src/n3fit/tests/test_fit.py @@ -104,7 +104,7 @@ def test_performfit(): fitting_time = times["walltime"]["replica_set_to_replica_fitted"] f.close() assert fitting_time < EXPECTED_MAX_FITTIME - version_path = tmp_path / f"{QUICKNAME}/nnfit/replica_{REPLICA}/{QUICKNAME}.version" + version_path = tmp_path / f"{QUICKNAME}/nnfit/replica_{REPLICA}/version.info" f = open(version_path, "r") version = f.read() f.close()