forked from official-apps/SeismicHazardForecasting
		
	update package version logging, remove cpu tracking
This commit is contained in:
		@@ -45,20 +45,16 @@ def main(catalog_file, mc_file, pdf_file, m_file, m_select, mag_label, mc, m_max
 | 
			
		||||
    """
 | 
			
		||||
 | 
			
		||||
    import sys
 | 
			
		||||
    from importlib.metadata import version
 | 
			
		||||
    import logging
 | 
			
		||||
    from base_logger import getDefaultLogger
 | 
			
		||||
    from timeit import default_timer as timer
 | 
			
		||||
    from math import ceil, floor, isnan
 | 
			
		||||
    import numpy as np
 | 
			
		||||
    import scipy
 | 
			
		||||
    import obspy
 | 
			
		||||
    import dask
 | 
			
		||||
    from dask.diagnostics import ProgressBar  # use Dask progress bar
 | 
			
		||||
    import kalepy as kale
 | 
			
		||||
    import utm
 | 
			
		||||
    from skimage.transform import resize
 | 
			
		||||
    import psutil
 | 
			
		||||
    import openquake.engine
 | 
			
		||||
    import igfash
 | 
			
		||||
    from igfash.io import read_mat_cat, read_mat_m, read_mat_pdf, read_csv
 | 
			
		||||
    from igfash.window import win_CTL, win_CNE
 | 
			
		||||
@@ -105,25 +101,13 @@ verbose: {verbose}")
 | 
			
		||||
 | 
			
		||||
    # print key package version numbers
 | 
			
		||||
    logger.debug(f"Python version {sys.version}")
 | 
			
		||||
    logger.debug(f"Numpy version {np.__version__}")
 | 
			
		||||
    logger.debug(f"Scipy version {scipy.__version__}")
 | 
			
		||||
    logger.debug(f"Obspy version {obspy.__version__}")
 | 
			
		||||
    logger.debug(f"Openquake version {openquake.engine.__version__}")
 | 
			
		||||
    logger.debug(f"Igfash version {igfash.__version__}")
 | 
			
		||||
 | 
			
		||||
    # print number of cpu cores available
 | 
			
		||||
    ncpu = psutil.cpu_count(logical=False)
 | 
			
		||||
    logger.debug(f"Number of cpu cores available: {ncpu}")
 | 
			
		||||
    for process in psutil.process_iter():
 | 
			
		||||
        with process.oneshot():
 | 
			
		||||
 | 
			
		||||
            # cpu = process.cpu_percent()
 | 
			
		||||
            cpu = process.cpu_percent() / ncpu
 | 
			
		||||
 | 
			
		||||
            if cpu > 1:
 | 
			
		||||
                logger.debug(f"{process.name()}, {cpu}")
 | 
			
		||||
 | 
			
		||||
    logger.debug(f"BASELINE CPU LOAD% {psutil.cpu_percent(interval=None, percpu=True)}")
 | 
			
		||||
    logger.debug(f"Numpy version {version('numpy')}")
 | 
			
		||||
    logger.debug(f"Scipy version {version('scipy')}")
 | 
			
		||||
    logger.debug(f"Obspy version {version('obspy')}")
 | 
			
		||||
    logger.debug(f"Openquake version {version('openquake.engine')}")
 | 
			
		||||
    logger.debug(f"Igfash version {version('igfash')}")
 | 
			
		||||
    logger.debug(f"Rbeast version {version('rbeast')}")
 | 
			
		||||
    logger.debug(f"Dask version {version('dask')}")
 | 
			
		||||
 | 
			
		||||
    dask.config.set(scheduler='processes')
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user