Skip to content

Conversation

@Myoldmopar
Copy link
Member

Pull request overview

Ideally, this will actually include a fix for #11087. For now it demonstrates a way that we could get rid of diffs temporarily. Note, this will still cause diffs because I've made changes to the IDFs in this branch, and now they differ from develop. But if this were merged into develop, diffs would start disappearing from everyone else's PRs. If we need to do this temporarily, I am OK with it. But the full fix would be to make sure all tables have unique names within a given tabular output file.

@Myoldmopar Myoldmopar self-assigned this May 29, 2025
@Myoldmopar Myoldmopar added the Defect Includes code to repair a defect in EnergyPlus label May 29, 2025
@Myoldmopar
Copy link
Member Author

OK, well whoops. The new clever check which detects C++ files changed and only runs Clang Format on the changed files, seems to have goofed. There's obviously nothing wrong with my C++ changes in this branch.......since there aren't any. And if I had some changed, it would have worked fine. Fun!

@Myoldmopar
Copy link
Member Author

When I locally run the code that we have on GHA to detect any C++ ish files changing:

$ changed_files=$(git diff --name-only HEAD^ HEAD src/ tst/ | /bin/grep -E '\.(cpp|cc|c|hpp|hh|h)$')
$ echo $changed_files 

$ file_count=$(echo "$changed_files" | wc -l)
$ echo $file_count 
1

$changed_files seems to have a new line in it, meaning wc -l will count it as a line. Not sure why yet.

@github-actions
Copy link

⚠️ Regressions detected on macos-14 for commit 5350435

Regression Summary
  • EIO: 3
  • Table Big Diffs: 3

@Myoldmopar
Copy link
Member Author

So the question is, do I click merge on this and get regressions gone from everyone's branch? Or do we try to fix it here really quick and get this merged as a real fix. I'm not able to pivot to it today. @JasonGlazer is this like a one- or two-liner fix? Or will it need some more logic added in?

@JasonGlazer
Copy link
Contributor

I think the fix to #11087 is probably just a few lines but that is an assumption. I haven't looked at the offending code. I'm ok with merging this and fixing the underlying issue later.

@Myoldmopar
Copy link
Member Author

OK, good. Merging this in now. It should be easy enough for someone to reproduce the issue by undoing my IDF comments in this PR in two branches, building both, and then running regressions on those three offending files. It should trigger table size errors, which are now reflected in the table big diff count. Then fixing the tabular output code to produce unique table names. Thus I would expect the actual fixing PR to include:

  • undoing the comments I've made in these 3 IDFs
  • some tabular output code changes
  • perhaps additional unit testing

Alright, merging this. Thanks.

@Myoldmopar Myoldmopar merged commit 5cd7977 into develop May 29, 2025
9 of 10 checks passed
@Myoldmopar Myoldmopar deleted the HushDupTableNameDiffs branch May 29, 2025 17:49
@JasonGlazer
Copy link
Contributor

Maybe also add a new CI test to check for uniqueness in table names.

jmarrec added a commit that referenced this pull request Jun 24, 2025
This reverts commit 5cd7977, reversing
changes made to ff1cfde.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Defect Includes code to repair a defect in EnergyPlus

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants