Skip to content

Commit 3d8cf31

Browse files
Spencer Bryngelsonclaude
andcommitted
Remove IBM Feature PR toolchain changes accidentally included in CCE fix branch
Remove test cases (2 MPI Ranks IBM Sphere, IBM Periodic Circle, 2D IBM STL), parameter limit changes (num_ibs/num_patches max 1000), and code formatting from the IBM Feature Improvements PR (#1157) that were in the branch but not in master. These caused CPU test failures (2EE0C3AA, AFBACA70, 4E0FBE72 tolerance mismatches) on the new CI run. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent d52d5ea commit 3d8cf31

10 files changed

Lines changed: 193 additions & 236 deletions

File tree

toolchain/bootstrap/python.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
MFC_PYTHON_MIN_MAJOR=3
4-
MFC_PYTHON_MIN_MINOR=9
4+
MFC_PYTHON_MIN_MINOR=10
55
MFC_PYTHON_MIN_STR="$MFC_PYTHON_MIN_MAJOR.$MFC_PYTHON_MIN_MINOR"
66

77
is_python_compatible() {

toolchain/mfc/case_validator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,8 @@ def check_ibm(self):
685685

686686
self.prohibit(ib and n <= 0,
687687
"Immersed Boundaries do not work in 1D (requires n > 0)")
688-
self.prohibit(ib and (num_ibs <= 0 or num_ibs > 1000),
689-
"num_ibs must be between 1 and num_patches_max (1000)")
688+
self.prohibit(ib and (num_ibs <= 0 or num_ibs > 10),
689+
"num_ibs must be between 1 and num_patches_max (10)")
690690
self.prohibit(not ib and num_ibs > 0,
691691
"num_ibs is set, but ib is not enabled")
692692

toolchain/mfc/gen_case_constraints_docs.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
Also generates case design playbook from curated working examples.
99
""" # pylint: disable=too-many-lines
1010

11-
from __future__ import annotations
12-
1311
import json
1412
import sys
1513
import subprocess

toolchain/mfc/packer/pack.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ def __repr__(self) -> str:
2020
return f"{self.filepath} {' '.join([ str(d) for d in self.doubles ])}"
2121

2222

23-
# This class maps to the data contained in the entirety of D/: a dictionary
24-
# of PackEntry instances keyed by filepath.
23+
# This class maps to the data contained in the entirety of D/: it is tush a list
24+
# of PackEntry classes.
2525
class Pack:
2626
entries: typing.Dict[str, PackEntry]
2727

@@ -87,10 +87,10 @@ def save(self, filepath: str):
8787

8888
common.file_write(f"{filepath.rstrip('.txt')}-metadata.txt", metadata)
8989

90-
def has_bad_values(self) -> bool:
90+
def has_NaNs(self) -> bool:
9191
for entry in self.entries.values():
9292
for double in entry.doubles:
93-
if math.isnan(double) or math.isinf(double):
93+
if math.isnan(double):
9494
return True
9595

9696
return False

toolchain/mfc/params/ast_analyzer.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
and case_constraints.md).
88
"""
99

10-
from __future__ import annotations
11-
1210
import ast
1311
import re
1412
from dataclasses import dataclass, field

toolchain/mfc/params/definitions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from .registry import REGISTRY
1212

1313
# Index limits
14-
NP, NF, NI, NA, NPR, NB = 10, 10, 1000, 4, 10, 10 # patches, fluids, ibs, acoustic, probes, bc_patches
14+
NP, NF, NI, NA, NPR, NB = 10, 10, 10, 4, 10, 10 # patches, fluids, ibs, acoustic, probes, bc_patches
1515

1616

1717
# =============================================================================
@@ -672,7 +672,7 @@ def get_value_label(param_name: str, value: int) -> str:
672672
# Counts (must be positive)
673673
"num_fluids": {"min": 1, "max": 10},
674674
"num_patches": {"min": 0, "max": 10},
675-
"num_ibs": {"min": 0, "max": 1000},
675+
"num_ibs": {"min": 0, "max": 10},
676676
"num_source": {"min": 1},
677677
"num_probes": {"min": 1},
678678
"num_integrals": {"min": 1},

toolchain/mfc/params/generators/docs_gen.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
organized by family with descriptions, types, and constraints.
66
"""
77

8-
from __future__ import annotations
9-
108
from typing import Any, Dict, List, Tuple
119
from collections import defaultdict
1210
import re

toolchain/mfc/params_tests/test_definitions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ class TestParameterCounts(unittest.TestCase):
161161
"""Tests for expected parameter counts."""
162162

163163
def test_total_param_count(self):
164-
"""Total parameter count should be around 40000."""
164+
"""Total parameter count should be around 3400."""
165165
count = len(REGISTRY.all_params)
166-
self.assertGreater(count, 39000, f"Too few parameters. Got {count}.")
167-
self.assertLess(count, 41000, f"Too many parameters. Got {count}.")
166+
self.assertGreater(count, 3000, "Too few parameters")
167+
self.assertLess(count, 4000, "Too many parameters")
168168

169169
def test_log_params_count(self):
170170
"""Should have many LOG type parameters."""

toolchain/mfc/test/cases.py

Lines changed: 179 additions & 216 deletions
Large diffs are not rendered by default.

toolchain/mfc/test/test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,8 @@ def _handle_case(case: TestCase, devices: typing.Set[int]):
419419
if err is not None:
420420
raise MFCException(f"Test {case}: {err}")
421421

422-
if pack.has_bad_values():
423-
raise MFCException(f"Test {case}: NaN or Inf detected in the case.")
422+
if pack.has_NaNs():
423+
raise MFCException(f"Test {case}: NaNs detected in the case.")
424424

425425
golden_filepath = os.path.join(case.get_dirpath(), "golden.txt")
426426
if ARG("generate"):

0 commit comments

Comments
 (0)