diff --git a/experiment_impact_tracker/compute_tracker.py b/experiment_impact_tracker/compute_tracker.py index 65e695c..c4be7b4 100644 --- a/experiment_impact_tracker/compute_tracker.py +++ b/experiment_impact_tracker/compute_tracker.py @@ -17,7 +17,10 @@ import pandas as pd import psutil import ujson as json -from pandas.io.json import json_normalize +try: + from pandas.io.json import json_normalize +except ImportError: + from pandas import json_normalize from experiment_impact_tracker.cpu import rapl from experiment_impact_tracker.cpu.common import get_my_cpu_info diff --git a/experiment_impact_tracker/data_interface.py b/experiment_impact_tracker/data_interface.py index 6d89eb8..765801e 100644 --- a/experiment_impact_tracker/data_interface.py +++ b/experiment_impact_tracker/data_interface.py @@ -34,7 +34,7 @@ run_test) from experiment_impact_tracker.utils import gather_additional_info -pd.set_option("display.max_colwidth", -1) +pd.set_option("display.max_colwidth", None) def _gather_executive_summary( diff --git a/experiment_impact_tracker/data_utils.py b/experiment_impact_tracker/data_utils.py index b6cb0cb..e522488 100644 --- a/experiment_impact_tracker/data_utils.py +++ b/experiment_impact_tracker/data_utils.py @@ -5,7 +5,11 @@ from datetime import datetime import ujson as json -from pandas.io.json import json_normalize + +try: + from pandas.io.json import json_normalize +except ImportError: + from pandas import json_normalize BASE_LOG_PATH = "impacttracker/" DATAPATH = BASE_LOG_PATH + "data.json" diff --git a/experiment_impact_tracker/emissions/rough_emissions_estimator.py b/experiment_impact_tracker/emissions/rough_emissions_estimator.py index af07018..73bead7 100644 --- a/experiment_impact_tracker/emissions/rough_emissions_estimator.py +++ b/experiment_impact_tracker/emissions/rough_emissions_estimator.py @@ -41,7 +41,7 @@ def __init__(self, gpu, cpu, gpu_utilization_factor, cpu_utilization_factor, loc carbonIntensity = zone_info['carbonIntensity'] carbonIntensity_source = zone_info['_source'] - gpu_kWh = kWh = float(self.gpu_vals['tdp']) * self.gpu_utilization_factor * (self.experiment_length_seconds / + gpu_kWh = kWh = float(self.gpu_vals['tdp'].iloc[0]) * self.gpu_utilization_factor * (self.experiment_length_seconds / 3600.)\ / \ 1000. @@ -81,9 +81,9 @@ def __init__(self, gpu, cpu, gpu_utilization_factor, cpu_utilization_factor, loc lower = ssc["16.7%"] upper = ssc["83.3%"] - median_carbon_cost = (kg_carbon / 1000.) * float(median) - upper_carbon_cost = (kg_carbon / 1000.) * float(upper) - lower_carbon_cost = (kg_carbon / 1000.) * float(lower) + median_carbon_cost = (kg_carbon / 1000.) * float(median.iloc[0]) + upper_carbon_cost = (kg_carbon / 1000.) * float(upper.iloc[0]) + lower_carbon_cost = (kg_carbon / 1000.) * float(lower.iloc[0]) bibtex_nature = """ @article{ricke2018country, @@ -145,4 +145,4 @@ def get_available_gpus(self): @classmethod def get_available_cpus(self): - return cpu_data["Model"].tolist() \ No newline at end of file + return cpu_data["Model"].tolist() diff --git a/scripts/create-compute-appendix b/scripts/create-compute-appendix index 670619c..2af9b22 100644 --- a/scripts/create-compute-appendix +++ b/scripts/create-compute-appendix @@ -25,7 +25,7 @@ from experiment_impact_tracker.emissions.get_region_metrics import \ get_zone_name_by_id from experiment_impact_tracker.utils import gather_additional_info -pd.set_option('display.max_colwidth', -1) +pd.set_option('display.max_colwidth', None) def _gather_executive_summary(aggregated_info, executive_summary_variables, experiment_set_names, all_points=False): diff --git a/scripts/generate-carbon-impact-statement b/scripts/generate-carbon-impact-statement index 29eebec..b920c6b 100644 --- a/scripts/generate-carbon-impact-statement +++ b/scripts/generate-carbon-impact-statement @@ -35,7 +35,7 @@ from experiment_impact_tracker.stats import (get_average_treatment_effect, run_test) from experiment_impact_tracker.utils import gather_additional_info -pd.set_option('display.max_colwidth', -1) +pd.set_option('display.max_colwidth', None)