Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[F32] Fixes to translate test infrastructure & metric #91

Merged
merged 3 commits into from
Dec 13, 2024
Merged

[F32] Fixes to translate test infrastructure & metric #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8daf5bd
Make sure the `make_storage_data` respects the array dtype.
FlorianDeconinck Dec 11, 2024
9faa405
Fix logic for MultiModal metric and verbose it
FlorianDeconinck Dec 11, 2024
359812a
Merge branch 'develop' into fix/translate_test_storage_precision
FlorianDeconinck Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions ndsl/stencils/testing/translate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,6 @@ def make_storage_data(
elif not full_shape and len(array.shape) < 3 and axis == len(array.shape) - 1:
use_shape[1] = 1
start = (int(istart), int(jstart), int(kstart))
if "float" in str(array.dtype):
dtype = Float
elif "int" in str(array.dtype):
dtype = Int
else:
dtype = array.dtype
if names_4d:
return utils.make_storage_dict(
array,
Expand All @@ -132,7 +126,7 @@ def make_storage_data(
axis=axis,
names=names_4d,
backend=self.stencil_factory.backend,
dtype=dtype,
dtype=array.dtype,
)
else:
if len(array.shape) == 4:
Expand All @@ -147,7 +141,7 @@ def make_storage_data(
axis=axis,
read_only=read_only,
backend=self.stencil_factory.backend,
dtype=dtype,
dtype=array.dtype,
)

def storage_vars(self):
Expand Down
12 changes: 8 additions & 4 deletions ndsl/testing/comparison.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,15 +260,19 @@ def _compute_all_metrics(
self.ulp_distance_metric = self.ulp_distance <= self.ulp_threshold.value

# Combine all distances into sucess or failure
# Success = no NANs & ( abs or rel or ulp )
naninf_success = not np.logical_and(
# Success =
# - no unexpected NANs (e.g. NaN in the ref MUST BE in computation) OR
# - absolute distance pass OR
# - relative distance pass OR
# - ulp distance pass
naninf_success = np.logical_and(
np.isnan(self.computed), np.isnan(self.references)
).all()
)
metric_success = np.logical_or(
self.relative_distance_metric, self.absolute_distance_metric
)
metric_success = np.logical_or(metric_success, self.ulp_distance_metric)
success = np.logical_and(naninf_success, metric_success)
success = np.logical_or(naninf_success, metric_success)
return success
elif self.references.dtype in (np.bool_, bool):
success = np.logical_xor(self.computed, self.references)
Expand Down
Loading