diff --git a/binarycpython/utils/population_extensions/_HPC.py b/binarycpython/utils/population_extensions/_HPC.py index eaca0508527763859099ee0ebdc278420a542c88..61521df962f6cd49b2574ad1dd132716566b3b41 100644 --- a/binarycpython/utils/population_extensions/_HPC.py +++ b/binarycpython/utils/population_extensions/_HPC.py @@ -17,6 +17,10 @@ import glob import json import os +from binarycpython.utils.functions import ( + now, +) + from binarycpython.utils.population_extensions._slurm import slurm from binarycpython.utils.population_extensions._condor import condor @@ -193,7 +197,7 @@ class HPC(condor, slurm): and their .saved equivalents also exist """ - print("HPC check if we can join at {}".format(self.now())) + print("HPC check if we can join at {}".format(now())) if self.grid_options["HPC_force_join"] == 0 and os.path.exists(joiningfile): if vb: diff --git a/binarycpython/utils/population_extensions/_dataIO.py b/binarycpython/utils/population_extensions/_dataIO.py index ddd0796d35a36ffc3e20519309d6c94829251ad6..ff19dbba53c3df8616fbf69461885bfdc486cac8 100644 --- a/binarycpython/utils/population_extensions/_dataIO.py +++ b/binarycpython/utils/population_extensions/_dataIO.py @@ -26,6 +26,7 @@ from binarycpython.utils.dicts import ( ) from binarycpython.utils.functions import ( verbose_print, + now, ) @@ -110,7 +111,7 @@ class dataIO: # add datestamp population_object.grid_ensemble_results["metadata"][ "save_population_time" - ] = self.now() + ] = now() # add extra metadata population_object.add_system_metadata() diff --git a/binarycpython/utils/population_extensions/_grid_options_defaults.py b/binarycpython/utils/population_extensions/_grid_options_defaults.py index e6ab8fef5e4b16777f0909651e7ad5a929307764..6eac46ebe503286d4edb027c2bddaebb66226575 100644 --- a/binarycpython/utils/population_extensions/_grid_options_defaults.py +++ b/binarycpython/utils/population_extensions/_grid_options_defaults.py @@ -23,6 +23,10 @@ import sys from binarycpython.utils.custom_logging_functions import temp_dir +from binarycpython.utils.functions import ( + now, +) + _MOE2017_VERBOSITY_LEVEL = 5 _MOE2017_VERBOSITY_INTERPOLATOR_LEVEL = 6 _MOE2017_VERBOSITY_INTERPOLATOR_EXTRA_LEVEL = 7 @@ -83,7 +87,7 @@ class grid_options_defaults: "original_command_line": os.getenv("BINARY_C_PYTHON_ORIGINAL_CMD_LINE"), "working_diretory": os.getcwd(), "original_working_diretory": os.getenv("BINARY_C_PYTHON_ORIGINAL_WD"), - "start_time": self.now(), + "start_time": now(), "original_submission_time": os.getenv( "BINARY_C_PYTHON_ORIGINAL_SUBMISSION_TIME" ), diff --git a/binarycpython/utils/population_extensions/_metadata.py b/binarycpython/utils/population_extensions/_metadata.py index 4e1f5704b4ac2bd4e75a029a5b60281a74e9523b..fab6143119816ceb8df4b028064e75271d3ecf18 100644 --- a/binarycpython/utils/population_extensions/_metadata.py +++ b/binarycpython/utils/population_extensions/_metadata.py @@ -15,6 +15,9 @@ from binarycpython.utils.dicts import ( from binarycpython.utils.ensemble import ( binaryc_json_serializer, ) +from binarycpython.utils.functions import ( + now, +) class metadata: @@ -39,7 +42,7 @@ class metadata: self.grid_ensemble_results["metadata"] = {} # add date - self.grid_ensemble_results["metadata"]["date"] = self.now() + self.grid_ensemble_results["metadata"]["date"] = now() # add platform and build information self.grid_ensemble_results["metadata"]["platform"] = platform.platform() diff --git a/binarycpython/utils/population_extensions/_spacing_functions.py b/binarycpython/utils/population_extensions/_spacing_functions.py index 64eacce2d8095e36cc9ab907c5b3d07bab58ee18..d7792601a141cf5d2c59a2235766b5191a17d002 100644 --- a/binarycpython/utils/population_extensions/_spacing_functions.py +++ b/binarycpython/utils/population_extensions/_spacing_functions.py @@ -20,7 +20,7 @@ import numpy as np import cachetools import diskcache -from binarycpython.utils.grid import Population +# from binarycpython.utils.grid import Population import py_rinterpolate