honeybee-radiance-postprocess 0.4.585__tar.gz → 0.4.587__tar.gz

honeybee_radiance_postprocess-0.4.587/CUPY.MD

@@ -0,0 +1,88 @@
+# CuPy installation guide
+
+## :white_check_mark: CuPy requirements
+
+* You have an NVIDIA GPU.
+* Your GPU's compute capability is supported by CuPy.
+* You have a suitable CUDA Toolkit installed (matching the CuPy package variant).
+* Your GPU driver supports the CUDA version you intend to use.
+
+## :wrench: Compute Capability
+
+### What is Compute Capability
+Compute capability is a number that describes the feature set and performance characteristics of your NVIDIA GPU architecture.
+
+CuPy supports GPUs with compute capability ≥ 3.0.
+
+Examples:
+* NVIDIA GTX 1080 → Compute Capability **6.1**.
+* NVIDIA GTX 2080 → Compute Capability **7.5**.
+* NVIDIA RTX 3080 → Compute Capability **8.6**.
+* NVIDIA RTX 4090 → Compute Capability **8.9**.
+* NVIDIA RTX 5090 → Compute Capability **12.0**.
+
+You can find the compute capability of your GPU [here](https://developer.nvidia.com/cuda-gpus). If you have an older GPU, such as the GTX 10 series or older, please check [this](https://developer.nvidia.com/cuda-legacy-gpus) list.
+
+If you are still not sure about your compute capability, you can query it through CuPy once it is installed:
+
+```python
+import cupy as cp
+
+print(cp.cuda.Device().compute_capability)
+```
+
+This prints the major index and minor index as a string, e.g., '75' for version 7.5.
+
+## :toolbox: CUDA Toolkit
+
+### What is CUDA Toolkit
+The CUDA Toolkit provides the underlying CUDA libraries, runtime, and compiler that CuPy uses to run GPU code. CuPy depends on a matching CUDA Toolkit and GPU driver that supports your GPU.
+
+### Picking the correct CUDA version
+
+You can find the CUDA version supported by your GPU driver by executing  [nvidia-smi](https://docs.nvidia.com/deploy/nvidia-smi/index.html) in the command prompt.
+
+```
+C:\Users\USERNAME>nvidia-smi
++-----------------------------------------------------------------------------------------+
+| NVIDIA-SMI 581.80                 Driver Version: 581.80         CUDA Version: 13.0     |
++-----------------------------------------+------------------------+----------------------+
+```
+
+Please note that the CUDA version reported by nvidia-smi is not the installed version of the CUDA Toolkit; it is the latest API compatible version for your GPU driver. If your GPU driver is not up to date you might not see the latest CUDA version.
+
+### Installing CUDA Toolkit
+
+You can download the latest version of CUDA Toolkit [here](https://developer.nvidia.com/cuda-downloads). If your GPU driver does not support the latest version, you can select a compatible version in the [archive](https://developer.nvidia.com/cuda-toolkit-archive).
+
+## :package: Installing CuPy
+
+CuPy provides prebuilt binary wheels tied to CUDA versions. You should install the wheel matching your installed CUDA Toolkit.
+
+| CUDA Toolkit	      | Command                  |
+| ------------------- | ------------------------ |
+| CUDA 13.x	          | pip install cupy-cuda13x |
+| CUDA 12.x      	  | pip install cupy-cuda12x |
+| CUDA 11.x (>= 11.2) |	pip install cupy-cuda11x |
+
+## :question: FAQ
+
+### Can I use CuPy with an AMD GPU?
+
+If you have an AMD GPU please read [this](https://docs.cupy.dev/en/stable/install.html#using-cupy-on-amd-gpu-experimental).
+
+### How can I tell if honeybee-radiance-process is using CuPy and not NumPy?
+
+honeybee-radiance-postprocess will print a line that tells you if CuPy is being used. You should see something like this:
+
+`Using CuPy (13.6.0) for GPU (NVIDIA GeForce RTX 3080) acceleration in honeybee-radiance-postprocess.`
+
+If CuPy *is* installed but fails during initialization honeybee-radiance-postprocess will fall back to NumPy. If this happens you should see a statement similar to this:
+
+`Failed to load CuPy successfully. Falling back to NumPy (1.26.4) in honeybee-radiance-postprocess`
+
+## :warning: Common Errors
+
+`FileNotFoundError: Could not find module 'nvrtc64_130_0.dll' (or one of its dependencies). Try using the full path with constructor syntax.`
+
+This is possibly caused by a mismatch between the CUDA Toolkit version and the CuPy version, e.g., cupy-cuda13x and CUDA Toolkit 12.9.

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: honeybee-radiance-postprocess
-Version: 0.4.585
+Version: 0.4.587
 Summary: Postprocessing of Radiance results and matrices
 Home-page: https://github.com/ladybug-tools/honeybee-radiance-postprocess
 Author: Ladybug Tools
@@ -16,8 +16,9 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: honeybee-radiance==1.66.216
+Requires-Dist: honeybee-radiance==1.66.217
 Requires-Dist: numpy<2.0.0
+Requires-Dist: cupy-cuda12x==13.6.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

honeybee_radiance_postprocess-0.4.587/honeybee_radiance_postprocess/__init__.py

@@ -0,0 +1,36 @@
+"""honeybee-radiance-postprocess library."""
+import sys
+
+IS_GPU = False
+
+if sys.version_info >= (3, 0):
+    try:
+        import cupy as np
+        np.arange(1)
+        IS_GPU = True
+        try:
+            device_id = np.cuda.runtime.getDevice()
+            device_props = np.cuda.runtime.getDeviceProperties(device_id)
+            device_name = device_props['name'].decode()
+        except Exception:
+            device_name = 'Unknown GPU'
+
+        msg = (
+            'Using CuPy ({}) for GPU ({}) acceleration in '
+            'honeybee-radiance-postprocess.'
+        ).format(np.__version__, device_name)
+        sys.stderr.write(msg)
+
+    except ModuleNotFoundError:
+        import numpy as np
+
+    except Exception as e:
+        import numpy as np
+        msg = (
+            'Failed to load CuPy successfully. '
+            'Help: https://github.com/ladybug-tools/honeybee-radiance-postprocess/blob/master/CUPY.md. '
+            'Falling back to NumPy ({}) in honeybee-radiance-postprocess: {}'
+        ).format(np.__version__, e)
+        sys.stderr.write(msg)
+
+IS_CPU = not IS_GPU

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/annual.py

@@ -1,16 +1,10 @@
 """Shared functions for post-processing annual results."""
 from typing import Union
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from ladybug.analysisperiod import AnalysisPeriod
-from .util import filter_array
 
-is_cpu = not is_gpu
+from . import np
+from .util import filter_array
 
 
 def occupancy_schedule_8_to_6(

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/annualdaylight.py

@@ -1,15 +1,6 @@
-"""Functions for post-processing annual daylight outputs.
-
-Note: These functions will most likely be moved to a separate package in the near future.
-"""
+"""Functions for post-processing annual daylight outputs."""
 import json
 import os
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from ladybug.color import Colorset
 from ladybug.datatype.fraction import Fraction
@@ -17,6 +8,7 @@ from ladybug.legend import LegendParameters
 from honeybee_radiance.postprocess.annual import filter_schedule_by_hours, \
     _process_input_folder
 
+from . import np
 from .metrics import da_array2d, cda_array2d, udi_array2d, \
     udi_lower_array2d, udi_upper_array2d
 from .util import filter_array

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/annualirradiance.py

@@ -1,5 +1,4 @@
 """Functions for post-processing annual irradiance outputs."""
-
 from ladybug.datatype.energyflux import EnergyFlux
 from ladybug.datatype.energyintensity import EnergyIntensity
 from ladybug.legend import LegendParameters

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/breeam/breeam.py

@@ -2,16 +2,11 @@
 from typing import Union
 from pathlib import Path
 import json
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from honeybee.model import Model
 from honeybee_radiance.writer import _filter_by_pattern
 
+from .. import np
 from ..results.annual_daylight import AnnualDaylight
 
 

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/cli/abnt.py

@@ -4,18 +4,13 @@ import sys
 import logging
 from pathlib import Path
 import click
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from honeybee.model import Model
 from honeybee.room import Room
 from ladybug_geometry.geometry3d.face import Face3D
 from ladybug_geometry.geometry3d.pointvector import Vector3D
 
+from .. import np
 from ..vis_metadata import _abnt_nbr_15575_daylight_levels_vis_metadata
 
 

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/cli/datacollection.py

@@ -1,21 +1,17 @@
 """Commands to work with data collections."""
 import sys
 import logging
+import json
 from pathlib import Path
 import click
-import json
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from ladybug.datacollection import HourlyContinuousCollection, \
     HourlyDiscontinuousCollection
 from ladybug.header import Header
 from ladybug.datautil import collections_to_csv
 
+from .. import np
+
 
 _logger = logging.getLogger(__name__)
 

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/cli/grid.py

@@ -1,17 +1,13 @@
 """honeybee radiance postprocess grid commands."""
-import click
 import sys
 import logging
 import json
 from pathlib import Path
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
+import click
 
 from honeybee_radiance_postprocess.reader import binary_to_array
+
+from .. import np
 from ..annualdaylight import _annual_daylight_vis_metadata
 
 _logger = logging.getLogger(__name__)

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/cli/merge.py

@@ -1,18 +1,14 @@
 """honeybee radiance postprocess merge commands."""
-import click
 import sys
 import logging
 import json
 from pathlib import Path
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
+import click
 
 from honeybee_radiance_postprocess.reader import binary_to_array
 
+from .. import np
+
 _logger = logging.getLogger(__name__)
 
 

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/cli/mtxop.py

@@ -3,13 +3,8 @@ import sys
 import logging
 from pathlib import Path
 import click
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
+from .. import np
 from ..reader import binary_to_array, ascii_to_array
 
 _logger = logging.getLogger(__name__)

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/cli/postprocess.py

@@ -5,12 +5,6 @@ import os
 import logging
 import json
 import click
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from ladybug.location import Location
 from ladybug.wea import Wea
@@ -19,6 +13,7 @@ from honeybee_radiance_postprocess.metrics import da_array2d, cda_array2d, \
     udi_array2d, udi_lower_array2d, udi_upper_array2d
 from honeybee_radiance_postprocess.reader import binary_to_array
 
+from .. import np
 from ..annual import occupancy_schedule_8_to_6
 from ..dynamic import DynamicSchedule
 from ..en17037 import en17037_to_folder

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/cli/translate.py

@@ -3,15 +3,10 @@ import sys
 import logging
 from pathlib import Path
 import shutil
-import click
 import json
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
+import click
 
+from .. import np
 from ..reader import binary_to_array
 from ..util import get_delimiter
 

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/cli/two_phase.py

@@ -3,13 +3,8 @@ import sys
 import logging
 from pathlib import Path
 import click
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
+from .. import np
 from ..reader import binary_to_array, ascii_to_array
 
 _logger = logging.getLogger(__name__)

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/cli/util.py

@@ -1,7 +1,8 @@
-from ladybug.analysisperiod import AnalysisPeriod
 from datetime import datetime
 import copy
 
+from ladybug.analysisperiod import AnalysisPeriod
+
 
 def get_hoys(start_date, start_time, end_date, end_time, timestep, leap_year):
     """Return list of hours from start date, star hour, end date and end hour.

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/cli/viewfactor.py

@@ -1,15 +1,9 @@
 """Commands to compute view factors to geometry."""
-import click
 import os
 import sys
 import logging
 import math
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
+import click
 
 from honeybee_radiance.config import folders
 
@@ -20,6 +14,8 @@ from ladybug.futil import preparedir
 
 from honeybee_radiance_postprocess.reader import binary_to_array
 
+from .. import np
+
 _logger = logging.getLogger(__name__)
 
 

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/data_type.py

@@ -1,11 +1,7 @@
 """Functions for NumPy data type (dtype)."""
 from typing import Tuple
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
+
+from . import np
 
 
 def smallest_integer_dtype(array: np.ndarray) -> np.signedinteger:

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/electriclight.py

@@ -1,11 +1,6 @@
 """Functions for post-processing daylight outputs into electric lighting schedules."""
 from typing import List
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
+from . import np
 
 
 def array_to_dimming_fraction(

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/en17037.py

@@ -2,17 +2,12 @@
 from typing import Union
 from pathlib import Path
 import json
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from ladybug.color import Colorset
 from ladybug.datatype.fraction import Fraction
 from ladybug.legend import LegendParameters
 
+from . import np
 from .results.annual_daylight import AnnualDaylight
 from .dynamic import DynamicSchedule
 from .metrics import da_array2d

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/helper.py

@@ -1,15 +1,12 @@
 """Helper functions."""
 import json
 from pathlib import Path
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
+from typing import List
 
 from honeybee.model import Model
 
+from . import np, IS_CPU
+
 
 def model_grid_areas(model, grids_info):
     if isinstance(model, Model):
@@ -148,28 +145,51 @@ def grid_summary(
 
         arrays.append(tuple(data))
 
-    # create structured array
-    if is_gpu:
-        struct_array = None
-    else:
+    grid_summary_file = write_structured_array_to_file(
+        folder, name, arrays, dtype, fmt)
+
+    return grid_summary_file
+
+
+def write_structured_array_to_file(
+        folder: Path, name: str, arrays: List[tuple], dtype: List[tuple],
+        fmt: List[str]) -> Path:
+    """Write structured array data to a CSV file. Uses NumPy for CPU mode and
+    manual formatting for CuPy mode.
+
+    Args:
+        folder: Path object to the output folder.
+        name: File name without extension.
+        arrays: 2D array-like data.
+        dtype: Structured dtype definition (list of (field_name, dtype)).
+        fmt: List/tuple of printf-style formats for each column.
+
+    Returns:
+        Path to the written CSV file.
+    """
+    if IS_CPU:
         struct_array = np.array(arrays, dtype=dtype)
+    else:
+        struct_array = None
+
+    filepath = folder.joinpath(f'{name}.csv')
 
     header = [dt[0] for dt in dtype]
-    # write header to file
-    with open(folder.joinpath(f'{name}.csv'), 'w') as grid_summary_file:
-        grid_summary_file.write(','.join(header))
-    # write structured array to grid_summary_file
-    with open(folder.joinpath(f'{name}.csv'), 'a') as grid_summary_file:
-        grid_summary_file.write('\n')
-        if is_gpu:
+
+    with open(filepath, 'w') as f:
+        f.write(','.join(header))
+
+    with open(filepath, 'a') as f:
+        f.write('\n')
+        if IS_CPU:
+            np.savetxt(f, struct_array, delimiter=',', fmt=fmt)
+        else:
             # CuPy doesn't support structured arrays; manually format rows
             for row in arrays:
                 row_str = ','.join(fmt_val % val for fmt_val, val in zip(fmt, row))
-                grid_summary_file.write(row_str + '\n')
-        else:
-            np.savetxt(grid_summary_file, struct_array, delimiter=',', fmt=fmt)
+                f.write(row_str + '\n')
 
-    return grid_summary_file
+    return filepath
 
 
 def _calculate_percentage(gr_metric_bool, grid_info, grid_area=None):

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/ies/lm.py

@@ -2,15 +2,10 @@
 from typing import Tuple, Union
 from collections import defaultdict
 import itertools
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from honeybee_radiance.postprocess.annual import filter_schedule_by_hours
 
+from .. import np
 from ..annual import schedule_to_hoys, occupancy_schedule_8_to_6
 from ..results.annual_daylight import AnnualDaylight
 from ..util import filter_array

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/ies/lm_schedule.py

@@ -1,12 +1,7 @@
 """Module for dynamic LM schedules."""
 from typing import Tuple
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
+from .. import np
 from ..results.annual_daylight import AnnualDaylight
 from ..util import filter_array
 

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/leed/leed.py

@@ -4,12 +4,6 @@ from pathlib import Path
 from collections import defaultdict
 import json
 import itertools
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from ladybug.analysisperiod import AnalysisPeriod
 from ladybug.datatype.generic import GenericType
@@ -24,6 +18,7 @@ from honeybee.units import conversion_factor_to_meters
 from honeybee_radiance.writer import _filter_by_pattern
 from honeybee_radiance.postprocess.annual import filter_schedule_by_hours
 
+from .. import np
 from ..metrics import da_array2d, ase_array2d
 from ..annual import schedule_to_hoys, occupancy_schedule_8_to_6
 from ..results.annual_daylight import AnnualDaylight
@@ -31,8 +26,6 @@ from ..util import recursive_dict_merge, filter_array2d
 from ..dynamic import DynamicSchedule, ApertureGroupSchedule
 from .leed_schedule import shd_trans_schedule_descending, states_schedule_descending
 
-is_cpu = not is_gpu
-
 
 def _create_grid_summary(
     grid_info, sda_grid, sda_blinds_up_grid, sda_blinds_down_grid, ase_grid,

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/leed/leed_schedule.py

@@ -1,12 +1,7 @@
 """Module for dynamic LEED schedules."""
 from typing import Tuple
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
+from .. import np
 from ..results.annual_daylight import AnnualDaylight
 from ..util import filter_array2d
 

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/metrics.py

@@ -1,16 +1,9 @@
 """Functions to calculate various metrics for 1D and 2D NumPy arrays."""
 from typing import Tuple, Union
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
+from . import np, IS_CPU
 from .util import check_array_dim
 
-is_cpu = not is_gpu
-
 
 def da_array2d(
         array: np.ndarray, total_occ: int = None, threshold: float = 300) -> np.ndarray:
@@ -80,15 +73,22 @@ def cda_array2d(
         # set total_occ to number of columns in array
         total_occ = array.shape[1]
 
-    if is_cpu:
-        cda = np.apply_along_axis(
-                cda_array1d, 1, array, total_occ=total_occ, threshold=threshold)
-    else:
-        cda = np.where(array >= threshold, 1, array / threshold).sum(axis=1) / total_occ * 100
+    cda = cda_array2d_wrapper(array, total_occ, threshold)
 
     return cda
 
 
+def cda_array2d_wrapper(array, total_occ, threshold):
+    """Compute cDA for a 2D array using NumPy (CPU) or CuPy (GPU)."""
+    if IS_CPU:
+        return np.apply_along_axis(
+            cda_array1d, 1, array, total_occ=total_occ, threshold=threshold
+        )
+
+    return (np.where(array >= threshold, 1, array / threshold)
+            .sum(axis=1) / total_occ * 100)
+
+
 def cda_array1d(
         array: np.ndarray, total_occ: int = None,
         threshold: float = 300) -> np.float64:
@@ -133,15 +133,23 @@ def udi_array2d(
         # set total_occ to number of columns in array
         total_occ = array.shape[1]
 
-    if is_cpu:
-        udi = np.apply_along_axis(
-                udi_array1d, 1, array, total_occ=total_occ, min_t=min_t, max_t=max_t)
-    else:
-        udi = ((array >= min_t) & (array <= max_t)).sum(axis=1) / total_occ * 100
+    udi = udi_array2d_wrapper(array, total_occ, min_t, max_t)
 
     return udi
 
 
+def udi_array2d_wrapper(array, total_occ, min_t, max_t):
+    """Compute UDI for a 2D array using NumPy (CPU) or CuPy (GPU)."""
+    if IS_CPU:
+        return np.apply_along_axis(
+            udi_array1d, 1, array,
+            total_occ=total_occ, min_t=min_t, max_t=max_t
+        )
+
+    return (((array >= min_t) & (array <= max_t))
+            .sum(axis=1) / total_occ * 100)
+
+
 def udi_array1d(
         array: np.ndarray, total_occ: int = None, min_t: float = 100,
         max_t: float = 3000) -> np.float64:
@@ -186,19 +194,26 @@ def udi_lower_array2d(
         # set total_occ to number of columns in array
         total_occ = array.shape[1]
 
-    if is_cpu:
-        udi = np.apply_along_axis(
-                udi_lower_array1d, 1, array, total_occ=total_occ, min_t=min_t,
-                sun_down_occ_hours=sun_down_occ_hours)
-    else:
-        if min_t == 0:
-            return np.zeros(array.shape[0], dtype=np.float32)
-
-        udi = ((array < min_t).sum(axis=1) + sun_down_occ_hours) / total_occ * 100
+    udi = udi_lower_array2d_wrapper(array, total_occ, min_t, sun_down_occ_hours)
 
     return udi
 
 
+def udi_lower_array2d_wrapper(array, total_occ, min_t, sun_down_occ_hours):
+    """Compute UDI lower for a 2D array using NumPy (CPU) or CuPy (GPU)."""
+    if IS_CPU:
+        return np.apply_along_axis(
+            udi_lower_array1d, 1, array, total_occ=total_occ, min_t=min_t,
+            sun_down_occ_hours=sun_down_occ_hours
+        )
+
+    if min_t == 0:
+        return np.zeros(array.shape[0], dtype=np.float32)
+
+    return (((array < min_t).sum(axis=1) + sun_down_occ_hours)
+            / total_occ * 100)
+
+
 def udi_lower_array1d(
         array: np.ndarray, total_occ: int = None, min_t: float = 100,
         sun_down_occ_hours: int = 0) -> np.float64:
@@ -245,15 +260,22 @@ def udi_upper_array2d(
         # set total_occ to number of columns in array
         total_occ = array.shape[1]
 
-    if is_cpu:
-        udi = np.apply_along_axis(
-                udi_upper_array1d, 1, array, total_occ=total_occ, max_t=max_t)
-    else:
-        udi = (array > max_t).sum(axis=1) / total_occ * 100
+    udi = udi_upper_array2d_wrapper(array, total_occ, max_t)
 
     return udi
 
 
+def udi_upper_array2d_wrapper(array, total_occ, max_t):
+    """Compute UDI upper for a 2D array using NumPy (CPU) or CuPy (GPU)."""
+    if IS_CPU:
+        return np.apply_along_axis(
+            udi_upper_array1d, 1, array,
+            total_occ=total_occ, max_t=max_t
+        )
+
+    return ((array > max_t).sum(axis=1) / total_occ * 100)
+
+
 def udi_upper_array1d(
         array: np.ndarray, total_occ: int = None,
         max_t: float = 3000) -> np.float64:

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/reader.py

@@ -1,11 +1,5 @@
 """Post-processing reader functions."""
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
-
+from . import np
 from .util import binary_mtx_dimension
 
 

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/results/annual_daylight.py

@@ -1,12 +1,6 @@
 import json
 from pathlib import Path
 from typing import Tuple, List
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from collections import defaultdict
 
@@ -16,18 +10,17 @@ from ladybug.datatype.illuminance import Illuminance
 from ladybug.datatype.fraction import Fraction
 from ladybug.header import Header
 
+from .. import np
 from ..annual import occupancy_schedule_8_to_6
 from ..metrics import da_array2d, cda_array2d, udi_array2d, udi_lower_array2d, \
     udi_upper_array2d, ase_array2d
-from ..util import filter_array, filter_array2d
+from ..util import filter_array2d
 from ..annualdaylight import _annual_daylight_vis_metadata
 from ..electriclight import array_to_dimming_fraction
 from .. import type_hints
 from ..dynamic import DynamicSchedule, ApertureGroupSchedule
 from .results import Results
 
-is_cpu = not is_gpu
-
 
 class AnnualDaylight(Results):
     """Annual Daylight Results class.

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/results/annual_irradiance.py

@@ -1,14 +1,9 @@
 import json
 from pathlib import Path
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from ladybug.datatype.energyflux import EnergyFlux
 
+from .. import np
 from ..metrics import (average_values_array2d, cumulative_values_array2d,
     peak_values_array2d)
 from ..util import filter_array, hoys_mask

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/results/results.py

@@ -4,12 +4,6 @@ from pathlib import Path
 from itertools import islice, cycle
 from typing import Tuple, Union, List
 import itertools
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from ladybug.analysisperiod import AnalysisPeriod
 from ladybug.datacollection import HourlyContinuousCollection
@@ -18,6 +12,7 @@ from ladybug.datatype.base import DataTypeBase
 from ladybug.dt import DateTime
 from ladybug.header import Header
 
+from .. import np
 from ..annual import occupancy_schedule_8_to_6
 from ..metrics import (average_values_array2d, cumulative_values_array2d,
     peak_values_array2d)
@@ -26,8 +21,6 @@ from ..util import filter_array2d, hoys_mask, check_array_dim, \
 from .. import type_hints
 from ..dynamic import DynamicSchedule, ApertureGroupSchedule
 
-is_cpu = not is_gpu
-
 
 class _ResultsFolder(object):
     """Base class for ResultsFolder.

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/type_hints.py

@@ -1,14 +1,10 @@
 """Type hints for honeybee-radiance-postprocess."""
 from typing import Tuple, List
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from ladybug.datacollection import HourlyContinuousCollection
 
+from . import np
+
 
 annual_metric = Tuple[List[np.ndarray], List[dict]]
 annual_daylight_metrics = Tuple[

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/util.py

@@ -1,15 +1,9 @@
 """Post-processing utility functions."""
 from typing import Tuple
-try:
-    import cupy as np
-    is_gpu = True
-except ImportError:
-    is_gpu = False
-    import numpy as np
 
 from honeybee_radiance.writer import _filter_by_pattern
 
-is_cpu = not is_gpu
+from . import np
 
 
 def binary_mtx_dimension(filepath: str) -> Tuple[int, int, int, int, str]:

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess/well/well.py

@@ -2,7 +2,6 @@
 from typing import Tuple, Union
 from pathlib import Path
 import json
-import numpy as np
 
 from ladybug.analysisperiod import AnalysisPeriod
 from ladybug.datacollection import HourlyContinuousCollection
@@ -12,6 +11,7 @@ from honeybee.model import Model
 from honeybee.units import conversion_factor_to_meters
 from honeybee_radiance.writer import _filter_by_pattern
 
+from .. import np
 from ..metrics import da_array2d
 from ..annual import occupancy_schedule_8_to_6
 from ..results.annual_daylight import AnnualDaylight

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: honeybee-radiance-postprocess
-Version: 0.4.585
+Version: 0.4.587
 Summary: Postprocessing of Radiance results and matrices
 Home-page: https://github.com/ladybug-tools/honeybee-radiance-postprocess
 Author: Ladybug Tools
@@ -16,8 +16,9 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: honeybee-radiance==1.66.216
+Requires-Dist: honeybee-radiance==1.66.217
 Requires-Dist: numpy<2.0.0
+Requires-Dist: cupy-cuda12x==13.6.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{honeybee_radiance_postprocess-0.4.585 → honeybee_radiance_postprocess-0.4.587}/honeybee_radiance_postprocess.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 CODE_OF_CONDUCT.md
 CONTRIBUTING.md
+CUPY.MD
 LICENSE
 MANIFEST.in
 README.md

honeybee_radiance_postprocess-0.4.587/honeybee_radiance_postprocess.egg-info/requires.txt

@@ -0,0 +1,3 @@
+honeybee-radiance==1.66.217
+numpy<2.0.0
+cupy-cuda12x==13.6.0

honeybee_radiance_postprocess-0.4.587/requirements.txt

@@ -0,0 +1,3 @@
+honeybee-radiance==1.66.217
+numpy<2.0.0
+cupy-cuda12x==13.6.0

honeybee_radiance_postprocess-0.4.585/honeybee_radiance_postprocess/well/__init__.py

@@ -1 +0,0 @@
-"""honeybee-radiance-postprocess library."""

honeybee_radiance_postprocess-0.4.585/honeybee_radiance_postprocess.egg-info/requires.txt

@@ -1,2 +0,0 @@
-honeybee-radiance==1.66.216
-numpy<2.0.0

honeybee_radiance_postprocess-0.4.585/requirements.txt

@@ -1,2 +0,0 @@
-honeybee-radiance==1.66.216
-numpy<2.0.0