hard-coded cpus to 2 to test full states report generation

quanted · May 30, 2023 · 46197db · 46197db
1 parent ec5a348
commit 46197db
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/flaskr/.ipynb_checkpoints/utils-checkpoint.py b/flaskr/.ipynb_checkpoints/utils-checkpoint.py
@@ -95,7 +95,8 @@ def p_update_geometry_bounds(day: int, year: int):
     cur.execute(query)
     objectids = cur.fetchall()
 
-    cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+    # cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+    cpus = 2
     pool = mp.Pool(cpus)
     logger.info("Running async, cores: {}".format(cpus))
     results = {}

diff --git a/flaskr/db.py b/flaskr/db.py
@@ -370,7 +370,8 @@ def p_set_geometry_tiles(year: int, day: int, objectid: int = None):
         features, crs = get_waterbody()
     images = get_images(year, day)
 
-    cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+    # cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+    cpus = 2
     pool = mp.Pool(cpus)
     logger.info("Running async, cores: {}".format(cpus))
 
@@ -818,7 +819,8 @@ def set_waterbody_details_table(input_file: str = None):
 
     waterbody_dict = get_waterbody_fids(return_dict=True)
 
-    cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+    # cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+    cpus = 2
     pool = mp.Pool(cpus)
     fid_dict = {}
     j = 500

diff --git a/flaskr/report.py b/flaskr/report.py
@@ -145,7 +145,8 @@ def generate_report(
 
     cpus = 1
     if parallel:
-        cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+        # cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+        cpus = 2
         pool = mp.Pool(cpus)
 
     if group_type == "State":
@@ -1138,7 +1139,8 @@ def generate_state_reports(year: int, day: int, parallel: bool = True):
     # states = [["","MI"], ["","MN"], ["","ND"], ["","TX"], ["","TN"], ["","CO"]]
     if parallel:
         generate_all_wb_rasters(year=year, day=day, parallel=parallel)
-        cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+        # cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+        cpus = 2
         pool = mp.Pool(cpus)
         states1 = states
         results_objects = [
@@ -1170,7 +1172,8 @@ def generate_alpinelake_report(year: int, day: int, parallel: bool = True):
 def generate_all_wb_rasters(year: int, day: int, parallel: bool = True):
     objectids = get_waterbody_objectids()
     if parallel:
-        cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+        # cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+        cpus = 2
         pool = mp.Pool(cpus)
         results_objects = [pool.apply_async(get_report_waterbody_raster,
                                             kwds={'year': year, 'day': day, 'report_id': "", 'objectid': oid}) for oid

diff --git a/flaskr/utils.py b/flaskr/utils.py
@@ -95,7 +95,8 @@ def p_update_geometry_bounds(day: int, year: int):
     cur.execute(query)
     objectids = cur.fetchall()
 
-    cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+    # cpus = mp.cpu_count() - 2 if mp.cpu_count() - 2 >= 2 else mp.cpu_count()
+    cpus = 2
     pool = mp.Pool(cpus)
     logger.info("Running async, cores: {}".format(cpus))
     results = {}